From 3d3f94e35335f42cf3be6708e037ccd5b248365c Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Tue, 26 May 2020 16:27:45 +0900 Subject: [PATCH 1/2] Lower owner hashing activation slot for devnet --- runtime/src/accounts_db.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index 75e9585016288a..a748b6a0acaa6b 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -1209,8 +1209,10 @@ impl AccountsDB { } pub fn include_owner_in_hash(slot: Slot) -> bool { - // Account hashing updated to include owner activates at this slot on the testnet - slot >= 14_000_000 + // 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, + // so, this check is irrelevant, strictly speaking. + slot >= 6_500_000 } pub fn hash_account_data( From 13d905499caf46e11c10b5d20f17401901eb8939 Mon Sep 17 00:00:00 2001 From: Ryo Onodera Date: Wed, 27 May 2020 02:34:16 +0900 Subject: [PATCH 2/2] Make it happen sooner Co-authored-by: Michael Vines --- runtime/src/accounts_db.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs index a748b6a0acaa6b..a947e3530b103f 100644 --- a/runtime/src/accounts_db.rs +++ b/runtime/src/accounts_db.rs @@ -1212,7 +1212,7 @@ impl AccountsDB { // 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, // so, this check is irrelevant, strictly speaking. - slot >= 6_500_000 + slot >= 5_800_000 } pub fn hash_account_data(