fix: revert changes and improve readability

Author: obycode

stacks-signer/CHANGELOG.md

@@ -13,10 +13,6 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Introduced `capitulate_miner_view_timeout_secs`: the duration (in seconds) for the signer to wait between updating the local state machine viewpoint and capitulating to other signers' miner views.
 - Added codepath to enable signers to evaluate block proposals and miner activity against global signer state for improved consistency and correctness. Currently feature gated behind the `SUPPORTED_SIGNER_PROTOCOL_VERSION`
 
-### Fixed
-
-- Fixed a bug where signers would incorrectly reject block proposals if the parent block was globally accepted and the signer hadn't signed it within the `tenure_last_block_proposal_timeout` period; if it is globally accepted, the signer should accept it regardless of the timeout.
-
 ## [3.1.0.0.13.0]
 
 ### Changed

stacks-signer/src/chainstate/mod.rs

@@ -262,7 +262,10 @@ 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,
@@ -277,27 +280,22 @@ impl SortitionData {
             return Ok(None);
         };
 
-        // If the last accepted block was globally accepted, return it
-        if block_info.state == BlockState::GloballyAccepted {
-            return Ok(Some(block_info));
-        }
-
-        // If the last accepted block was locally accepted, check if it has timed out
         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
+            // 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 locally accepted block has timed out";
+                "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)
         }