Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-01-12 16:09:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Tell the user for how many confirmations we are waiting

Browse Source 
Without this, the user has no idea for how long the program is
waiting.
This commit is contained in:
Thomas Eizinger 2021-03-05 16:07:13 +11:00
parent 5d4cf40831
commit 4883e23dd8
No known key found for this signature in database
GPG Key ID: 651AC83A6C6C8B96
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swap/src/bitcoin/wallet.rs
View File

@ -179,7 +179,7 @@ impl Wallet {
format!("Failed to broadcast Bitcoin {} transaction {}", kind, txid) format!("Failed to broadcast Bitcoin {} transaction {}", kind, txid)
})?; })?;
tracing::info!("Published Bitcoin {} transaction as {}", txid, kind); tracing::info!(%txid, "Published Bitcoin {} transaction", kind);
Ok(txid) Ok(txid)
} }
@ -281,7 +281,10 @@ impl Wallet {
txid: Txid, txid: Txid,
execution_params: ExecutionParams, execution_params: ExecutionParams,
) -> Result<()> { ) -> Result<()> {
tracing::debug!("waiting for tx finality: {}", txid); let conf_target = execution_params.bitcoin_finality_confirmations;
tracing::info!(%txid, "Waiting for {} confirmation{} of Bitcoin transaction", conf_target, if conf_target > 1 { "s" } else { "" });
// Divide by 4 to not check too often yet still be aware of the new block early // Divide by 4 to not check too often yet still be aware of the new block early
// on. // on.
let mut interval = interval(execution_params.bitcoin_avg_block_time / 4); let mut interval = interval(execution_params.bitcoin_avg_block_time / 4);
@ -289,15 +292,17 @@ impl Wallet {
loop { loop {
let tx_block_height = self.transaction_block_height(txid).await?; let tx_block_height = self.transaction_block_height(txid).await?;
tracing::debug!("tx_block_height: {:?}", tx_block_height); tracing::debug!("tx_block_height: {:?}", tx_block_height);
let block_height = self.get_block_height().await?; let block_height = self.get_block_height().await?;
tracing::debug!("latest_block_height: {:?}", block_height); tracing::debug!("latest_block_height: {:?}", block_height);
if let Some(confirmations) = block_height.checked_sub( if let Some(confirmations) = block_height.checked_sub(
tx_block_height tx_block_height
.checked_sub(BlockHeight::new(1)) .checked_sub(BlockHeight::new(1))
.expect("transaction must be included in block with height >= 1"), .expect("transaction must be included in block with height >= 1"),
) { ) {
tracing::debug!("confirmations: {:?}", confirmations); tracing::debug!(%txid, "confirmations: {:?}", confirmations);
if u32::from(confirmations) >= execution_params.bitcoin_finality_confirmations { if u32::from(confirmations) >= conf_target {
break; break;
} }
} }