gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use optimistic confirmation in getSignatureStatuses, and various downstream client methods (bp #14430) (#14610)

Browse Source 
* Use optimistic confirmation in getSignatureStatuses, and various downstream client methods (#14430)

* Add optimistically_confirmed field to TransactionStatus

* Update docs

* Convert new field to confirmation_status

* Update docs to confirmationStatus

* Update variants

* Update docs

* Just Confirmed

(cherry picked from commit 9a89689ad3)

# Conflicts:
#	tokens/src/commands.rs

* Fix conflict

Co-authored-by: Tyera Eulberg <teulberg@gmail.com>
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
mergify[bot]
2021-01-16 04:46:08 +00:00
committed by GitHub
parent a1a70060e9
commit 2e31f4d8f7
11 changed files with 162 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/src/program.rs
View File

@@ -41,6 +41,7 @@ use solana_sdk::{
system_program,
transaction::Transaction,
};
use solana_transaction_status::TransactionConfirmationStatus;
use std::{
cmp::min, collections::HashMap, error, fs::File, io::Read, net::UdpSocket, path::PathBuf,
sync::Arc, thread::sleep, time::Duration,
@@ -1493,7 +1494,11 @@ fn send_and_confirm_transactions_with_spinner<T: Signers>(
for (signature, status) in pending_signatures.into_iter().zip(statuses.into_iter()) {
if let Some(status) = status {
if status.confirmations.is_none() || status.confirmations.unwrap() > 1 {
if let Some(confirmation_status) = &status.confirmation_status {
if *confirmation_status != TransactionConfirmationStatus::Processed {
let _ = pending_transactions.remove(&signature);
}
} else if status.confirmations.is_none() || status.confirmations.unwrap() > 1 {
let _ = pending_transactions.remove(&signature);
}
}