Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2024-12-25 15:39:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix warning behaviour around monero-rpc failing to fetch transactions

Browse Source 
don't warn the user that monero-wallet-rpc has failed to fetch a
transaction until it's happened several times.

monero-wallet-rpc may legitimately fail the first time we make a request
This commit is contained in:
icyfestive 2023-01-11 15:40:58 +00:00
parent b75b3e64a9
commit fcde129920
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swap/src/monero/wallet.rs
View File

@ -296,6 +296,7 @@ async fn wait_for_confirmations<C: monero_rpc::wallet::MoneroWalletRpc<reqwest::
wallet_name: String, wallet_name: String,
) -> Result<(), InsufficientFunds> { ) -> Result<(), InsufficientFunds> {
let mut seen_confirmations = 0u64; let mut seen_confirmations = 0u64;
let mut monero_rpc_retries = 0;
while seen_confirmations < conf_target { while seen_confirmations < conf_target {
check_interval.tick().await; // tick() at the beginning of the loop so every `continue` tick()s as well check_interval.tick().await; // tick() at the beginning of the loop so every `continue` tick()s as well
@ -317,8 +318,11 @@ async fn wait_for_confirmations<C: monero_rpc::wallet::MoneroWalletRpc<reqwest::
message, message,
data, data,
})) => { })) => {
monero_rpc_retries += 1;
tracing::debug!(message, ?data); tracing::debug!(message, ?data);
tracing::warn!(%txid, message, "`monero-wallet-rpc` failed to fetch transaction, may need to be restarted"); if monero_rpc_retries > 5 {
tracing::warn!(%txid, message, "`monero-wallet-rpc` failed to fetch transaction, may need to be restarted");
}
continue; continue;
} }
// TODO: Implement this using a generic proxy for each function call once https://github.com/thomaseizinger/rust-jsonrpc-client/issues/47 is fixed. // TODO: Implement this using a generic proxy for each function call once https://github.com/thomaseizinger/rust-jsonrpc-client/issues/47 is fixed.