feat: add failsafe to transaction replay

stacks-node/src/burnchains/bitcoin_regtest_controller.rs

@@ -2816,6 +2816,17 @@ impl BitcoinRPCRequest {
         BitcoinRPCRequest::send(config, payload)
     }
 
+    pub fn get_chain_tips(config: &Config) -> RPCResult<serde_json::Value> {
+        let payload = BitcoinRPCRequest {
+            method: "getchaintips".to_string(),
+            params: vec![],
+            id: "stacks".to_string(),
+            jsonrpc: "2.0".to_string(),
+        };
+
+        BitcoinRPCRequest::send(config, payload)
+    }
+
     pub fn send(config: &Config, payload: BitcoinRPCRequest) -> RPCResult<serde_json::Value> {
         let request = BitcoinRPCRequest::build_rpc_request(config, &payload);
         let timeout = Duration::from_secs(u64::from(config.burnchain.timeout));

stacks-node/src/tests/nakamoto_integrations.rs

@@ -111,6 +111,7 @@ use stacks_common::util::secp256k1::{MessageSignature, Secp256k1PrivateKey, Secp
 use stacks_common::util::{get_epoch_time_secs, sleep_ms};
 use stacks_signer::chainstate::v1::SortitionsView;
 use stacks_signer::chainstate::ProposalEvalConfig;
+use stacks_signer::config::DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS;
 use stacks_signer::signerdb::{BlockInfo, BlockState, ExtraBlockInfo, SignerDb};
 use stacks_signer::v0::SpawnedSigner;
 
@@ -6663,6 +6664,7 @@ fn signer_chainstate() {
             tenure_idle_timeout: Duration::from_secs(300),
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
+            reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
         };
         let mut sortitions_view =
             SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
@@ -6773,6 +6775,7 @@ fn signer_chainstate() {
             tenure_idle_timeout: Duration::from_secs(300),
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
+            reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
         };
         let burn_block_height = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
             .unwrap()
@@ -6845,6 +6848,7 @@ fn signer_chainstate() {
         tenure_idle_timeout: Duration::from_secs(300),
         tenure_idle_timeout_buffer: Duration::from_secs(2),
         reorg_attempts_activity_timeout: Duration::from_secs(30),
+        reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
     };
     let mut sortitions_view = SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
     sortitions_view

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

@@ -35,6 +35,7 @@ use libsigner::v0::messages::{
 use libsigner::v0::signer_state::MinerState;
 use libsigner::{BlockProposal, SignerEntries, SignerEventTrait};
 use serde::{Deserialize, Serialize};
+use stacks::burnchains::Txid;
 use stacks::chainstate::coordinator::comm::CoordinatorChannels;
 use stacks::chainstate::nakamoto::signer_set::NakamotoSigners;
 use stacks::chainstate::nakamoto::NakamotoBlock;
@@ -239,6 +240,9 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
         let (mut naka_conf, _miner_account) =
             naka_neon_integration_conf(snapshot_name.map(|n| n.as_bytes()));
 
+        naka_conf.miner.activated_vrf_key_path =
+            Some(format!("{}/vrf_key", naka_conf.node.working_dir));
+
         node_config_modifier(&mut naka_conf);
 
         // Add initial balances to the config
@@ -364,7 +368,11 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
             let metadata_path = snapshot_path.join("metadata.json");
             if !metadata_path.clone().exists() {
                 warn!("Snapshot metadata file does not exist, not restoring snapshot");
-                return SetupSnapshotResult::NoSnapshot;
+                std::fs::remove_dir_all(snapshot_path.clone()).unwrap();
+                return SetupSnapshotResult::WithSnapshot(SnapshotSetupInfo {
+                    snapshot_path: snapshot_path.clone(),
+                    snapshot_exists: false,
+                });
             }
             let Ok(metadata) = serde_json::from_reader::<_, SnapshotMetadata>(
                 File::open(metadata_path.clone()).unwrap(),
@@ -1066,6 +1074,20 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
         })
     }
 
+    pub fn wait_for_replay_set_eq(&self, timeout: u64, expected_txids: Vec<String>) {
+        self.wait_for_signer_state_check(timeout, |state| {
+            let Some(replay_set) = state.get_tx_replay_set() else {
+                return Ok(false);
+            };
+            let txids = replay_set
+                .iter()
+                .map(|tx| tx.txid().to_hex())
+                .collect::<Vec<_>>();
+            Ok(txids == expected_txids)
+        })
+        .expect("Timed out waiting for replay set to be equal to expected txids");
+    }
+
     /// Replace the test's configured signer st
     pub fn replace_signers(
         &mut self,
@@ -1584,6 +1606,31 @@ impl<Z: SpawnedSignerTrait> SignerTest<Z> {
             .send_message_with_retry::<SignerMessage>(accepted.into())
             .expect("Failed to send accept signature");
     }
+
+    /// Get the txid of the parent block commit transaction for the given miner
+    pub fn get_parent_block_commit_txid(&self, miner_pk: &StacksPublicKey) -> Option<Txid> {
+        let Some(confirmed_utxo) = self
+            .running_nodes
+            .btc_regtest_controller
+            .get_all_utxos(&miner_pk)
+            .into_iter()
+            .find(|utxo| utxo.confirmations == 0)
+        else {
+            return None;
+        };
+        let unconfirmed_txid = Txid::from_bitcoin_tx_hash(&confirmed_utxo.txid);
+        let unconfirmed_tx = self
+            .running_nodes
+            .btc_regtest_controller
+            .get_raw_transaction(&unconfirmed_txid);
+        let parent_txid = unconfirmed_tx
+            .input
+            .get(0)
+            .expect("First input should exist")
+            .previous_output
+            .txid;
+        Some(Txid::from_bitcoin_tx_hash(&parent_txid))
+    }
 }
 
 fn setup_stx_btc_node<G: FnMut(&mut NeonConfig)>(