fix: do not return when marking current sortition as invalid

The logic for checking the current sortition should be unrelated to the
check of the latest proposal. This is a little unclear, so I added some
comments to help.

Author: obycode

stacks-signer/CHANGELOG.md

@@ -18,7 +18,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 - Signers no longer view any block proposal by a miner in their DB as indicative of valid miner activity.
 - Various index improvements to the signer's database to improve performance.
 - Add new reject codes to the signer response for better visibility into why a block was rejected.
-- When allowing a reorg within the `reorg_attempts_activity_timeout_ms`, the signer will now watch the responses from other signers and if >30% of them reject this reorg attempt, then the signer will mark the miner as invalid, reject further attempts to reorg and allowing the previous miner to extend their tenure.
+- When allowing a reorg within the `reorg_attempts_activity_timeout_ms`, the signer will now watch the responses from other signers and if >30% of them reject this reorg attempt, then the signer will mark the miner as invalid, reject further attempts to reorg and allow the previous miner to extend their tenure.
 
 ## [3.1.0.0.5.0]
 

stacks-signer/src/chainstate.rs

@@ -213,6 +213,10 @@ impl SortitionsView {
             .cur_sortition
             .is_timed_out(self.config.block_proposal_timeout, signer_db)?
         {
+            // Note that this is only checking the current sortition, and it is
+            // not necessarily related to the proposal being checked. For this
+            // reason, we do not return an error here, just set the state and
+            // log what happened.
             info!(
                 "Current miner timed out, marking as invalid.";
                 "block_height" => block.header.chain_length,
@@ -246,14 +250,17 @@ impl SortitionsView {
                     &self.config.first_proposal_burn_block_timing,
                 )?;
                 if !is_valid_parent_tenure {
+                    // Note that this is only checking the current sortition,
+                    // and it is not necessarily related to the proposal being
+                    // checked. For this reason, we do not return an error
+                    // here, just set the state and log what happened.
                     warn!(
                         "Current sortition does not build off of canonical tip tenure, marking as invalid";
                         "current_sortition_parent" => ?self.cur_sortition.parent_tenure_id,
                         "tip_consensus_hash" => ?tip.block.header.consensus_hash,
                     );
                     self.cur_sortition.miner_status =
                         SortitionMinerStatus::InvalidatedBeforeFirstBlock;
-                    return Err(RejectReason::ReorgNotAllowed);
                 }
             }
         }