WIP: enforce obvious order of events in mine_nakamoto_block

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

stacks-node/src/tests/signer/mod.rs

@@ -70,6 +70,7 @@ use super::nakamoto_integrations::{
 use super::neon_integrations::{
     copy_dir_all, get_account, get_sortition_info_ch, submit_tx_fallible, Account,
 };
+use crate::nakamoto_node::miner::TEST_MINE_SKIP;
 use crate::neon::Counters;
 use crate::run_loop::boot_nakamoto;
 use crate::tests::bitcoin_regtest::BitcoinCoreController;
@@ -80,6 +81,7 @@ use crate::tests::neon_integrations::{
     get_chain_info, next_block_and_wait, run_until_burnchain_height, test_observer,
     wait_for_runloop,
 };
+use crate::tests::signer::v0::wait_for_state_machine_update_by_miner_tenure_id;
 use crate::tests::to_addr;
 use crate::BitcoinRegtestController;
 
@@ -1101,23 +1103,44 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
     /// Mine a BTC block and wait for a new Stacks block to be mined
     /// Note: do not use nakamoto blocks mined heuristic if running a test with multiple miners
     fn mine_nakamoto_block(&self, timeout: Duration, use_nakamoto_blocks_mined: bool) {
-        let mined_block_time = Instant::now();
         let mined_before = self.running_nodes.counters.naka_mined_blocks.get();
-        let info_before = self.get_peer_info();
-
+        let info_before = get_chain_info(&self.running_nodes.conf);
+        let mined_btc_block_time = Instant::now();
+        info!("Pausing stacks block mining");
+        TEST_MINE_SKIP.set(true);
         next_block_and(
             &self.running_nodes.btc_regtest_controller,
             timeout.as_secs(),
-            || {
-                let info_after = self.get_peer_info();
-                let blocks_mined = self.running_nodes.counters.naka_mined_blocks.get();
-                Ok(info_after.stacks_tip_height > info_before.stacks_tip_height
-                    && (!use_nakamoto_blocks_mined || blocks_mined > mined_before))
-            },
+            || Ok(self.get_peer_info().burn_block_height > info_before.burn_block_height),
         )
         .unwrap();
-        let mined_block_elapsed_time = mined_block_time.elapsed();
-        info!("Nakamoto block mine time elapsed: {mined_block_elapsed_time:?}");
+        info!(
+            "Bitcoin block mine time elapsed: {:?}",
+            mined_btc_block_time.elapsed()
+        );
+        wait_for_state_machine_update_by_miner_tenure_id(
+            timeout.as_secs(),
+            &get_chain_info(&self.running_nodes.conf).pox_consensus,
+            &self.signer_addresses_versions(),
+        )
+        .expect("Failed to update signer state machine");
+
+        info!("Unpausing stacks block mining");
+        let mined_block_time = Instant::now();
+        TEST_MINE_SKIP.set(false);
+        wait_for(timeout.as_secs(), || {
+            let info_after = get_chain_info(&self.running_nodes.conf);
+            let blocks_mined = self.running_nodes.counters.naka_mined_blocks.get();
+            // println!("HERE BEFORE {}, AFTER {}", info_before.stacks_tip_height, info_after.stacks_tip_height);
+            // println!("HERE BEFORE {mined_before}, AFTER {blocks_mined}");
+            Ok(info_after.stacks_tip_height > info_before.stacks_tip_height
+                && (!use_nakamoto_blocks_mined || blocks_mined > mined_before))
+        })
+        .expect("Failed to mine Tenure Change block");
+        info!(
+            "Nakamoto block mine time elapsed: {:?}",
+            mined_block_time.elapsed()
+        );
     }
 
     fn mine_block_wait_on_processing(

stacks-node/src/tests/signer/v0.rs

@@ -4466,7 +4466,7 @@ fn tx_replay_with_fork_occured_before_starting_replaying_txs() {
     let pre_fork_tenures = 12; //go to 2nd tenure of 12th cycle
     for i in 0..pre_fork_tenures {
         info!("Mining pre-fork tenure {} of {pre_fork_tenures}", i + 1);
-        signer_test.mine_nakamoto_block(Duration::from_secs(30), true);
+        signer_test.mine_nakamoto_block(Duration::from_secs(60), true);
     }
 
     // Make 1 transfer tx (this will get forked)
@@ -4506,6 +4506,7 @@ fn tx_replay_with_fork_occured_before_starting_replaying_txs() {
         .unwrap();
     }
 
+    info!("HERE WE ARE WAITING");
     // Signers move in Tx Replay mode
     signer_test
         .wait_for_signer_state_check(30, |state| {