CRC: coinbase height always exists even if in pre nakamoto

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

Author: jferrant

stacks-signer/src/client/mod.rs

@@ -322,7 +322,7 @@ pub(crate) mod tests {
             stacks_tip_consensus_hash: generate_random_consensus_hash(),
             unanchored_tip: None,
             unanchored_seq: Some(0),
-            tenure_height: None,
+            tenure_height: thread_rng().next_u64(),
             exit_at_block_height: None,
             is_fully_synced: false,
             genesis_chainstate_hash: Sha256Sum::zero(),

stackslib/src/net/api/getinfo.rs

@@ -82,9 +82,7 @@ pub struct RPCPeerInfoData {
     pub genesis_chainstate_hash: Sha256Sum,
     pub unanchored_tip: Option<StacksBlockId>,
     pub unanchored_seq: Option<u16>,
-    #[serde(default)]
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub tenure_height: Option<u64>,
+    pub tenure_height: u64,
     pub exit_at_block_height: Option<u64>,
     pub is_fully_synced: bool,
     #[serde(default)]
@@ -110,7 +108,7 @@ impl RPCPeerInfoData {
         chainstate: &StacksChainState,
         exit_at_block_height: Option<u64>,
         genesis_chainstate_hash: &Sha256Sum,
-        coinbase_height: Option<u64>,
+        coinbase_height: u64,
         ibd: bool,
     ) -> RPCPeerInfoData {
         let server_version = version_string(

stackslib/src/net/api/postmempoolquery.rs

@@ -276,8 +276,7 @@ impl RPCRequestHandler for RPCMempoolQueryRequestHandler {
         let page_id = self.page_id.take();
 
         let stream_res = node.with_node_state(|network, _sortdb, _chainstate, mempool, _rpc_args| {
-            let coinbase_height = network.stacks_tip.coinbase_height.unwrap_or(0);
-
+            let coinbase_height = network.stacks_tip.coinbase_height;
             let max_txs = network.connection_opts.mempool_max_tx_query;
             debug!(
                 "Begin mempool query";

stackslib/src/net/api/tests/getinfo.rs

@@ -103,5 +103,5 @@ fn test_try_make_response() {
     );
     let resp = response.decode_peer_info().unwrap();
 
-    assert_eq!(resp.tenure_height, Some(1));
+    assert_eq!(resp.tenure_height, 1);
 }

stackslib/src/net/p2p.rs

@@ -246,7 +246,7 @@ pub struct StacksTipInfo {
     pub consensus_hash: ConsensusHash,
     pub block_hash: BlockHeaderHash,
     pub height: u64,
-    pub coinbase_height: Option<u64>,
+    pub coinbase_height: u64,
     pub is_nakamoto: bool,
 }
 
@@ -256,7 +256,7 @@ impl StacksTipInfo {
             consensus_hash: ConsensusHash([0u8; 20]),
             block_hash: BlockHeaderHash([0u8; 32]),
             height: 0,
-            coinbase_height: None,
+            coinbase_height: 0,
             is_nakamoto: false,
         }
     }
@@ -4224,21 +4224,35 @@ impl PeerNetwork {
                 net_error::DBError(db_error::NotFoundError)
             })?;
 
-        // TODO: Test this!
         let parent_stacks_tip_block_hash = parent_tenure_start_header.anchored_header.block_hash();
-        let parent_tenure_start_header_cbh = NakamotoChainState::get_coinbase_height(
+        let parent_stacks_tip_block_id = StacksBlockId::new(
+            &parent_tenure_start_header.consensus_hash,
+            &parent_stacks_tip_block_hash,
+        );
+        let parent_coinbase_height = NakamotoChainState::get_coinbase_height(
             &mut chainstate.index_conn(),
-            &StacksBlockId::new(
-                &parent_tenure_start_header.consensus_hash,
-                &parent_stacks_tip_block_hash,
-            ),
+            &parent_stacks_tip_block_id,
         )?;
 
+        let coinbase_height = match parent_coinbase_height {
+            Some(cbh) => cbh,
+            None => {
+                if parent_tenure_start_header.is_epoch_2_block() {
+                    // The coinbase height is the same as the stacks block height as
+                    // every block contains a coinbase in epoch 2.x
+                    parent_tenure_start_header.stacks_block_height
+                } else {
+                    debug!("{:?}: get_parent_stacks_tip: No coinbase height found for nakamoto block {parent_stacks_tip_block_id}", self.get_local_peer());
+                    return Err(net_error::DBError(db_error::NotFoundError));
+                }
+            }
+        };
+
         let parent_stacks_tip = StacksTipInfo {
             consensus_hash: parent_tenure_start_header.consensus_hash,
             block_hash: parent_stacks_tip_block_hash,
             height: parent_tenure_start_header.anchored_header.height(),
-            coinbase_height: parent_tenure_start_header_cbh,
+            coinbase_height,
             is_nakamoto: parent_tenure_start_header
                 .anchored_header
                 .as_stacks_nakamoto()
@@ -4390,12 +4404,25 @@ impl PeerNetwork {
             self.stacks_tip.is_nakamoto
         };
 
-        // TODO: Test this!
         let stacks_tip_cbh = NakamotoChainState::get_coinbase_height(
             &mut chainstate.index_conn(),
             &new_stacks_tip_block_id,
         )?;
 
+        let coinbase_height = match stacks_tip_cbh {
+            Some(cbh) => cbh,
+            None => {
+                if !stacks_tip_is_nakamoto {
+                    // The coinbase height is the same as the stacks block height as
+                    // every block contains a coinbase in epoch 2.x
+                    stacks_tip_height
+                } else {
+                    debug!("{:?}: No coinbase height found for nakamoto block {new_stacks_tip_block_id}", self.get_local_peer());
+                    return Err(net_error::DBError(db_error::NotFoundError));
+                }
+            }
+        };
+
         let need_stackerdb_refresh = canonical_sn.canonical_stacks_tip_consensus_hash
             != self.burnchain_tip.canonical_stacks_tip_consensus_hash
             || burnchain_tip_changed
@@ -4434,7 +4461,7 @@ impl PeerNetwork {
                         consensus_hash: FIRST_BURNCHAIN_CONSENSUS_HASH.clone(),
                         block_hash: FIRST_STACKS_BLOCK_HASH.clone(),
                         height: 0,
-                        coinbase_height: None,
+                        coinbase_height: 0,
                         is_nakamoto: false,
                     }
                 }
@@ -4630,7 +4657,7 @@ impl PeerNetwork {
                 consensus_hash: stacks_tip_ch,
                 block_hash: stacks_tip_bhh,
                 height: stacks_tip_height,
-                coinbase_height: stacks_tip_cbh,
+                coinbase_height,
                 is_nakamoto: stacks_tip_is_nakamoto,
             };
             self.parent_stacks_tip = parent_stacks_tip;

testnet/stacks-node/src/tests/nakamoto_integrations.rs

@@ -5402,7 +5402,7 @@ fn check_block_heights() {
 
     // With the first Nakamoto block, the chain tip and the number of tenures
     // must be the same (before Nakamoto every block counts as a tenure)
-    assert_eq!(info.tenure_height.unwrap(), info.stacks_tip_height);
+    assert_eq!(info.tenure_height, info.stacks_tip_height);
 
     let mut last_burn_block_height;
     let mut last_stacks_block_height = info.stacks_tip_height as u128;
@@ -5538,7 +5538,7 @@ fn check_block_heights() {
         last_tenure_height = bh1;
 
         let info = get_chain_info_result(&naka_conf).unwrap();
-        assert_eq!(info.tenure_height.unwrap(), bh3 as u64);
+        assert_eq!(info.tenure_height, bh3 as u64);
 
         let sbh = heights3
             .get("stacks-block-height")
@@ -5649,7 +5649,7 @@ fn check_block_heights() {
             );
 
             let info = get_chain_info_result(&naka_conf).unwrap();
-            assert_eq!(info.tenure_height.unwrap(), bh3 as u64);
+            assert_eq!(info.tenure_height, bh3 as u64);
 
             let sbh = heights3
                 .get("stacks-block-height")
@@ -5692,10 +5692,7 @@ fn check_block_heights() {
     );
 
     let info = get_chain_info_result(&naka_conf).unwrap();
-    assert_eq!(
-        info.tenure_height.unwrap(),
-        block_height_pre_3_0 + tenure_count
-    );
+    assert_eq!(info.tenure_height, block_height_pre_3_0 + tenure_count);
 
     coord_channel
         .lock()