Merge branch 'develop' of https://github.com/stacks-network/stacks-core into fix/bitcoind-forking-test-signerdb-state

jferrant · jferrant · commit 942b434aa766 · 2025-01-08T16:20:41.000-05:00
diff --git a/sample/conf/testnet-follower-conf.toml b/sample/conf/testnet-follower-conf.toml
@@ -77,8 +77,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
 
 [[burnchain.epochs]]
 epoch_name = "3.1"
-start_height = 77_770
+start_height = 2000
diff --git a/sample/conf/testnet-miner-conf.toml b/sample/conf/testnet-miner-conf.toml
@@ -73,8 +73,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
 
 [[burnchain.epochs]]
 epoch_name = "3.1"
-start_height = 77_770
+start_height = 2000
diff --git a/sample/conf/testnet-signer.toml b/sample/conf/testnet-signer.toml
@@ -75,4 +75,8 @@ start_height = 6
 
 [[burnchain.epochs]]
 epoch_name = "3.0"
-start_height = 56_457
+start_height = 1900
+
+[[burnchain.epochs]]
+epoch_name = "3.1"
+start_height = 2000
