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

Fix electrum query failing (CloseNotify bug) and use a more stable mainnet electrum server.

Browse source
This commit is contained in:
devbordecraft 2021-12-11 16:56:33 +01:00
parent 8849fa3726
commit 250d25ada6
4 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,18 +149,21 @@ impl Wallet {
Ok(new_status) => new_status,
Err(error) => {
tracing::warn!(%txid, "Failed to get status of script: {:#}", error);
return;
ScriptStatus::Retrying
}
};
if new_status != ScriptStatus::Retrying
{
last_status = Some(print_status_change(txid, last_status, new_status));
last_status = Some(print_status_change(txid, last_status, new_status));
let all_receivers_gone = sender.send(new_status).is_err();
if all_receivers_gone {
tracing::debug!(%txid, "All receivers gone, removing subscription");
client.lock().await.subscriptions.remove(&(txid, script));
return;
let all_receivers_gone = sender.send(new_status).is_err();
if all_receivers_gone {
tracing::debug!(%txid, "All receivers gone, removing subscription");
client.lock().await.subscriptions.remove(&(txid, script));
return;
}
}
}
});
@ -823,6 +826,7 @@ pub enum ScriptStatus {
Unseen,
InMempool,
Confirmed(Confirmed),
Retrying,
}
impl ScriptStatus {
@ -898,6 +902,7 @@ impl fmt::Display for ScriptStatus {
match self {
ScriptStatus::Unseen => write!(f, "unseen"),
ScriptStatus::InMempool => write!(f, "in mempool"),
ScriptStatus::Retrying => write!(f, "retrying"),
ScriptStatus::Confirmed(inner) => {
write!(f, "confirmed with {} blocks", inner.confirmations())
}