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

Use newer blockhash for recent_confirmed_blockhash api (#3995) 

Oldest blockhash is sometimes too old and does not allow
for transactions to go through.
This commit is contained in:
sakridge 2019-04-25 16:57:25 -07:00 committed by GitHub
parent 15aa07f2a0
commit aa0b67c93c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
runtime/src/bank.rs
View File

@ -25,6 +25,7 @@ use solana_sdk::system_transaction;
use solana_sdk::timing::{duration_as_ms, duration_as_us, MAX_RECENT_BLOCKHASHES}; use solana_sdk::timing::{duration_as_ms, duration_as_us, MAX_RECENT_BLOCKHASHES};
use solana_sdk::transaction::{Result, Transaction, TransactionError}; use solana_sdk::transaction::{Result, Transaction, TransactionError};
use solana_vote_api::vote_state::{self, Vote}; use solana_vote_api::vote_state::{self, Vote};
use std::cmp;
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use std::sync::{Arc, RwLock}; use std::sync::{Arc, RwLock};
use std::time::Instant; use std::time::Instant;
@ -409,12 +410,17 @@ impl Bank {
pub fn last_blockhash(&self) -> Hash { pub fn last_blockhash(&self) -> Hash {
self.blockhash_queue.read().unwrap().last_hash() self.blockhash_queue.read().unwrap().last_hash()
} }
/// Return the root bank's blockhash
/// Return a confirmed blockhash with NUM_BLOCKHASH_CONFIRMATIONS
pub fn confirmed_last_blockhash(&self) -> Hash { pub fn confirmed_last_blockhash(&self) -> Hash {
if let Some(bank) = self.parents().last() { const NUM_BLOCKHASH_CONFIRMATIONS: usize = 3;
bank.last_blockhash()
} else { let parents = self.parents();
if parents.is_empty() {
self.last_blockhash() self.last_blockhash()
} else {
let index = cmp::min(NUM_BLOCKHASH_CONFIRMATIONS, parents.len() - 1);
parents[index].last_blockhash()
} }
} }