Merge pull request #6286 from obycode/fix/tenure-last-block

fix: last locally or globally accepted block in tenure

Author: jferrant

stacks-signer/src/chainstate/mod.rs

@@ -262,31 +262,41 @@ impl SortitionData {
         Ok(true)
     }
 
-    /// Get the last locally signed block from the given tenure if it has not timed out
+    /// Get the last signed block from the given tenure if it has not timed out.
+    /// Even globally accepted blocks are allowed to be timed out, as that
+    /// triggers the signer to consult the Stacks node for the latest globally
+    /// accepted block. This is needed to handle Bitcoin reorgs correctly.
     pub fn get_tenure_last_block_info(
         consensus_hash: &ConsensusHash,
         signer_db: &SignerDb,
         tenure_last_block_proposal_timeout: Duration,
     ) -> Result<Option<BlockInfo>, ClientError> {
-        // Get the last known block in the previous tenure
-        let last_locally_accepted_block = signer_db
+        // Get the last accepted block in the tenure
+        let last_accepted_block = signer_db
             .get_last_accepted_block(consensus_hash)
             .map_err(|e| ClientError::InvalidResponse(e.to_string()))?;
-        let Some(local_info) = last_locally_accepted_block else {
+
+        let Some(block_info) = last_accepted_block else {
             return Ok(None);
         };
 
-        let Some(signed_over_time) = local_info.signed_self else {
+        let Some(signed_over_time) = block_info.signed_self else {
             return Ok(None);
         };
 
         if signed_over_time.saturating_add(tenure_last_block_proposal_timeout.as_secs())
             > get_epoch_time_secs()
         {
-            // The last locally accepted block is not timed out, return it
-            Ok(Some(local_info))
+            // The last accepted block is not timed out, return it
+            Ok(Some(block_info))
         } else {
-            // The last locally accepted block is timed out
+            // The last accepted block is timed out
+            info!(
+                "Last accepted block has timed out";
+                "signer_signature_hash" => %block_info.block.header.signer_signature_hash(),
+                "signed_over_time" => signed_over_time,
+                "state" => %block_info.state,
+            );
             Ok(None)
         }
     }