Merge pull request #6609 from jcnelson/feat/sip034

Feat/sip034

Author: jcnelson

stacks-common/src/types/mod.rs

@@ -504,6 +504,23 @@ impl StacksEpochId {
         }
     }
 
+    pub fn supports_specific_budget_extends(&self) -> bool {
+        match self {
+            StacksEpochId::Epoch10
+            | StacksEpochId::Epoch20
+            | StacksEpochId::Epoch2_05
+            | StacksEpochId::Epoch21
+            | StacksEpochId::Epoch22
+            | StacksEpochId::Epoch23
+            | StacksEpochId::Epoch24
+            | StacksEpochId::Epoch25
+            | StacksEpochId::Epoch30
+            | StacksEpochId::Epoch31
+            | StacksEpochId::Epoch32 => false,
+            StacksEpochId::Epoch33 => true,
+        }
+    }
+
     /// Whether or not this epoch supports the punishment of PoX reward
     /// recipients using the bitvec scheme
     pub fn allows_pox_punishment(&self) -> bool {

stacks-node/src/tests/nakamoto_integrations.rs

@@ -48,7 +48,7 @@ use stacks::chainstate::burn::operations::{
 use stacks::chainstate::coordinator::comm::CoordinatorChannels;
 use stacks::chainstate::coordinator::OnChainRewardSetProvider;
 use stacks::chainstate::nakamoto::coordinator::{load_nakamoto_reward_set, TEST_COORDINATOR_STALL};
-use stacks::chainstate::nakamoto::miner::NakamotoBlockBuilder;
+use stacks::chainstate::nakamoto::miner::{MinerTenureInfoCause, NakamotoBlockBuilder};
 use stacks::chainstate::nakamoto::shadow::shadow_chainstate_repair;
 use stacks::chainstate::nakamoto::test_signers::TestSigners;
 use stacks::chainstate::nakamoto::{NakamotoBlock, NakamotoBlockHeader, NakamotoChainState};
@@ -3228,10 +3228,12 @@ fn block_proposal_api_endpoint() {
     let tenure_change = None;
     let coinbase = None;
 
-    let tenure_cause = tenure_change.and_then(|tx: &StacksTransaction| match &tx.payload {
-        TransactionPayload::TenureChange(tc) => Some(tc.cause),
-        _ => None,
-    });
+    let tenure_cause = tenure_change
+        .and_then(|tx: &StacksTransaction| match &tx.payload {
+            TransactionPayload::TenureChange(tc) => Some(MinerTenureInfoCause::from(tc.cause)),
+            _ => Some(MinerTenureInfoCause::NoTenureChange),
+        })
+        .unwrap_or(MinerTenureInfoCause::NoTenureChange);
 
     // Apply miner signature
     let sign = |p: &NakamotoBlockProposal| {
@@ -3253,6 +3255,7 @@ fn block_proposal_api_endpoint() {
             1,
             None,
             None,
+            None,
         )
         .expect("Failed to build Nakamoto block");
 
@@ -6837,6 +6840,7 @@ fn signer_chainstate() {
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
             reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
+            supports_sip034_tenure_extensions: false,
         };
         let mut sortitions_view =
             SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
@@ -6972,6 +6976,7 @@ fn signer_chainstate() {
             tenure_idle_timeout_buffer: Duration::from_secs(2),
             reorg_attempts_activity_timeout: Duration::from_secs(30),
             reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
+            supports_sip034_tenure_extensions: false,
         };
         let burn_block_height = SortitionDB::get_canonical_burn_chain_tip(sortdb.conn())
             .unwrap()
@@ -7051,6 +7056,7 @@ fn signer_chainstate() {
         tenure_idle_timeout_buffer: Duration::from_secs(2),
         reorg_attempts_activity_timeout: Duration::from_secs(30),
         reset_replay_set_after_fork_blocks: DEFAULT_RESET_REPLAY_SET_AFTER_FORK_BLOCKS,
+        supports_sip034_tenure_extensions: false,
     };
     let mut sortitions_view = SortitionsView::fetch_view(proposal_conf, &signer_client).unwrap();
     sortitions_view
@@ -7544,6 +7550,9 @@ fn continue_tenure_extend() {
                         }
                         tenure_block_founds.push(parsed);
                     }
+                    _ => {
+                        panic!("Unexpected tenure-extend cause {:?}", &payload.cause);
+                    }
                 };
             }
         }
@@ -11142,7 +11151,7 @@ fn test_tenure_extend_from_flashblocks() {
             let parsed = StacksTransaction::consensus_deserialize(&mut &tx_bytes[..]).unwrap();
 
             if let TransactionPayload::TenureChange(payload) = &parsed.payload {
-                if payload.cause == TenureChangeCause::Extended {
+                if payload.cause.is_eq(&TenureChangeCause::Extended) {
                     has_extend = true;
                 }
             }
@@ -11662,6 +11671,7 @@ fn large_mempool_base(strategy: MemPoolWalkStrategy, set_fee: impl Fn() -> u64)
 
     let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
     naka_conf.miner.mempool_walk_strategy = strategy;
+    naka_conf.miner.nakamoto_attempt_time_ms = 10_000;
 
     let sender_signer_sk = Secp256k1PrivateKey::random();
     let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -12919,7 +12929,7 @@ fn miner_constructs_replay_block() {
     let tx_bytes = hex_bytes(&raw_tx[2..]).unwrap();
     let parsed = StacksTransaction::consensus_deserialize(&mut &tx_bytes[..]).unwrap();
     let tenure_change = parsed.try_as_tenure_change().unwrap();
-    assert_eq!(tenure_change.cause, TenureChangeCause::BlockFound);
+    assert!(tenure_change.cause.is_eq(&TenureChangeCause::BlockFound));
 
     info!("Verifying next block contains the expected replay txs...");
     let block: StacksBlockEvent =