Merge pull request #5691 from stacks-network/test/allow_reorg_within_first_proposal_burn_block_timing_secs

Ensure miner builds on its own blocks when reorging due to badly timed blocks

Author: obycode

.github/workflows/bitcoin-tests.yml

@@ -147,6 +147,7 @@ jobs:
           - tests::signer::v0::multiple_miners_empty_sortition
           - tests::signer::v0::block_proposal_timeout
           - tests::signer::v0::rejected_blocks_count_towards_miner_validity
+          - tests::signer::v0::allow_reorg_within_first_proposal_burn_block_timing_secs
           - tests::nakamoto_integrations::burn_ops_integration_test
           - tests::nakamoto_integrations::check_block_heights
           - tests::nakamoto_integrations::clarity_burn_state

CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
   Previously, the miner had difficulty restarting their missed tenure and extending into the new
   bitcoin block, leading to 1-2 bitcoin blocks of missed Stacks block production.
 
+## Changed
+
+- When a miner reorgs the previous tenure due to a poorly timed block, it can now continue to build blocks on this new chain tip (#5691)
+
 ## [3.1.0.0.3]
 
 ### Added

testnet/stacks-node/src/nakamoto_node/miner.rs

@@ -932,9 +932,8 @@ impl BlockMinerThread {
             })?;
 
         let stacks_tip_block_id = StacksBlockId::new(&stacks_tip_ch, &stacks_tip_bh);
-        let tenure_tip_opt = NakamotoChainState::get_highest_block_header_in_tenure(
+        let tenure_tip_opt = NakamotoChainState::get_highest_known_block_header_in_tenure(
             &mut chain_state.index_conn(),
-            &stacks_tip_block_id,
             &self.burn_election_block.consensus_hash,
         )
         .map_err(|e| {