Merge pull request #6013 from obycode/block_rejection_timeout_steps

feat: reduce default `block_rejection_timeout_steps`

Author: wileyj

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to the versioning scheme outlined in the [README.md](README.md).
 
+## [Unreleased]
+
+### Changed
+
+- Reduce the default `block_rejection_timeout_steps` configuration so that miners will retry faster when blocks fail to reach 70% approved or 30% rejected.
+
 ## [3.1.0.0.8]
 
 ### Added

stackslib/src/config/mod.rs

@@ -2244,9 +2244,9 @@ impl Default for MinerConfig {
 
             block_rejection_timeout_steps: {
                 let mut rejections_timeouts_default_map = HashMap::<u32, Duration>::new();
-                rejections_timeouts_default_map.insert(0, Duration::from_secs(600));
-                rejections_timeouts_default_map.insert(10, Duration::from_secs(300));
-                rejections_timeouts_default_map.insert(20, Duration::from_secs(150));
+                rejections_timeouts_default_map.insert(0, Duration::from_secs(180));
+                rejections_timeouts_default_map.insert(10, Duration::from_secs(90));
+                rejections_timeouts_default_map.insert(20, Duration::from_secs(45));
                 rejections_timeouts_default_map.insert(30, Duration::from_secs(0));
                 rejections_timeouts_default_map
             },
@@ -2835,6 +2835,7 @@ impl MinerConfigFile {
         })
     }
 }
+
 #[derive(Clone, Deserialize, Default, Debug)]
 #[serde(deny_unknown_fields)]
 pub struct AtlasConfigFile {

testnet/stacks-node/src/nakamoto_node/miner.rs

@@ -704,7 +704,16 @@ impl BlockMinerThread {
                     )?
                     .ok_or_else(|| NakamotoNodeError::UnexpectedChainState)?;
 
-                if processed {
+                // Once the block has been processed and the miner is no longer
+                // blocked, we can continue mining.
+                if processed
+                    && !(*self
+                        .globals
+                        .get_miner_status()
+                        .lock()
+                        .expect("FATAL: mutex poisoned"))
+                    .is_blocked()
+                {
                     break;
                 }
 

testnet/stacks-node/src/tests/signer/v0.rs

@@ -12115,8 +12115,20 @@ fn repeated_rejection() {
     let send_amt = 100;
     let send_fee = 180;
     let recipient = PrincipalData::from(StacksAddress::burn_address(false));
-    let mut signer_test: SignerTest<SpawnedSigner> =
-        SignerTest::new(num_signers, vec![(sender_addr, (send_amt + send_fee) * 3)]);
+    let mut signer_test: SignerTest<SpawnedSigner> = SignerTest::new_with_config_modifications(
+        num_signers,
+        vec![(sender_addr, (send_amt + send_fee) * 3)],
+        |_| {},
+        |config| {
+            config.miner.block_rejection_timeout_steps.clear();
+            config
+                .miner
+                .block_rejection_timeout_steps
+                .insert(0, Duration::from_secs(120));
+        },
+        None,
+        None,
+    );
     let http_origin = format!("http://{}", &signer_test.running_nodes.conf.node.rpc_bind);
     signer_test.boot_to_epoch_3();