Merge branch 'feat/sip_031_epoch32' into feat/sip_031_boot_contract

Author: rdeioris

sample/conf/testnet-signer.toml

@@ -80,3 +80,7 @@ start_height = 1900
 [[burnchain.epochs]]
 epoch_name = "3.1"
 start_height = 2000
+
+[[burnchain.epochs]]
+epoch_name = "3.2"
+start_height = 2100

stacks-common/src/types/tests.rs

@@ -184,71 +184,26 @@ fn test_get_coinbase_at_effective_height() {
 #[test]
 fn test_epoch_coinbase_reward() {
     // new coinbase schedule
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 666050),
-        1_000_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 666051),
-        1_000_000_000
-    );
+    for epoch in [StacksEpochId::Epoch31, StacksEpochId::Epoch32].iter() {
+        assert_eq!(epoch.coinbase_reward(true, 666050, 666050), 1_000_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 666051), 1_000_000_000);
 
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 944_999),
-        1_000_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 945_000),
-        500_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 945_001),
-        500_000_000
-    );
+        assert_eq!(epoch.coinbase_reward(true, 666050, 944_999), 1_000_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 945_000), 500_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 945_001), 500_000_000);
 
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_049_999),
-        500_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_050_000),
-        250_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_050_001),
-        250_000_000
-    );
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_049_999), 500_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_050_000), 250_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_050_001), 250_000_000);
 
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_259_999),
-        250_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_260_000),
-        125_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_260_001),
-        125_000_000
-    );
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_259_999), 250_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_260_000), 125_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_260_001), 125_000_000);
 
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_469_999),
-        125_000_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_470_000),
-        62_500_000
-    );
-    assert_eq!(
-        StacksEpochId::Epoch31.coinbase_reward(true, 666050, 1_470_001),
-        62_500_000
-    );
-
-    assert_eq!(
-        StacksEpochId::Epoch32.coinbase_reward(true, 666050, 666050),
-        1_000_000_000
-    );
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_469_999), 125_000_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_470_000), 62_500_000);
+        assert_eq!(epoch.coinbase_reward(true, 666050, 1_470_001), 62_500_000);
+    }
 
     // old coinbase schedule
     for epoch in [
@@ -259,6 +214,7 @@ fn test_epoch_coinbase_reward() {
         StacksEpochId::Epoch23,
         StacksEpochId::Epoch24,
         StacksEpochId::Epoch25,
+        StacksEpochId::Epoch30,
     ]
     .iter()
     {

stackslib/src/chainstate/stacks/db/blocks.rs

@@ -4096,7 +4096,7 @@ impl StacksChainState {
                         current_epoch = StacksEpochId::Epoch32;
                     }
                     StacksEpochId::Epoch32 => {
-                        panic!("No defined transition from Epoch31 forward")
+                        panic!("No defined transition from Epoch32 forward")
                     }
                 }
 

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -12684,7 +12684,7 @@ fn write_signer_update(
 
 /// Test SIP-031 activation
 ///
-/// - check epoch 3.2 is activa
+/// - check epoch 3.2 is active
 /// - check sip031 boot contract has a balance of 200_000_000 STX (TODO)
 #[test]
 #[ignore]