From f51b21444999bfd833155e4671cc0257455b4bbd Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 25 May 2020 12:31:15 -0700
Subject: [PATCH] Adjust include_owner_in_hash to match mainet-beta v1.0
 activation (#10230)

automerge
---
 runtime/src/accounts_db.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 84d3b2a5e0..eafb8678d0 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -1331,9 +1331,8 @@ impl AccountsDB {
     }
 
     pub fn include_owner_in_hash(slot: Slot) -> bool {
-        // Account hashing updated to include owner activates at this slot on the testnet
-        // DANGER: Remove this guard ABSOLUTELY before the mainnet-beta transitions to v1.1.
-        slot >= 14_000_000
+        // Account hashing updated to include owner activates at this slot on the testnet/mainnet-beta
+        slot >= 11_000_000
     }
 
     pub fn hash_account_data(