Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-08-14 17:26:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Improve error messages when determining BTC amount to be swapped

Browse source
This commit is contained in:
Thomas Eizinger 2021-03-04 17:39:17 +11:00
parent 4138039ea0
commit 1aa6d177bf
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
swap/src/bin/swap_cli.rs
View file

@ -313,14 +313,18 @@ async fn determine_btc_to_swap(
bid_quote.max_quantity bid_quote.max_quantity
); );
let new_balance = wait_for_deposit.await?; let new_balance = wait_for_deposit
.await
.context("Failed to wait for Bitcoin deposit")?;
info!("Received {}", new_balance); info!("Received {}", new_balance);
} else { } else {
info!("Found {} in wallet", initial_balance); info!("Found {} in wallet", initial_balance);
} }
let max_giveable = max_giveable.await?; let max_giveable = max_giveable
.await
.context("Failed to compute max 'giveable' Bitcoin amount")?;
let max_accepted = bid_quote.max_quantity; let max_accepted = bid_quote.max_quantity;
if max_giveable > max_accepted { if max_giveable > max_accepted {

2
swap/src/bitcoin/wallet.rs
View file

@ -155,7 +155,7 @@ impl Wallet {
tx_builder.set_single_recipient(dummy_script); tx_builder.set_single_recipient(dummy_script);
tx_builder.drain_wallet(); tx_builder.drain_wallet();
tx_builder.fee_rate(self.select_feerate()); tx_builder.fee_rate(self.select_feerate());
let (_, details) = tx_builder.finish()?; let (_, details) = tx_builder.finish().context("Failed to build transaction")?;
let max_giveable = details.sent - details.fees; let max_giveable = details.sent - details.fees;