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

More reliable way to detect expired transactions (#10482)

Browse Source 
When the root slot is beyond the last valid slot, we can say
with certainty that the blockhash is expired. Unfortunately,
we still can't say the transaction didn't land. It may have
landed a long time ago and the validator has since purged
its transaction status.
This commit is contained in:
Greg Fitzgerald
2020-06-10 17:00:13 -06:00
committed by GitHub
parent 1e3554b33d
commit 9c2c64f8c8
3 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tokens/src/commands.rs
View File

@@ -160,7 +160,7 @@ fn distribute_tokens<T: Client>(
let fee_payer_pubkey = args.fee_payer.pubkey();
let message = Message::new_with_payer(&instructions, Some(&fee_payer_pubkey));
match client.send_message(message, &signers) {
Ok((transaction, _last_valid_slot)) => {
Ok((transaction, last_valid_slot)) => {
db::set_transaction_info(
db,
&allocation.recipient.parse().unwrap(),
@@ -168,6 +168,7 @@ fn distribute_tokens<T: Client>(
&transaction,
Some(&new_stake_account_address),
false,
last_valid_slot,
)?;
}
Err(e) => {
@@ -332,20 +333,20 @@ fn update_finalized_transactions<T: Client>(
if info.finalized_date.is_some() {
None
} else {
Some(&info.transaction)
Some((&info.transaction, info.last_valid_slot))
}
})
.collect();
let unconfirmed_signatures: Vec<_> = unconfirmed_transactions
.iter()
.map(|tx| tx.signatures[0])
.map(|(tx, _slot)| tx.signatures[0])
.filter(|sig| *sig != Signature::default()) // Filter out dry-run signatures
.collect();
let transaction_statuses = client.get_signature_statuses(&unconfirmed_signatures)?;
let recent_blockhashes = client.get_recent_blockhashes()?;
let root_slot = client.get_slot()?;
let mut confirmations = None;
for (transaction, opt_transaction_status) in unconfirmed_transactions
for ((transaction, last_valid_slot), opt_transaction_status) in unconfirmed_transactions
.into_iter()
.zip(transaction_statuses.into_iter())
{
@@ -353,8 +354,8 @@ fn update_finalized_transactions<T: Client>(
db,
&transaction.signatures[0],
opt_transaction_status,
&transaction.message.recent_blockhash,
&recent_blockhashes,
last_valid_slot,
root_slot,
) {
Ok(Some(confs)) => {
confirmations = Some(cmp::min(confs, confirmations.unwrap_or(usize::MAX)));