Revert "fix: dont rely on node burn block to be processed"

This reverts commit c6ca6b9.

Author: hstove

stacks-signer/src/v0/signer_state.rs

@@ -580,16 +580,9 @@ impl LocalStateMachine {
             }
         };
 
-        let (next_burn_block_height, next_burn_block_hash) = match expected_burn_block.clone() {
-            Some(expected_burn_block) => (
-                expected_burn_block.burn_block_height,
-                expected_burn_block.consensus_hash,
-            ),
-            None => {
-                let peer_info = client.get_peer_info()?;
-                (peer_info.burn_block_height, peer_info.pox_consensus)
-            }
-        };
+        let peer_info = client.get_peer_info()?;
+        let next_burn_block_height = peer_info.burn_block_height;
+        let next_burn_block_hash = peer_info.pox_consensus;
         let mut tx_replay_set = prior_state_machine.tx_replay_set.clone();
 
         if let Some(expected_burn_block) = expected_burn_block {
@@ -1004,8 +997,41 @@ impl LocalStateMachine {
         replay_state: &ReplayState,
     ) -> Result<Option<ReplayState>, SignerChainstateError> {
         if expected_burn_block.burn_block_height > prior_state_machine.burn_block_height {
-            // no bitcoin fork, because we're higher than the previous tip
-            return Ok(None);
+            // prevent too large of a loop
+            if expected_burn_block
+                .burn_block_height
+                .saturating_sub(prior_state_machine.burn_block_height)
+                > 10
+            {
+                return Ok(None);
+            }
+            // are we building on top of this prior tip?
+            let mut parent_burn_block_info =
+                db.get_burn_block_by_ch(&expected_burn_block.consensus_hash)?;
+
+            while parent_burn_block_info.block_height > prior_state_machine.burn_block_height {
+                let Ok(parent_info) =
+                    db.get_burn_block_by_hash(&parent_burn_block_info.parent_burn_block_hash)
+                else {
+                    warn!(
+                        "Failed to get parent burn block info for {}",
+                        parent_burn_block_info.parent_burn_block_hash
+                    );
+                    return Ok(None);
+                };
+                parent_burn_block_info = parent_info;
+            }
+            if parent_burn_block_info.consensus_hash == prior_state_machine.burn_block {
+                // no bitcoin fork, because we're building on the parent
+                return Ok(None);
+            } else {
+                info!("Detected bitcoin fork - prior tip is not parent of new tip.";
+                    "new_tip.burn_block_height" => expected_burn_block.burn_block_height,
+                    "new_tip.consensus_hash" => %expected_burn_block.consensus_hash,
+                    "prior_tip.burn_block_height" => prior_state_machine.burn_block_height,
+                    "prior_tip.consensus_hash" => %prior_state_machine.burn_block,
+                );
+            }
         }
         if expected_burn_block.consensus_hash == prior_state_machine.burn_block {
             // no bitcoin fork, because we're at the same burn block hash as before

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

@@ -3982,6 +3982,13 @@ fn tx_replay_simple() {
     let _http_origin = format!("http://{}", &conf.node.rpc_bind);
     let btc_controller = &signer_test.running_nodes.btc_regtest_controller;
 
+    let miner_pk = btc_controller
+        .get_mining_pubkey()
+        .as_deref()
+        .map(Secp256k1PublicKey::from_hex)
+        .unwrap()
+        .unwrap();
+
     if signer_test.bootstrap_snapshot() {
         signer_test.shutdown_and_snapshot();
         return;