fix: use parent_burn_block_hash to 'crawl' forked blocks

Author: hstove

stacks-signer/src/signerdb.rs

@@ -72,6 +72,34 @@ impl StacksMessageCodec for NakamotoBlockVote {
     }
 }
 
+#[derive(Serialize, Deserialize, Debug, PartialEq)]
+/// Struct for storing information about a burn block
+pub struct BurnBlockInfo {
+    /// The hash of the burn block
+    pub block_hash: BurnchainHeaderHash,
+    /// The height of the burn block
+    pub block_height: u64,
+    /// The consensus hash of the burn block
+    pub consensus_hash: ConsensusHash,
+    /// The hash of the parent burn block
+    pub parent_burn_block_hash: BurnchainHeaderHash,
+}
+
+impl FromRow<BurnBlockInfo> for BurnBlockInfo {
+    fn from_row(row: &rusqlite::Row) -> Result<Self, DBError> {
+        let block_hash: BurnchainHeaderHash = row.get(0)?;
+        let block_height: u64 = row.get(1)?;
+        let consensus_hash: ConsensusHash = row.get(2)?;
+        let parent_burn_block_hash: BurnchainHeaderHash = row.get(3)?;
+        Ok(BurnBlockInfo {
+            block_hash,
+            block_height,
+            consensus_hash,
+            parent_burn_block_hash,
+        })
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, PartialEq, Default)]
 /// Store extra version-specific info in `BlockInfo`
 pub enum ExtraBlockInfo {
@@ -1068,6 +1096,26 @@ impl SignerDb {
         Ok(Some(receive_time))
     }
 
+    /// Lookup the burn block for a given burn block hash.
+    pub fn get_burn_block_by_hash(
+        &self,
+        burn_block_hash: &BurnchainHeaderHash,
+    ) -> Result<BurnBlockInfo, DBError> {
+        let query =
+            "SELECT block_hash, block_height, consensus_hash, parent_burn_block_hash FROM burn_blocks WHERE block_hash = ?";
+        let args = params![burn_block_hash];
+
+        query_row(&self.db, query, args)?.ok_or(DBError::NotFoundError)
+    }
+
+    /// Lookup the burn block for a given consensus hash.
+    pub fn get_burn_block_by_ch(&self, ch: &ConsensusHash) -> Result<BurnBlockInfo, DBError> {
+        let query = "SELECT block_hash, block_height, consensus_hash, parent_burn_block_hash FROM burn_blocks WHERE consensus_hash = ?";
+        let args = params![ch];
+
+        query_row(&self.db, query, args)?.ok_or(DBError::NotFoundError)
+    }
+
     /// Insert or replace a block into the database.
     /// Preserves the `broadcast` column if replacing an existing block.
     pub fn insert_block(&mut self, block_info: &BlockInfo) -> Result<(), DBError> {

stacks-signer/src/v0/signer_state.rs

@@ -749,24 +749,22 @@ impl LocalStateMachine {
                     "prior_state_machine.burn_block" => %prior_state_machine.burn_block,
                 );
                 // Determine the tenures that were forked
-                let mut sortition_info =
-                    client.get_sortition_by_consensus_hash(&prior_state_machine.burn_block)?;
+                let mut parent_burn_block_info =
+                    db.get_burn_block_by_ch(&prior_state_machine.burn_block)?;
                 let last_forked_tenure = prior_state_machine.burn_block;
                 let mut first_forked_tenure = prior_state_machine.burn_block;
                 let mut forked_tenures = vec![(
                     prior_state_machine.burn_block,
                     prior_state_machine.burn_block_height,
                 )];
-                while sortition_info.burn_block_height > expected_burn_block.burn_block_height {
-                    let Some(stacks_parent_ch) = sortition_info.stacks_parent_ch else {
-                        info!("No stacks parent ch found for sortition info";
-                            "sortition_info" => ?sortition_info,
-                        );
-                        break;
-                    };
-                    sortition_info = client.get_sortition_by_consensus_hash(&stacks_parent_ch)?;
-                    first_forked_tenure = sortition_info.consensus_hash;
-                    forked_tenures.push((stacks_parent_ch, sortition_info.burn_block_height));
+                while parent_burn_block_info.block_height > expected_burn_block.burn_block_height {
+                    parent_burn_block_info =
+                        db.get_burn_block_by_hash(&parent_burn_block_info.parent_burn_block_hash)?;
+                    first_forked_tenure = parent_burn_block_info.consensus_hash;
+                    forked_tenures.push((
+                        parent_burn_block_info.consensus_hash,
+                        parent_burn_block_info.block_height,
+                    ));
                 }
                 let fork_info =
                     client.get_tenure_forking_info(&first_forked_tenure, &last_forked_tenure)?;