Archives/xmr-btc-swap
2
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-10-31 15:20:15 +00:00
Code Issues Projects Releases Wiki Activity

Show the actual BTC amount and fee to be swapped

Browse Source
This commit is contained in:
Daniel Karzel 2021-03-19 17:40:14 +11:00
parent 113a29839f
commit 668d34080d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swap/src/bin/swap.rs
View File

@ -327,7 +327,7 @@ async fn determine_btc_to_swap(
// TODO: Also wait for more funds if balance < dust
let initial_balance = initial_balance.await?;
if initial_balance == Amount::ZERO {
let balance = if initial_balance == Amount::ZERO {
info!(
"Please deposit the BTC you want to swap to {} (max {})",
get_new_address.await?,
@ -339,23 +339,23 @@ async fn determine_btc_to_swap(
.context("Failed to wait for Bitcoin deposit")?;
info!("Received {}", new_balance);
new_balance
} else {
info!("Found {} in wallet", initial_balance);
}
initial_balance
};
let max_giveable = max_giveable
.await
.context("Failed to compute max 'giveable' Bitcoin amount")?;
let fees = balance - max_giveable;
let max_accepted = bid_quote.max_quantity;
if max_giveable > max_accepted {
info!(
"Max giveable amount {} exceeds max accepted amount {}!",
max_giveable, max_accepted
);
}
let btc_swap_amount = min(max_giveable, max_accepted);
info!("Swapping {} with {} fees", btc_swap_amount, fees);
Ok(min(max_giveable, max_accepted))
Ok(btc_swap_amount)
}
#[cfg(test)]