Fix flakiness by ensuring block commits confirm the expected stacks block

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

Author: jferrant

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

@@ -1103,11 +1103,24 @@ 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_before = self.running_nodes.counters.naka_mined_blocks.get();
         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);
+
+        let Counters {
+            naka_submitted_commits: commits_submitted,
+            naka_submitted_commit_last_burn_height: commits_last_burn_height,
+            naka_submitted_commit_last_stacks_tip: commits_last_stacks_tip,
+            naka_mined_blocks: mined_blocks,
+            ..
+        } = self.running_nodes.counters.clone();
+
+        let commits_before = commits_submitted.load(Ordering::SeqCst);
+        let commit_burn_height_before = commits_last_burn_height.load(Ordering::SeqCst);
+        let commits_stacks_tip_before = commits_last_stacks_tip.load(Ordering::SeqCst);
+        let mined_before = mined_blocks.load(Ordering::SeqCst);
+
         next_block_and(
             &self.running_nodes.btc_regtest_controller,
             timeout.as_secs(),
@@ -1128,13 +1141,15 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
         info!("Unpausing stacks block mining");
         let mined_block_time = Instant::now();
         TEST_MINE_SKIP.set(false);
+        // Ensure that the tenure change transaction is mined and that the subsequent block commit confirms it
         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))
+            Ok(commits_submitted.load(Ordering::SeqCst) > commits_before
+                && commits_last_burn_height.load(Ordering::SeqCst) >= commit_burn_height_before
+                && commits_last_stacks_tip.load(Ordering::SeqCst) >= commits_stacks_tip_before
+                && get_chain_info(&self.running_nodes.conf).stacks_tip_height
+                    > info_before.stacks_tip_height
+                && (!use_nakamoto_blocks_mined
+                    || mined_blocks.load(Ordering::SeqCst) > mined_before))
         })
         .expect("Failed to mine Tenure Change block");
         info!(

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

@@ -175,31 +175,7 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
         // Note, we don't use `nakamoto_blocks_mined` counter, because there
         // could be other miners mining blocks.
         info!("Waiting for first Epoch 3.0 tenure to start");
-        let info = get_chain_info(&self.running_nodes.conf);
-        next_block_and(&self.running_nodes.btc_regtest_controller, 30, || {
-            Ok(get_chain_info(&self.running_nodes.conf).burn_block_height > info.burn_block_height)
-        })
-        .unwrap();
-        let info = get_chain_info(&self.running_nodes.conf);
-        info!(
-            "Waiting for signers to agree on expected tenure id: {}",
-            info.pox_consensus
-        );
-        let res = wait_for_state_machine_update_by_miner_tenure_id(
-            30,
-            &info.pox_consensus,
-            &self.signer_addresses_versions(),
-        );
-        if res.is_err() {
-            warn!("Signer updates failed to update but attempting to continue test anyway");
-        }
-        TEST_MINE_SKIP.set(false);
-        let height_before = info.stacks_tip_height;
-        info!("Waiting for first Nakamoto block: {}", height_before + 1);
-        wait_for(30, || {
-            Ok(get_chain_info(&self.running_nodes.conf).stacks_tip_height > height_before)
-        })
-        .expect("Timed out waiting for first Nakamoto block after 3.0 boundary");
+        self.mine_nakamoto_block(Duration::from_secs(60), false);
         info!("Ready to mine Nakamoto blocks!");
     }
 }