Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[r2r] Retry tx wait confirmation if not on chain #1474

Merged
merged 8 commits into from
Sep 27, 2022
Merged

[r2r] Retry tx wait confirmation if not on chain #1474

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1613ab3
enable retry if tx is not available onchain
borngraced Sep 17, 2022
a5445e9
fixed review notes
borngraced Sep 19, 2022
acb0a95
fixed failing tests
borngraced Sep 19, 2022
72f659d
pr review fixes
borngraced Sep 19, 2022
caee17e
set test timeout to 1
borngraced Sep 20, 2022
3ea7858
Merge remote-tracking branch 'origin/dev' into tx-wait-error-retry
borngraced Sep 20, 2022
c1ee780
Merge remote-tracking branch 'origin/dev' into tx-wait-error-retry
borngraced Sep 22, 2022
79a6cb2
Merge remote-tracking branch 'origin/dev' into tx-wait-error-retry
borngraced Sep 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion mm2src/coins/utxo/rpc_clients.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ cfg_native! {
}

pub const NO_TX_ERROR_CODE: &str = "'code': -5";
const TX_NOT_FOUND_RETRIES: u8 = 10;

pub type AddressesByLabelResult = HashMap<String, AddressPurpose>;
pub type JsonRpcPendingRequestsShared = Arc<AsyncMutex<JsonRpcPendingRequests>>;
Expand Down Expand Up @@ -146,6 +147,7 @@ impl UtxoRpcClientEnum {
check_every: u64,
) -> Box<dyn Future<Item = (), Error = String> + Send> {
let selfi = self.clone();
let mut tx_not_found_retries = TX_NOT_FOUND_RETRIES;
let fut = async move {
loop {
if now_ms() / 1000 > wait_until {
Expand Down Expand Up @@ -175,7 +177,21 @@ impl UtxoRpcClientEnum {
},
Err(e) => {
if e.get_inner().is_tx_not_found_error() {
return ERR!("Tx {} is not on chain anymore", tx_hash);
if tx_not_found_retries == 0 {
return ERR!(
"Tx {} was not found on chain after {} tries, error: {}",
tx_hash,
TX_NOT_FOUND_RETRIES,
e,
);
}
error!(
"Tx {} not found on chain, error: {}, retrying in 10 seconds. Retries left: {}",
tx_hash, e, tx_not_found_retries
);
tx_not_found_retries -= 1;
shamardy marked this conversation as resolved.
Show resolved Hide resolved
Timer::sleep(check_every as f64).await;
continue;
};

if expiry_height > 0 {
Expand Down
8 changes: 3 additions & 5 deletions mm2src/coins/utxo/utxo_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4097,16 +4097,14 @@ fn test_for_non_existent_tx_hex_utxo_electrum() {
);
// bad transaction hex
let tx = hex::decode("0400008085202f8902bf17bf7d1daace52e08f732a6b8771743ca4b1cb765a187e72fd091a0aabfd52000000006a47304402203eaaa3c4da101240f80f9c5e9de716a22b1ec6d66080de6a0cca32011cd77223022040d9082b6242d6acf9a1a8e658779e1c655d708379862f235e8ba7b8ca4e69c6012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffffff023ca13c0e9e085dd13f481f193e8a3e8fd609020936e98b5587342d994f4d020000006b483045022100c0ba56adb8de923975052312467347d83238bd8d480ce66e8b709a7997373994022048507bcac921fdb2302fa5224ce86e41b7efc1a2e20ae63aa738dfa99b7be826012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0300e1f5050000000017a9141ee6d4c38a3c078eab87ad1a5e4b00f21259b10d87000000000000000016611400000000000000000000000000000000000000001b94d736000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac2d08e35e000000000000000000000000000000").unwrap();
let expected_timeout = (now_ms() / 1000) + 10;
let actual = coin
.wait_for_confirmations(&tx, 1, false, timeout, 1)
.wait()
.err()
.unwrap();
assert!(
actual.contains("Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 is not on chain anymore")
);
assert!((now_ms() / 1000) < expected_timeout);
assert!(actual.contains(
"Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 was not found on chain after 10 tries"
));
}

#[test]
Expand Down
7 changes: 3 additions & 4 deletions mm2src/mm2_main/src/docker_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,15 +449,14 @@ mod docker_tests {
let (_ctx, coin, _) = generate_utxo_coin_with_random_privkey("MYCOIN", 1000u64.into());
// bad transaction hex
let tx = hex::decode("0400008085202f8902bf17bf7d1daace52e08f732a6b8771743ca4b1cb765a187e72fd091a0aabfd52000000006a47304402203eaaa3c4da101240f80f9c5e9de716a22b1ec6d66080de6a0cca32011cd77223022040d9082b6242d6acf9a1a8e658779e1c655d708379862f235e8ba7b8ca4e69c6012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffffff023ca13c0e9e085dd13f481f193e8a3e8fd609020936e98b5587342d994f4d020000006b483045022100c0ba56adb8de923975052312467347d83238bd8d480ce66e8b709a7997373994022048507bcac921fdb2302fa5224ce86e41b7efc1a2e20ae63aa738dfa99b7be826012102031d4256c4bc9f99ac88bf3dba21773132281f65f9bf23a59928bce08961e2f3ffffffff0300e1f5050000000017a9141ee6d4c38a3c078eab87ad1a5e4b00f21259b10d87000000000000000016611400000000000000000000000000000000000000001b94d736000000001976a91405aab5342166f8594baf17a7d9bef5d56744332788ac2d08e35e000000000000000000000000000000").unwrap();
let expected_timeout = (now_ms() / 1000) + 10;
let actual = coin
.wait_for_confirmations(&tx, 1, false, timeout, 1)
.wait()
.err()
.unwrap();
assert!(actual
.contains("Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 is not on chain anymore"));
assert!((now_ms() / 1000) < expected_timeout);
assert!(actual.contains(
"Tx d342ff9da528a2e262bddf2b6f9a27d1beb7aeb03f0fc8d9eac2987266447e44 was not found on chain after 10 tries"
));
}

#[test]
Expand Down