fixed blockbyheight to use the marf

Author: rdeioris

stackslib/src/net/api/getblockbyheight.rs

@@ -25,6 +25,9 @@ use stacks_common::types::chainstate::{ConsensusHash, StacksBlockId};
 use stacks_common::types::net::PeerHost;
 use {serde, serde_json};
 
+use crate::chainstate::nakamoto::{
+    NakamotoBlock, NakamotoChainState, NakamotoStagingBlocksConn, StacksDBIndexed,
+};
 use crate::chainstate::nakamoto::{
     NakamotoBlock, NakamotoChainState, NakamotoStagingBlocksConn, StacksDBIndexed,
 };
@@ -124,6 +127,13 @@ impl RPCRequestHandler for RPCNakamotoBlockByHeightRequestHandler {
             }
         };
 
+        let tip = match node.load_stacks_chain_tip(&preamble, &contents) {
+            Ok(tip) => tip,
+            Err(error_resp) => {
+                return error_resp.try_into_contents().map_err(NetError::from);
+            }
+        };
+
         let index_block_hash_res =
             node.with_node_state(|_network, _sortdb, chainstate, _mempool, _rpc_args| {
                 chainstate

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

@@ -51,6 +51,12 @@ fn test_try_parse_request() {
     let addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 33333);
     let mut http = StacksHttp::new(addr.clone(), &ConnectionOptions::default());
 
+    // NOTE: MARF enforces the height to be a u32 value
+    let request = StacksHttpRequest::new_get_nakamoto_block_by_height(
+        addr.into(),
+        0xfffffffe,
+        TipRequest::UseLatestAnchoredTip,
+    );
     // NOTE: MARF enforces the height to be a u32 value
     let request = StacksHttpRequest::new_get_nakamoto_block_by_height(
         addr.into(),
@@ -133,6 +139,15 @@ fn test_try_make_response() {
     let mut dummy_tip = rpc_test.canonical_tip.clone();
     dummy_tip.0[0] = dummy_tip.0[0].wrapping_add(1);
 
+    let request = StacksHttpRequest::new_get_nakamoto_block_by_height(
+        addr.into(),
+        nakamoto_chain_tip_height,
+        TipRequest::SpecificTip(dummy_tip),
+    );
+    // dummy hack for generating an invalid tip
+    let mut dummy_tip = rpc_test.canonical_tip.clone();
+    dummy_tip.0[0] = dummy_tip.0[0].wrapping_add(1);
+
     let request = StacksHttpRequest::new_get_nakamoto_block_by_height(
         addr.into(),
         nakamoto_chain_tip_height,