Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-11-18 23:21:53 -05:00
Code Issues Projects Releases Packages Wiki Activity

fix(asb): Only sync Bitcoin wallet if we use Bitcoin wallet for sending

Browse source
This commit is contained in:
Binarybaron 2025-07-09 14:48:38 +02:00
parent a8a7382cbf
commit f98f195525
1 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
swap/src/bin/asb.rs
View file

@ -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)
}