fix: ensure miner continues mining off its own block

Without this change, when mining a fork (caused by unfortunate timing),
the miner will never build off of its tenure change block. This change
resolves this issue.

Author: obycode

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

@@ -845,9 +845,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| {

testnet/stacks-node/src/tests/signer/v0.rs

@@ -11009,7 +11009,7 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
         .nakamoto_test_skip_commit_op
         .set(true);
 
-    info!("------------------------- Miner 1 Mines a Nakamoto Block N (Globally Accepted) -------------------------");
+    info!("------------------------- Miner 1 Mines a Nakamoto Block N -------------------------");
     let blocks_processed_before_1 = blocks_mined1.load(Ordering::SeqCst);
     let stacks_height_before = signer_test
         .stacks_client
@@ -11039,6 +11039,8 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
 
     let blocks = test_observer::get_mined_nakamoto_blocks();
     let block_n = blocks.last().unwrap().clone();
+    let block_n_height = block_n.stacks_height;
+    info!("Block N: {block_n_height}");
     let block_n_signature_hash = block_n.signer_signature_hash;
 
     let info_after = get_chain_info(&conf);
@@ -11128,6 +11130,8 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
     assert!(tip.sortition);
     assert_eq!(tip.miner_pk_hash.unwrap(), mining_pkh_2);
 
+    assert_eq!(get_chain_info(&conf).stacks_tip_height, block_n_height + 1);
+
     info!("------------------------- Miner 2 Mines N+2 and N+3 -------------------------");
     let blocks_processed_before_2 = blocks_mined2.load(Ordering::SeqCst);
     let stacks_height_before = signer_test
@@ -11195,6 +11199,8 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
     })
     .expect("Timed out waiting for Miner 2 to Mine Block N+3");
 
+    assert_eq!(get_chain_info(&conf).stacks_tip_height, block_n_height + 3);
+
     info!("------------------------- Miner 1 Wins the Next Tenure -------------------------");
 
     let blocks_processed_before_1 = blocks_mined1.load(Ordering::SeqCst);
@@ -11212,6 +11218,10 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
     )
     .expect("Timed out waiting for Miner 1 to Mine Block N+1'");
 
+    let blocks = test_observer::get_mined_nakamoto_blocks();
+    let last_block = blocks.last().expect("No blocks mined");
+    assert_eq!(last_block.stacks_height, block_n_height + 1);
+
     info!("------------------------- Miner 1 Mines N+2 -------------------------");
 
     let blocks_processed_before_1 = blocks_mined1.load(Ordering::SeqCst);
@@ -11237,6 +11247,10 @@ fn allow_reorg_within_first_proposal_burn_block_timing_secs() {
     })
     .expect("Timed out waiting for Miner 1 to Mine Block N+2");
 
+    let blocks = test_observer::get_mined_nakamoto_blocks();
+    let last_block = blocks.last().expect("No blocks mined");
+    assert_eq!(last_block.stacks_height, block_n_height + 2);
+
     info!("------------------------- Shutdown -------------------------");
     rl2_coord_channels
         .lock()