blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Derive retry timeout from slot duration

This commit is contained in:
Michael Vines 2019-02-27 10:37:38 -08:00 committed by Grimes
parent 36cdaffe25
commit b5d714eec7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wallet/src/wallet.rs
View File

@ -22,6 +22,7 @@ use solana_sdk::loader_transaction::LoaderTransaction;
use solana_sdk::pubkey::Pubkey; use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil, Signature}; use solana_sdk::signature::{Keypair, KeypairUtil, Signature};
use solana_sdk::system_transaction::SystemTransaction; use solana_sdk::system_transaction::SystemTransaction;
use solana_sdk::timing::{DEFAULT_TICKS_PER_SLOT, NUM_TICKS_PER_SECOND};
use solana_sdk::transaction::Transaction; use solana_sdk::transaction::Transaction;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
@ -775,7 +776,10 @@ fn send_and_confirm_tx(
break status; break status;
} }
if cfg!(not(test)) { if cfg!(not(test)) {
sleep(Duration::from_millis(500)); // Retry ~twice during a slot
sleep(Duration::from_millis(
500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND as u64,
));
} }
}; };
match status { match status {
@ -823,7 +827,10 @@ fn resign_tx(
))?; ))?;
} }
next_last_id_retries -= 1; next_last_id_retries -= 1;
sleep(Duration::from_secs(1)); // Retry ~twice during a slot
sleep(Duration::from_millis(
500 * DEFAULT_TICKS_PER_SLOT / NUM_TICKS_PER_SECOND as u64,
));
}; };
tx.sign(&[signer_key], last_id); tx.sign(&[signer_key], last_id);