Default to 25% for tenure_cost_limit_per_block_percentage

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

testnet/stacks-node/src/config.rs

@@ -2582,6 +2582,12 @@ impl MinerConfigFile {
                     .to_string(),
             );
         };
+        let tenure_cost_limit_per_block_percentage =
+            if self.tenure_cost_limit_per_block_percentage.is_none() {
+                miner_default_config.tenure_cost_limit_per_block_percentage
+            } else {
+                self.tenure_cost_limit_per_block_percentage
+            };
         Ok(MinerConfig {
             first_attempt_time_ms: self
                 .first_attempt_time_ms
@@ -2688,7 +2694,7 @@ impl MinerConfigFile {
             first_rejection_pause_ms: self.first_rejection_pause_ms.unwrap_or(miner_default_config.first_rejection_pause_ms),
             subsequent_rejection_pause_ms: self.subsequent_rejection_pause_ms.unwrap_or(miner_default_config.subsequent_rejection_pause_ms),
             block_commit_delay: self.block_commit_delay_ms.map(Duration::from_millis).unwrap_or(miner_default_config.block_commit_delay),
-            tenure_cost_limit_per_block_percentage: self.tenure_cost_limit_per_block_percentage,
+            tenure_cost_limit_per_block_percentage,
         })
     }
 }

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

@@ -5985,7 +5985,7 @@ fn clarity_burn_state() {
         deploy_fee + tx_fee * tenure_count + tx_fee * tenure_count * inter_blocks_per_tenure,
     );
     naka_conf.add_initial_balance(PrincipalData::from(sender_signer_addr).to_string(), 100000);
-    naka_conf.miner.tenure_cost_limit_per_block_percentage = None;
+    naka_conf.miner.tenure_cost_limit_per_block_percentage = Some(100);
     let stacker_sk = setup_stacker(&mut naka_conf);
 
     test_observer::spawn();
@@ -7740,7 +7740,7 @@ fn check_block_info() {
     naka_conf.burnchain.chain_id = CHAIN_ID_TESTNET + 1;
     let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
     naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
-    naka_conf.miner.tenure_cost_limit_per_block_percentage = None;
+    naka_conf.miner.tenure_cost_limit_per_block_percentage = Some(100);
     let sender_sk = Secp256k1PrivateKey::new();
     let sender_signer_sk = Secp256k1PrivateKey::new();
     let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -8707,6 +8707,7 @@ fn mock_mining() {
     let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
     naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
     naka_conf.node.pox_sync_sample_secs = 30;
+    naka_conf.miner.tenure_cost_limit_per_block_percentage = Some(100);
     let sender_sk = Secp256k1PrivateKey::new();
     let sender_signer_sk = Secp256k1PrivateKey::new();
     let sender_signer_addr = tests::to_addr(&sender_signer_sk);