fix; revert change to Nakamoto block builder from PR feedback

Author: jcnelson

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

@@ -139,7 +139,11 @@ pub struct BlockMinerThread {
     registered_key: RegisteredKey,
     /// Burnchain block snapshot which elected this miner
     burn_election_block: BlockSnapshot,
-    /// Current burnchain tip
+    /// Current burnchain tip as of the last TenureChange
+    /// * if the last tenure-change was a BlockFound, then this is the same as the
+    /// `burn_election_block`.
+    /// * otherwise, if the last tenure-change is an Extend, then this is the sortition of the burn
+    /// view consensus hash in the TenureChange
     burn_block: BlockSnapshot,
     /// The start of the parent tenure for this tenure
     parent_tenure_id: StacksBlockId,
@@ -1050,12 +1054,12 @@ impl BlockMinerThread {
         let (mut block, consumed, size, tx_events) = NakamotoBlockBuilder::build_nakamoto_block(
             &chain_state,
             &burn_db
-                .index_handle_at_ch(&self.burn_election_block.consensus_hash)
+                .index_handle_at_ch(&self.burn_block.consensus_hash)
                 .map_err(|_| NakamotoNodeError::UnexpectedChainState)?,
             &mut mem_pool,
             &parent_block_info.stacks_parent_header,
             &self.burn_election_block.consensus_hash,
-            self.burn_election_block.total_burn,
+            self.burn_block.total_burn,
             tenure_start_info,
             self.config
                 .make_nakamoto_block_builder_settings(self.globals.get_miner_status()),