Merge pull request #5520 from stacks-network/feat/sip29-testnet-config

Feat/sip29 testnet config

Author: aldur

stacks-signer/src/signerdb.rs

@@ -871,16 +871,6 @@ where
         .map_err(DBError::SerializationError)
 }
 
-#[cfg(test)]
-pub fn test_signer_db(db_path: &str) -> SignerDb {
-    use std::fs;
-
-    if fs::metadata(db_path).is_ok() {
-        fs::remove_file(db_path).unwrap();
-    }
-    SignerDb::new(db_path).expect("Failed to create signer db")
-}
-
 #[cfg(test)]
 mod tests {
     use std::fs;

stackslib/src/chainstate/burn/db/sortdb.rs

@@ -3987,7 +3987,7 @@ impl<'a> SortitionDBConn<'a> {
             tip,
             reward_cycle_id,
         )?;
-        info!("Fetching preprocessed reward set";
+        debug!("Fetching preprocessed reward set";
               "tip_sortition_id" => %tip,
               "reward_cycle_id" => reward_cycle_id,
               "prepare_phase_start_sortition_id" => %first_sortition,

stackslib/src/core/mod.rs

@@ -457,7 +457,7 @@ lazy_static! {
             network_epoch: PEER_VERSION_EPOCH_3_0
         },
         StacksEpoch {
-            epoch_id: StacksEpochId::Epoch30,
+            epoch_id: StacksEpochId::Epoch31,
             start_height: 8001,
             end_height: STACKS_EPOCH_MAX,
             block_limit: BLOCK_LIMIT_MAINNET_21.clone(),

testnet/stacks-node/src/config.rs

@@ -659,6 +659,8 @@ impl Config {
                 Ok(StacksEpochId::Epoch25)
             } else if epoch_name == EPOCH_CONFIG_3_0_0 {
                 Ok(StacksEpochId::Epoch30)
+            } else if epoch_name == EPOCH_CONFIG_3_1_0 {
+                Ok(StacksEpochId::Epoch31)
             } else {
                 Err(format!("Unknown epoch name specified: {epoch_name}"))
             }?;
@@ -685,6 +687,7 @@ impl Config {
             StacksEpochId::Epoch24,
             StacksEpochId::Epoch25,
             StacksEpochId::Epoch30,
+            StacksEpochId::Epoch31,
         ];
         for (expected_epoch, configured_epoch) in expected_list
             .iter()
@@ -1291,6 +1294,7 @@ pub const EPOCH_CONFIG_2_3_0: &str = "2.3";
 pub const EPOCH_CONFIG_2_4_0: &str = "2.4";
 pub const EPOCH_CONFIG_2_5_0: &str = "2.5";
 pub const EPOCH_CONFIG_3_0_0: &str = "3.0";
+pub const EPOCH_CONFIG_3_1_0: &str = "3.1";
 
 #[derive(Clone, Deserialize, Default, Debug)]
 pub struct AffirmationOverride {