Merge branch 'develop' into feat/block-info-handling

Author: jcnelson

.github/workflows/bitcoin-tests.yml

@@ -119,6 +119,7 @@ jobs:
           - tests::signer::v0::signer_set_rollover
           - tests::signer::v0::signing_in_0th_tenure_of_reward_cycle
           - tests::signer::v0::continue_after_tenure_extend
+          - tests::signer::v0::multiple_miners_with_custom_chain_id
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state

stacks-signer/src/config.rs

@@ -156,7 +156,7 @@ pub struct GlobalConfig {
     /// How much time to wait for a miner to propose a block following a sortition
     pub block_proposal_timeout: Duration,
     /// An optional custom Chain ID
-    chain_id: Option<u32>,
+    pub chain_id: Option<u32>,
 }
 
 /// Internal struct for loading up the config file

testnet/stacks-node/src/config.rs

@@ -550,6 +550,16 @@ impl Config {
                 &burnchain.pox_constants
             );
         }
+        let activation_reward_cycle = burnchain
+            .block_height_to_reward_cycle(epoch_30.start_height)
+            .expect("FATAL: Epoch 3.0 starts before the first burnchain block");
+        if activation_reward_cycle < 2 {
+            panic!(
+                "FATAL: Epoch 3.0 must start at or after the second reward cycle. Epoch 3.0 start set to: {}. PoX Parameters: {:?}",
+                epoch_30.start_height,
+                &burnchain.pox_constants
+            );
+        }
     }
 
     /// Connect to the MempoolDB using the configured cost estimation