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

Add unlock epochs for blake3 (bp #12054) (#12055)

Browse Source 
* Add unlock epochs for blake3 (#12054)

Co-authored-by: Carl <carl@solana.com>
(cherry picked from commit a13efc52b3)

# Conflicts:
#	runtime/src/accounts_db.rs

* Resolve conflicts

* Bump hash

Co-authored-by: carllin <wumu727@gmail.com>
Co-authored-by: Carl <carl@solana.com>
This commit is contained in:
mergify[bot]
2020-09-05 00:42:16 +00:00
committed by GitHub
parent a018d78056
commit ebbb106fb7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/src/accounts_db.rs
View File

@ -1426,9 +1426,12 @@ impl AccountsDB {
fn get_blake3_slot(operating_mode: OperatingMode) -> Slot { fn get_blake3_slot(operating_mode: OperatingMode) -> Slot {
match operating_mode { match operating_mode {
OperatingMode::Development => std::u64::MAX, // Epoch 400
OperatingMode::Stable => std::u64::MAX, OperatingMode::Development => 3_276_800,
OperatingMode::Preview => std::u64::MAX, // Epoch 78
OperatingMode::Stable => 33_696_000,
// Epoch 95
OperatingMode::Preview => 35_516_256,
} }
} }
@ -3613,7 +3616,7 @@ pub mod tests {
}; };
let account = stored_account.clone_account(); let account = stored_account.clone_account();
let expected_account_hash = let expected_account_hash =
Hash::from_str("GGTsxvxwnMsNfN6yYbBVQaRgvbVLfxeWnGXNyB8iXDyE").unwrap(); Hash::from_str("DoLjP4cYoGFKn4unuxeSjwDkN3bZop8jpGWYfAnwnG5N").unwrap();
assert_eq!( assert_eq!(
AccountsDB::hash_stored_account( AccountsDB::hash_stored_account(
@ -3638,7 +3641,7 @@ pub mod tests {
); );
let expected_account_hash_with_owner = let expected_account_hash_with_owner =
Hash::from_str("5iRNZVcAnq9JLYjSF2ibFhGEeq48r9Eq9HXxwm3BxywN").unwrap(); Hash::from_str("4StuvYHFd7xuShVXB94uHHvpqGMCaacdZnYB74QQkPA1").unwrap();
assert_eq!( assert_eq!(
AccountsDB::hash_stored_account( AccountsDB::hash_stored_account(