Fix VRF proof calculation and update test to be more expansive

Signed-off-by: Jacinta Ferrant <[email protected]>

Author: jferrant

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

@@ -109,6 +109,8 @@ pub enum MinerReason {
         /// sortition.
         burn_view_consensus_hash: ConsensusHash,
     },
+    /// The miner thread was spawned to initialize a prior empty tenure
+    EmptyTenure,
 }
 
 impl std::fmt::Display for MinerReason {
@@ -121,6 +123,7 @@ impl std::fmt::Display for MinerReason {
                 f,
                 "Extended: burn_view_consensus_hash = {burn_view_consensus_hash:?}",
             ),
+            MinerReason::EmptyTenure => write!(f, "EmptyTenure"),
         }
     }
 }
@@ -919,22 +922,25 @@ impl BlockMinerThread {
     fn make_vrf_proof(&mut self) -> Option<VRFProof> {
         // if we're a mock miner, then make sure that the keychain has a keypair for the mocked VRF
         // key
+        let sortition_hash = if matches!(self.reason, MinerReason::EmptyTenure) {
+            self.burn_election_block.sortition_hash
+        } else {
+            self.burn_block.sortition_hash
+        };
         let vrf_proof = if self.config.get_node_config(false).mock_mining {
-            self.keychain.generate_proof(
-                VRF_MOCK_MINER_KEY,
-                self.burn_block.sortition_hash.as_bytes(),
-            )
+            self.keychain
+                .generate_proof(VRF_MOCK_MINER_KEY, sortition_hash.as_bytes())
         } else {
             self.keychain.generate_proof(
                 self.registered_key.target_block_height,
-                self.burn_block.sortition_hash.as_bytes(),
+                sortition_hash.as_bytes(),
             )
         };
 
         debug!(
             "Generated VRF Proof: {} over {} ({},{}) with key {}",
             vrf_proof.to_hex(),
-            &self.burn_block.sortition_hash,
+            &sortition_hash,
             &self.burn_block.block_height,
             &self.burn_block.burn_header_hash,
             &self.registered_key.vrf_public_key.to_hex()
@@ -1155,7 +1161,7 @@ impl BlockMinerThread {
         };
 
         let (tenure_change_tx, coinbase_tx) = match &self.reason {
-            MinerReason::BlockFound => {
+            MinerReason::BlockFound | MinerReason::EmptyTenure => {
                 let tenure_change_tx =
                     self.generate_tenure_change_tx(current_miner_nonce, payload)?;
                 let coinbase_tx =

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

@@ -901,6 +901,7 @@ impl RelayerThread {
             "Relayer: Current burn block had no sortition. Checking for tenure continuation.";
             "won_last_sortition" => won_last_sortition,
             "current_mining_pkh" => %mining_pkh,
+            "block_election_snapshot.consensus_hash" => %block_election_snapshot.consensus_hash,
             "block_election_snapshot.miner_pk_hash" => ?block_election_snapshot.miner_pk_hash,
             "canonical_stacks_tip_id" => %canonical_stacks_tip,
             "canonical_stacks_tip_ch" => %canonical_stacks_tip_ch,
@@ -911,13 +912,45 @@ impl RelayerThread {
             return Ok(());
         }
 
+        let tip_info =
+            NakamotoChainState::get_canonical_block_header(self.chainstate.db(), &self.sortdb)
+                .map_err(|e| {
+                    error!("Relayer: failed to get canonical block header: {e:?}");
+                    NakamotoNodeError::SnapshotNotFoundForChainTip
+                })?
+                .ok_or_else(|| {
+                    error!("Relayer: failed to get canonical block header");
+                    NakamotoNodeError::SnapshotNotFoundForChainTip
+                })?;
+
+        let last_non_empty_sortition_snapshot =
+            SortitionDB::get_block_snapshot_consensus(self.sortdb.conn(), &tip_info.consensus_hash)
+                .map_err(|e| {
+                    error!("Relayer: failed to get last non-empty sortition snapshot: {e:?}");
+                    NakamotoNodeError::SnapshotNotFoundForChainTip
+                })?
+                .ok_or_else(|| {
+                    error!("Relayer: failed to get last non-empty sortition snapshot");
+                    NakamotoNodeError::SnapshotNotFoundForChainTip
+                })?;
+
+        let won_last_non_empty_sortition_snapshot =
+            last_non_empty_sortition_snapshot.miner_pk_hash == Some(mining_pkh);
+
+        let reason = if !won_last_non_empty_sortition_snapshot {
+            debug!("Relayer: Failed to issue a tenure change payload in our last tenure. Issue a tenure change payload again.");
+            MinerReason::EmptyTenure
+        } else {
+            debug!("Relayer: Successfully issued a tenure change payload in our last tenure. Issue a continue extend.");
+            MinerReason::Extended {
+                burn_view_consensus_hash: new_burn_view,
+            }
+        };
         match self.start_new_tenure(
             canonical_stacks_tip, // For tenure extend, we should be extending off the canonical tip
             block_election_snapshot,
             burn_tip,
-            MinerReason::Extended {
-                burn_view_consensus_hash: new_burn_view,
-            },
+            reason,
         ) {
             Ok(()) => {
                 debug!("Relayer: successfully started new tenure.");