From 1f8df36b7d786384e61319a6dd693bce76da56af Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Wed, 22 Jul 2020 13:54:17 -0600
Subject: [PATCH] Push back activation epochs

Effects:
- Re-enabling inflation
- Nonce FeeCalculator overwrite / RecentBlockhashes sysvar inconsistency fix
---
 genesis-programs/src/lib.rs | 2 +-
 runtime/src/bank.rs         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs
index eb212ac102..bf7c34d6d7 100644
--- a/genesis-programs/src/lib.rs
+++ b/genesis-programs/src/lib.rs
@@ -30,7 +30,7 @@ pub fn get_inflation(operating_mode: OperatingMode, epoch: Epoch) -> Option<Infl
             68 => Some(Inflation::new_disabled()),
             // Enable again after the inflation fix has landed:
             // https://github.com/solana-labs/solana/commit/7cc2a6801bed29a816ef509cfc26a6f2522e46ff
-            72 => Some(Inflation::default()),
+            74 => Some(Inflation::default()),
             _ => None,
         },
         OperatingMode::Stable => match epoch {
diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index bd998ce4fc..d3c8b32d12 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -3065,7 +3065,7 @@ impl Bank {
     fn fix_recent_blockhashes_sysvar_delay(&self) -> bool {
         let activation_slot = match self.operating_mode() {
             OperatingMode::Development => 0,
-            OperatingMode::Stable => Slot::MAX / 2,
+            OperatingMode::Stable => 26_444_256, // Epoch 74
             OperatingMode::Preview => Slot::MAX / 2,
         };