From f98f1955257b53103372e11a34d05fccfcdf8e5a Mon Sep 17 00:00:00 2001
From: Binarybaron <binarybaron@protonmail.com>
Date: Wed, 9 Jul 2025 14:48:38 +0200
Subject: [PATCH] fix(asb): Only sync Bitcoin wallet if we use Bitcoin wallet
 for sending

---
 swap/src/bin/asb.rs | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/swap/src/bin/asb.rs b/swap/src/bin/asb.rs
index 17249e0f..398b6b9a 100644
--- a/swap/src/bin/asb.rs
+++ b/swap/src/bin/asb.rs
@@ -189,7 +189,7 @@ pub async fn main() -> Result<()> {
             }
 
             // Initialize Bitcoin wallet
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, false).await?;
             let bitcoin_balance = bitcoin_wallet.balance().await?;
             tracing::info!(%bitcoin_balance, "Bitcoin wallet balance");
 
@@ -337,7 +337,7 @@ pub async fn main() -> Result<()> {
             }
         }
         Command::WithdrawBtc { amount, address } => {
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
 
             let withdraw_tx_unsigned = match amount {
                 Some(amount) => {
@@ -363,7 +363,7 @@ pub async fn main() -> Result<()> {
             let monero_balance = monero_wallet.main_wallet().await.total_balance().await;
             tracing::info!(%monero_balance);
 
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
             let bitcoin_balance = bitcoin_wallet.balance().await?;
             tracing::info!(%bitcoin_balance);
             tracing::info!(%bitcoin_balance, %monero_balance, "Current balance");
@@ -371,7 +371,7 @@ pub async fn main() -> Result<()> {
         Command::Cancel { swap_id } => {
             let db = open_db(db_file, AccessMode::ReadWrite, None).await?;
 
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
 
             let (txid, _) = cancel(swap_id, Arc::new(bitcoin_wallet), db).await?;
 
@@ -380,7 +380,7 @@ pub async fn main() -> Result<()> {
         Command::Refund { swap_id } => {
             let db = open_db(db_file, AccessMode::ReadWrite, None).await?;
 
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
             let monero_wallet = init_monero_wallet(&config, env_config).await?;
 
             refund(swap_id, Arc::new(bitcoin_wallet), monero_wallet.clone(), db).await?;
@@ -390,7 +390,7 @@ pub async fn main() -> Result<()> {
         Command::Punish { swap_id } => {
             let db = open_db(db_file, AccessMode::ReadWrite, None).await?;
 
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
 
             let (txid, _) = punish(swap_id, Arc::new(bitcoin_wallet), db).await?;
 
@@ -409,7 +409,7 @@ pub async fn main() -> Result<()> {
         } => {
             let db = open_db(db_file, AccessMode::ReadWrite, None).await?;
 
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, true).await?;
 
             let (txid, _) = redeem(
                 swap_id,
@@ -422,7 +422,7 @@ pub async fn main() -> Result<()> {
             tracing::info!("Redeem transaction successfully published with id {}", txid);
         }
         Command::ExportBitcoinWallet => {
-            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config).await?;
+            let bitcoin_wallet = init_bitcoin_wallet(&config, &seed, env_config, false).await?;
             let wallet_export = bitcoin_wallet.wallet_export("asb").await?;
             println!("{}", wallet_export)
         }
@@ -430,7 +430,7 @@ pub async fn main() -> Result<()> {
             let monero_wallet = init_monero_wallet(&config, env_config).await?;
             let main_wallet = monero_wallet.main_wallet().await;
 
-            let seed = main_wallet.seed().await;
+            let seed = main_wallet.seed().await.context("Failed to get wallet seed")?;
             let creation_height = main_wallet.creation_height().await;
 
             println!("Seed          : {seed}");
@@ -445,6 +445,7 @@ async fn init_bitcoin_wallet(
     config: &Config,
     seed: &Seed,
     env_config: swap::env::Config,
+    sync: bool,
 ) -> Result<bitcoin::Wallet> {
     tracing::debug!("Opening Bitcoin wallet");
     let wallet = bitcoin::wallet::WalletBuilder::default()
@@ -469,7 +470,11 @@ async fn init_bitcoin_wallet(
         .await
         .context("Failed to initialize Bitcoin wallet")?;
 
-    wallet.sync().await?;
+    if sync {
+        wallet.sync().await?;
+    } else {
+        tracing::info!("Skipping Bitcoin wallet sync because we are only using it for receiving funds");
+    }
 
     Ok(wallet)
 }