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

Clean up `nonce_must_be_advanceable` feature (#26446) 

Clean up nonce_must_be_advanceable feature
This commit is contained in:
Justin Starry 2022-07-06 19:36:33 +02:00 committed by GitHub
parent 06ebfa1eb2
commit ff1e6fcbed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/src/bank.rs
View File

@ -4159,11 +4159,8 @@ impl Bank {
let durable_nonces_enabled = enable_durable_nonce
|| self.slot() <= 135986379
|| self.cluster_type() != ClusterType::MainnetBeta;
let nonce_must_be_advanceable = self
.feature_set
.is_active(&feature_set::nonce_must_be_advanceable::ID);
let nonce_is_advanceable = tx.message().recent_blockhash() != next_durable_nonce.as_hash();
(durable_nonces_enabled && (nonce_is_advanceable || !nonce_must_be_advanceable))
(durable_nonces_enabled && nonce_is_advanceable)
.then(|| self.check_message_for_nonce(tx.message()))
.flatten()
}