From 062a3b8057746fb8a80030ece23e4db52fa7ae2e Mon Sep 17 00:00:00 2001
From: Jude Nelson <jude@stacks.org>
Date: Fri, 6 Dec 2024 15:24:06 -0500
Subject: [PATCH 1/2] chore: pick testnet activation heights for epoch 3.1 and
 stacks halvenings

---
 stacks-common/src/types/mod.rs                      | 8 ++++----
 testnet/stacks-node/conf/testnet-follower-conf.toml | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/stacks-common/src/types/mod.rs b/stacks-common/src/types/mod.rs
index 4a1f34cbc7..49fdfa84fd 100644
--- a/stacks-common/src/types/mod.rs
+++ b/stacks-common/src/types/mod.rs
@@ -172,19 +172,19 @@ pub const COINBASE_INTERVALS_TESTNET: LazyCell<[CoinbaseInterval; 5]> = LazyCell
         },
         CoinbaseInterval {
             coinbase: 500 * u128::from(MICROSTACKS_PER_STACKS),
-            effective_start_height: 1000,
+            effective_start_height: 77_777,
         },
         CoinbaseInterval {
             coinbase: 250 * u128::from(MICROSTACKS_PER_STACKS),
-            effective_start_height: 2000,
+            effective_start_height: 77_777 * 7,
         },
         CoinbaseInterval {
             coinbase: 125 * u128::from(MICROSTACKS_PER_STACKS),
-            effective_start_height: 3000,
+            effective_start_height: 77_777 * 14,
         },
         CoinbaseInterval {
             coinbase: (625 * u128::from(MICROSTACKS_PER_STACKS)) / 10,
-            effective_start_height: 4000,
+            effective_start_height: 77_777 * 21,
         },
     ];
     assert!(CoinbaseInterval::check_order(&emissions_schedule));
diff --git a/testnet/stacks-node/conf/testnet-follower-conf.toml b/testnet/stacks-node/conf/testnet-follower-conf.toml
index 80226c5b89..c294a628b4 100644
--- a/testnet/stacks-node/conf/testnet-follower-conf.toml
+++ b/testnet/stacks-node/conf/testnet-follower-conf.toml
@@ -78,3 +78,7 @@ start_height = 6
 [[burnchain.epochs]]
 epoch_name = "3.0"
 start_height = 56_457
+
+[[burnchain.epochs]]
+epoch_name = "3.1"
+start_height = 77_770

From 5a69d108a6208892422409e528f17cc8b7106f16 Mon Sep 17 00:00:00 2001
From: wileyj <2847772+wileyj@users.noreply.github.com>
Date: Mon, 9 Dec 2024 11:39:45 -0800
Subject: [PATCH 2/2] add epoch 3.1 config for testnet-miner-conf.toml

---
 testnet/stacks-node/conf/testnet-miner-conf.toml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testnet/stacks-node/conf/testnet-miner-conf.toml b/testnet/stacks-node/conf/testnet-miner-conf.toml
index 93455dcee5..65f8cace68 100644
--- a/testnet/stacks-node/conf/testnet-miner-conf.toml
+++ b/testnet/stacks-node/conf/testnet-miner-conf.toml
@@ -74,3 +74,7 @@ start_height = 6
 [[burnchain.epochs]]
 epoch_name = "3.0"
 start_height = 56_457
+
+[[burnchain.epochs]]
+epoch_name = "3.1"
+start_height = 77_770