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

Improve pre-operating-mode-based hashing gating

Browse Source
This commit is contained in:
Ryo Onodera
2020-09-19 19:12:42 +09:00
committed by Trent Nelson
parent e371681f53
commit 7045aa9760
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/src/accounts_db.rs
View File

@ -1339,11 +1339,15 @@ impl AccountsDB {
hasher.result() hasher.result()
} }
pub fn include_owner_in_hash(slot: Slot) -> bool { pub fn include_owner_in_hash(slot: Slot, operating_mode: OperatingMode) -> bool {
// Account hashing will be updated to include owner at this slot on the devnet. // Account hashing will be updated to include owner at this slot on the devnet.
// For testnet, it fully transitioned already thanks to eager rent collection, // For testnet, it fully transitioned already thanks to eager rent collection,
// so, this check is irrelevant, strictly speaking. // so, this check is irrelevant, strictly speaking.
slot >= 5_800_000 match operating_mode {
OperatingMode::Development => slot >= 5_800_000,
OperatingMode::Stable => true,
OperatingMode::Preview => true,
}
} }
pub fn hash_account_data( pub fn hash_account_data(
@ -1653,13 +1657,15 @@ impl AccountsDB {
.and_then(|store| { .and_then(|store| {
let account = store.accounts.get_account(account_info.offset)?.0; let account = store.accounts.get_account(account_info.offset)?.0;
let operating_mode = self
.operating_mode
.expect("Operating mode must be set at initialization");
if check_hash { if check_hash {
let hash = Self::hash_stored_account( let hash = Self::hash_stored_account(
*slot, *slot,
&account, &account,
self.operating_mode operating_mode,
.expect("Operating mode must be set at initialization"), Self::include_owner_in_hash(*slot, operating_mode),
Self::include_owner_in_hash(*slot),
); );
if hash != *account.hash { if hash != *account.hash {
mismatch_found.fetch_add(1, Ordering::Relaxed); mismatch_found.fetch_add(1, Ordering::Relaxed);
@ -1911,7 +1917,7 @@ impl AccountsDB {
account, account,
pubkey, pubkey,
operating_mode, operating_mode,
Self::include_owner_in_hash(slot), Self::include_owner_in_hash(slot, operating_mode),
) )
}) })
.collect(); .collect();