fix: allow testing with latest epoch before it is fully supported

Also harden the `test_epoch_3_3_activation` test a bit.

Author: obycode

stacks-node/src/nakamoto_node/relayer.rs

@@ -44,7 +44,7 @@ use stacks::chainstate::stacks::miner::{
 use stacks::chainstate::stacks::Error as ChainstateError;
 use stacks::config::BurnchainConfig;
 use stacks::core::mempool::MemPoolDB;
-use stacks::core::STACKS_EPOCH_LATEST_MARKER;
+use stacks::core::{marker_for_epoch, STACKS_EPOCH_LATEST_MARKER};
 use stacks::monitoring::increment_stx_blocks_mined_counter;
 use stacks::net::db::LocalPeer;
 use stacks::net::p2p::NetworkHandle;
@@ -1139,7 +1139,11 @@ impl RelayerThread {
             key_block_ptr: u32::try_from(key.block_height)
                 .expect("FATAL: burn block height exceeded u32"),
             key_vtxindex: u16::try_from(key.op_vtxindex).expect("FATAL: vtxindex exceeded u16"),
-            memo: vec![STACKS_EPOCH_LATEST_MARKER],
+            memo: if cfg!(test) && target_epoch.epoch_id > StacksEpochId::latest() {
+                vec![marker_for_epoch(target_epoch.epoch_id).expect("Unsupported epoch")]
+            } else {
+                vec![STACKS_EPOCH_LATEST_MARKER]
+            },
             new_seed: VRFSeed::from_proof(&tip_vrf_proof),
             parent_block_ptr: u32::try_from(commit_parent_block_burn_height)
                 .expect("FATAL: burn block height exceeded u32"),

stacks-node/src/tests/nakamoto_integrations.rs

@@ -14101,16 +14101,17 @@ fn test_epoch_3_3_activation() {
 
     // mine until epoch 3.3 height
     loop {
-        let commits_before = commits_submitted.load(Ordering::SeqCst);
         next_block_and_process_new_stacks_block(&mut btc_regtest_controller, 60, &coord_channel)
             .unwrap();
-        wait_for(20, || {
-            Ok(commits_submitted.load(Ordering::SeqCst) > commits_before)
-        })
-        .unwrap();
 
-        let node_info = get_chain_info_opt(&naka_conf).unwrap();
-        if node_info.burn_block_height
+        // once we actually get a block in epoch 3.3, exit
+        let blocks = test_observer::get_blocks();
+        let last_block = blocks.last().unwrap();
+        if last_block
+            .get("burn_block_height")
+            .unwrap()
+            .as_u64()
+            .unwrap()
             >= naka_conf.burnchain.epochs.as_ref().unwrap()[StacksEpochId::Epoch33].start_height
         {
             break;