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

Cli: polish transaction progress bar (#8963) 

automerge
This commit is contained in:
Tyera Eulberg 2020-03-19 12:10:35 -06:00 committed by GitHub
parent ff4ba54553
commit b84468ecd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/rpc_client.rs
View File

@ -954,6 +954,15 @@ impl RpcClient {
transaction: &mut Transaction,
signer_keys: &T,
) -> ClientResult<String> {
let mut confirmations = 0;
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(&format!(
"[{}/{}] Waiting for confirmations",
confirmations,
MAX_LOCKOUT_HISTORY + 1,
));
let mut send_retries = 20;
let signature_str = loop {
let mut status_retries = 15;
@ -1009,10 +1018,6 @@ impl RpcClient {
}
}
};
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message("Confirming...");
let mut confirmations = 0;
let signature = Signature::from_str(&signature_str).map_err(|_| {
ClientError::from(ClientErrorKind::Custom(format!(
"Returned string {} cannot be parsed as a signature",
@ -1029,7 +1034,8 @@ impl RpcClient {
}
progress_bar.set_message(&format!(
"[{}/{}] Waiting for confirmations",
confirmations, MAX_LOCKOUT_HISTORY,
confirmations + 1,
MAX_LOCKOUT_HISTORY + 1,
));
sleep(Duration::from_millis(500));
confirmations = self.get_num_blocks_since_signature_confirmation(&signature)?;