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

maybe_update_rent_epoch_on_load (#24055)

This commit is contained in:
Jeff Washington (jwash) 2022-04-19 08:29:36 -05:00 committed by GitHub
parent dc98510d6d
commit 569b15d863
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
runtime/src/bank.rs
View File

@ -49,6 +49,7 @@ use {
builtins::{self, BuiltinAction, BuiltinFeatureTransition, Builtins}, builtins::{self, BuiltinAction, BuiltinFeatureTransition, Builtins},
cost_tracker::CostTracker, cost_tracker::CostTracker,
epoch_stakes::{EpochStakes, NodeVoteAccounts}, epoch_stakes::{EpochStakes, NodeVoteAccounts},
expected_rent_collection::{ExpectedRentCollection, SlotInfoInEpoch},
inline_spl_associated_token_account, inline_spl_token, inline_spl_associated_token_account, inline_spl_token,
message_processor::MessageProcessor, message_processor::MessageProcessor,
rent_collector::{CollectedInfo, RentCollector}, rent_collector::{CollectedInfo, RentCollector},
@ -1243,6 +1244,9 @@ pub struct Bank {
sysvar_cache: RwLock<SysvarCache>, sysvar_cache: RwLock<SysvarCache>,
/// (Pubkey, account Hash) for each account that would have been rewritten in rent collection for this slot
pub rewrites_skipped_this_slot: Rewrites,
/// Current size of the accounts data. Used when processing messages to enforce a limit on its /// Current size of the accounts data. Used when processing messages to enforce a limit on its
/// maximum size. /// maximum size.
accounts_data_len: AtomicU64, accounts_data_len: AtomicU64,
@ -1329,6 +1333,7 @@ impl Bank {
fn default_with_accounts(accounts: Accounts) -> Self { fn default_with_accounts(accounts: Accounts) -> Self {
let bank = Self { let bank = Self {
rewrites_skipped_this_slot: Rewrites::default(),
rc: BankRc::new(accounts, Slot::default()), rc: BankRc::new(accounts, Slot::default()),
src: StatusCacheRc::default(), src: StatusCacheRc::default(),
blockhash_queue: RwLock::<BlockhashQueue>::default(), blockhash_queue: RwLock::<BlockhashQueue>::default(),
@ -1654,6 +1659,7 @@ impl Bank {
let accounts_data_len = parent.load_accounts_data_len(); let accounts_data_len = parent.load_accounts_data_len();
let mut new = Bank { let mut new = Bank {
rewrites_skipped_this_slot: Rewrites::default(),
rc, rc,
src, src,
slot, slot,
@ -1977,6 +1983,7 @@ impl Bank {
} }
let feature_set = new(); let feature_set = new();
let mut bank = Self { let mut bank = Self {
rewrites_skipped_this_slot: Rewrites::default(),
rc: bank_rc, rc: bank_rc,
src: new(), src: new(),
blockhash_queue: RwLock::new(fields.blockhash_queue), blockhash_queue: RwLock::new(fields.blockhash_queue),
@ -5697,7 +5704,21 @@ impl Bank {
ancestors: &Ancestors, ancestors: &Ancestors,
pubkey: &Pubkey, pubkey: &Pubkey,
) -> Option<(AccountSharedData, Slot)> { ) -> Option<(AccountSharedData, Slot)> {
self.rc.accounts.load_with_fixed_root(ancestors, pubkey) match self.rc.accounts.load_with_fixed_root(ancestors, pubkey) {
Some((mut account, storage_slot)) => {
ExpectedRentCollection::maybe_update_rent_epoch_on_load(
&mut account,
&SlotInfoInEpoch::new_small(storage_slot),
&SlotInfoInEpoch::new_small(self.slot()),
self.rent_collector(),
pubkey,
&self.rewrites_skipped_this_slot,
);
Some((account, storage_slot))
}
None => None,
}
} }
pub fn get_program_accounts( pub fn get_program_accounts(