Fix race condition: wait for the tip to advance before continuing after wait_for_block_pushed

Signed-off-by: Jacinta Ferrant <236437600+jacinta-stacks@users.noreply.github.com>

Author: jacinta-stacks

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

@@ -133,12 +133,13 @@ fn deadlock_50_50_split_capitulates_to_node_tip() {
     .expect("Timed out waiting for N to be mined and processed");
 
     // Ensure that the block was accepted globally so the stacks tip has advanced to N
-    let block_n =
-        wait_for_block_pushed_by_miner_key(30, info_before.stacks_tip_height + 1, &miner_pk)
-            .expect("Timed out waiting for block N to be mined");
+    let _block_n =
+        wait_for_block_pushed_and_tip(30, info_before.stacks_tip_height + 1, &miner_pk, || {
+            signer_test.get_peer_info().stacks_tip
+        })
+        .expect("Timed out waiting for block N to be mined");
 
     let info_after = signer_test.get_peer_info();
-    assert_eq!(info_after.stacks_tip, block_n.header.block_hash());
     assert_eq!(
         info_after.stacks_tip_height,
         info_before.stacks_tip_height + 1
@@ -400,12 +401,13 @@ fn minority_signers_capitulate_to_supermajority_consensus() {
     .expect("Timed out waiting for N to be mined and processed");
 
     // Ensure that the block was accepted globally so the stacks tip has advanced to N
-    let block_n =
-        wait_for_block_pushed_by_miner_key(30, info_before.stacks_tip_height + 1, &miner_pk)
-            .expect("Timed out waiting for block N to be mined");
+    let _block_n =
+        wait_for_block_pushed_and_tip(30, info_before.stacks_tip_height + 1, &miner_pk, || {
+            signer_test.get_peer_info().stacks_tip
+        })
+        .expect("Timed out waiting for block N to be mined");
 
     let info_after = signer_test.get_peer_info();
-    assert_eq!(info_after.stacks_tip, block_n.header.block_hash());
     assert_eq!(
         info_after.stacks_tip_height,
         info_before.stacks_tip_height + 1

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

@@ -31,7 +31,7 @@ use super::SignerTest;
 use crate::tests::nakamoto_integrations::wait_for;
 use crate::tests::neon_integrations::{get_chain_info, submit_tx, test_observer};
 use crate::tests::signer::v0::{
-    get_stackerdb_signer_messages, wait_for_block_proposal, wait_for_block_pushed_by_miner_key,
+    get_stackerdb_signer_messages, wait_for_block_proposal, wait_for_block_pushed_and_tip,
 };
 
 #[tag(bitcoind)]
@@ -108,15 +108,10 @@ fn signer_rejects_proposal_after_block_pushed() {
         wait_for_block_proposal(30, info_before.stacks_tip_height + 1, &miner_pk)
             .expect("Timed out waiting for block N+1 to be proposed");
     let signer_signature_hash = block_n_proposal.block.header.signer_signature_hash();
-    let _ = wait_for_block_pushed_by_miner_key(30, info_before.stacks_tip_height + 1, &miner_pk)
-        .expect("Failed to get BlockPushed for block N");
-    info!("------------------------- Advance Chain to Include Block N -------------------------");
-    // Shouldn't have to wait long for the chain to advance
-    wait_for(10, || {
-        let info_after = get_chain_info(&signer_test.running_nodes.conf);
-        Ok(info_after.stacks_tip_height >= info_before.stacks_tip_height + 1)
+    let _ = wait_for_block_pushed_and_tip(30, info_before.stacks_tip_height + 1, &miner_pk, || {
+        get_chain_info(&signer_test.running_nodes.conf).stacks_tip
     })
-    .expect("Chain did not advance to block N+1");
+    .expect("Failed to get BlockPushed for block N");
 
     info!("------------------------- Verify Signer 1 did NOT respond to the Block Proposal -------------------------");
     let messages = get_stackerdb_signer_messages();

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

@@ -1357,9 +1357,30 @@ pub fn wait_for_block_pushed_by_miner_key(
         }
         Ok(false)
     })?;
+
     block.ok_or_else(|| "Failed to find block pushed".to_string())
 }
 
+/// Waits for a block to be pushed by the specified miner, then waits for
+/// the node's tip to advance to that block. This prevents race conditions
+/// where subsequent calls read a stale `stacks_tip_height` because the
+/// coordinator hasn't yet processed the pushed block.
+///
+/// `get_tip` should return the current stacks tip hash (e.g. from
+/// `get_peer_info().stacks_tip` or `get_chain_info().stacks_tip`).
+pub fn wait_for_block_pushed_and_tip(
+    timeout_secs: u64,
+    expected_height: u64,
+    expected_miner: &StacksPublicKey,
+    get_tip: impl Fn() -> BlockHeaderHash,
+) -> Result<NakamotoBlock, String> {
+    let block = wait_for_block_pushed_by_miner_key(timeout_secs, expected_height, expected_miner)?;
+    let block_hash = block.header.block_hash();
+    wait_for(timeout_secs, || Ok(get_tip() == block_hash))
+        .map_err(|e| format!("Tip did not advance to pushed block: {e}"))?;
+    Ok(block)
+}
+
 /// Waits for all of the provided signers to send a pre-commit for a block
 /// with the provided signer signature hash
 pub fn wait_for_block_pre_commits_from_signers(
@@ -4058,14 +4079,10 @@ fn miner_recovers_when_broadcast_block_delay_across_tenures_occurs() {
     info!("Submitted tx {tx} in to mine block N");
     sender_nonce += 1;
     let block_n =
-        wait_for_block_pushed_by_miner_key(30, info_before.stacks_tip_height + 1, &miner_pk)
-            .expect("Timed out waiting for block N to be mined");
-
-    wait_for(30, || {
-        let info = signer_test.get_peer_info();
-        Ok(info.stacks_tip == block_n.header.block_hash())
-    })
-    .expect("Tip did not advance to block N");
+        wait_for_block_pushed_and_tip(30, info_before.stacks_tip_height + 1, &miner_pk, || {
+            signer_test.get_peer_info().stacks_tip
+        })
+        .expect("Timed out waiting for block N to be mined");
 
     info!("------------------------- Attempt to Mine Nakamoto Block N+1 -------------------------");
     // Propose a valid block, but force the miner to ignore the returned signatures and delay the block being
@@ -4212,14 +4229,10 @@ fn miner_recovers_when_broadcast_block_delay_across_tenures_occurs() {
         info_before.stacks_tip_height + 2
     );
     let block_n_2 =
-        wait_for_block_pushed_by_miner_key(30, info_before.stacks_tip_height + 2, &miner_pk)
-            .expect("Timed out waiting for block N+2 to be mined");
-
-    wait_for(30, || {
-        let info = signer_test.get_peer_info();
-        Ok(info.stacks_tip == block_n_2.header.block_hash())
-    })
-    .expect("Tip did not advance to block N+2");
+        wait_for_block_pushed_and_tip(30, info_before.stacks_tip_height + 2, &miner_pk, || {
+            signer_test.get_peer_info().stacks_tip
+        })
+        .expect("Timed out waiting for block N+2 to be mined");
     assert_eq!(
         block_n_2.header.parent_block_id,
         block_n_1.header.block_id()