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

Gate nonce-overwrite change (#11081)

Browse Source
This commit is contained in:
Tyera Eulberg
2020-07-15 15:45:30 -06:00
committed by GitHub
parent fe71f9ad1a
commit 1da9f9f05a
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/src/accounts.rs
View File

@@ -650,6 +650,7 @@ impl Accounts {
loaded: &mut [(Result<TransactionLoadResult>, Option<HashAgeKind>)],
rent_collector: &RentCollector,
last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
fix_recent_blockhashes_sysvar_delay: bool,
) {
let accounts_to_store = self.collect_accounts_to_store(
txs,
@@ -658,6 +659,7 @@ impl Accounts {
loaded,
rent_collector,
last_blockhash_with_fee_calculator,
fix_recent_blockhashes_sysvar_delay,
);
self.accounts_db.store(slot, &accounts_to_store);
}
@@ -684,6 +686,7 @@ impl Accounts {
loaded: &'a mut [(Result<TransactionLoadResult>, Option<HashAgeKind>)],
rent_collector: &RentCollector,
last_blockhash_with_fee_calculator: &(Hash, FeeCalculator),
fix_recent_blockhashes_sysvar_delay: bool,
) -> Vec<(&'a Pubkey, &'a Account)> {
let mut accounts = Vec::with_capacity(loaded.len());
for (i, ((raccs, _hash_age_kind), tx)) in loaded
@@ -720,6 +723,7 @@ impl Accounts {
res,
maybe_nonce,
last_blockhash_with_fee_calculator,
fix_recent_blockhashes_sysvar_delay,
);
if message.is_writable(i) {
if account.rent_epoch == 0 {
@@ -1675,6 +1679,7 @@ mod tests {
&mut loaded,
&rent_collector,
&(Hash::default(), FeeCalculator::default()),
true,
);
assert_eq!(collected_accounts.len(), 2);
assert!(collected_accounts