Merge remote-tracking branch 'origin/develop' into fix/burn-view

Author: kantai

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

@@ -47,7 +47,7 @@ use stacks::chainstate::stacks::address::{PoxAddress, StacksAddressExtensions};
 use stacks::chainstate::stacks::boot::{
     MINERS_NAME, SIGNERS_VOTING_FUNCTION_NAME, SIGNERS_VOTING_NAME,
 };
-use stacks::chainstate::stacks::db::StacksChainState;
+use stacks::chainstate::stacks::db::{StacksChainState, StacksHeaderInfo};
 use stacks::chainstate::stacks::miner::{
     BlockBuilder, BlockLimitFunction, TransactionEvent, TransactionResult, TransactionSuccessEvent,
 };
@@ -301,6 +301,30 @@ pub fn get_stackerdb_slot_version(
     })
 }
 
+pub fn get_last_block_in_current_tenure(
+    sortdb: &SortitionDB,
+    chainstate: &StacksChainState,
+) -> Option<StacksHeaderInfo> {
+    let ch = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
+        .unwrap()
+        .consensus_hash;
+    let mut tenure_blocks = test_observer::get_blocks();
+    tenure_blocks.retain(|block| {
+        let consensus_hash = block.get("consensus_hash").unwrap().as_str().unwrap();
+        consensus_hash == format!("0x{ch}")
+    });
+    let last_block = tenure_blocks.last()?.clone();
+    let last_block_id = StacksBlockId::from_hex(
+        &last_block
+            .get("index_block_hash")
+            .unwrap()
+            .as_str()
+            .unwrap()[2..],
+    )
+    .unwrap();
+    NakamotoChainState::get_block_header(chainstate.db(), &last_block_id).unwrap()
+}
+
 pub fn add_initial_balances(
     conf: &mut Config,
     accounts: usize,
@@ -5079,7 +5103,7 @@ fn forked_tenure_is_ignored() {
         thread::sleep(Duration::from_secs(1));
     }
 
-    info!("Tenure B broadcasted but did not process a block. Issue the next bitcon block and unstall block commits.");
+    info!("Tenure B broadcasted but did not process a block. Issue the next bitcoin block and unstall block commits.");
 
     // the block will be stored, not processed, so load it out of staging
     let tip_sn = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
@@ -5126,27 +5150,17 @@ fn forked_tenure_is_ignored() {
             .lock()
             .expect("Mutex poisoned")
             .get_stacks_blocks_processed();
+        let block_in_tenure = get_last_block_in_current_tenure(&sortdb, &chainstate).is_some();
         Ok(commits_count > commits_before
             && blocks_count > blocks_before
-            && blocks_processed > blocks_processed_before)
+            && blocks_processed > blocks_processed_before
+            && block_in_tenure)
     })
     .unwrap();
 
     info!("Tenure C produced a block!");
-    wait_for(30, || {
-        let block_tenure_c =
-            NakamotoChainState::get_canonical_block_header(chainstate.db(), &sortdb)
-                .unwrap()
-                .unwrap();
-        let blocks = test_observer::get_mined_nakamoto_blocks();
-        let block_c = blocks.last().unwrap();
-        Ok(block_tenure_c.index_block_hash().to_string() == block_c.block_id)
-    })
-    .expect("Failed to wait for block processing");
 
-    let block_tenure_c = NakamotoChainState::get_canonical_block_header(chainstate.db(), &sortdb)
-        .unwrap()
-        .unwrap();
+    let block_tenure_c = get_last_block_in_current_tenure(&sortdb, &chainstate).unwrap();
     let blocks = test_observer::get_mined_nakamoto_blocks();
     let block_c = blocks.last().unwrap();
     info!("Tenure C tip block: {}", &block_tenure_c.index_block_hash());
@@ -5199,9 +5213,7 @@ fn forked_tenure_is_ignored() {
 
     info!("Tenure C produced a second block!");
 
-    let block_2_tenure_c = NakamotoChainState::get_canonical_block_header(chainstate.db(), &sortdb)
-        .unwrap()
-        .unwrap();
+    let block_2_tenure_c = get_last_block_in_current_tenure(&sortdb, &chainstate).unwrap();
     let blocks = test_observer::get_mined_nakamoto_blocks();
     let block_2_c = blocks.last().unwrap();
 
@@ -5232,9 +5244,7 @@ fn forked_tenure_is_ignored() {
     })
     .unwrap();
 
-    let block_tenure_d = NakamotoChainState::get_canonical_block_header(chainstate.db(), &sortdb)
-        .unwrap()
-        .unwrap();
+    let block_tenure_d = get_last_block_in_current_tenure(&sortdb, &chainstate).unwrap();
     let blocks = test_observer::get_mined_nakamoto_blocks();
     let block_d = blocks.last().unwrap();