Skip to content

Commit 59d133e

Browse files
obycodeobycode
committed
fix: ignore wait_on_interim_blocks
The wait that this introduced was there just to ensure that the chains coordinator had time to set the flag to pause the miner before it attempted to mine again. This is now handled instead by waiting for the last block to be processed before proceeding. To force a longer wait time between blocks, there is already the `min_time_between_blocks_ms` option for this.
1 parent cd9bbab commit 59d133e

File tree

7 files changed

+31
-51
lines changed

7 files changed

+31
-51
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
2020
- When a miner times out waiting for signatures, it will re-propose the same block instead of building a new block ([#5877](https://github.com/stacks-network/stacks-core/pull/5877))
2121
- Improve tenure downloader trace verbosity applying proper logging level depending on the tenure state ("debug" if unconfirmed, "info" otherwise) ([#5871](https://github.com/stacks-network/stacks-core/issues/5871))
2222
- Remove warning log about missing UTXOs when a node is configured as `miner` with `mock_mining` mode enabled ([#5841](https://github.com/stacks-network/stacks-core/issues/5841))
23+
- Deprecated the `wait_on_interim_blocks` option in the miner config file. This option is no longer needed, as the miner will always wait for interim blocks to be processed before mining a new block. To wait extra time in between blocks, use the `min_time_between_blocks_ms` option instead.
2324

2425
## [3.1.0.0.7]
2526

‎stackslib/src/chainstate/nakamoto/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,7 @@ impl NakamotoBlockHeader {
944944
parent_block_id,
945945
tx_merkle_root: Sha512Trunc256Sum([0u8; 32]),
946946
state_index_root: TrieHash([0u8; 32]),
947-
timestamp: std::cmp::max(parent_timestamp, get_epoch_time_secs()),
947+
timestamp: std::cmp::max(parent_timestamp.saturating_add(1), get_epoch_time_secs()),
948948
miner_signature: MessageSignature::empty(),
949949
signer_signature: vec![],
950950
pox_treatment: BitVec::ones(bitvec_len)

‎stackslib/src/config/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,7 +2138,8 @@ pub struct MinerConfig {
21382138
pub unprocessed_block_deadline_secs: u64,
21392139
pub mining_key: Option<Secp256k1PrivateKey>,
21402140
/// Amount of time while mining in nakamoto to wait in between mining interim blocks
2141-
pub wait_on_interim_blocks: Duration,
2141+
/// DEPRECATED: use `min_time_between_blocks_ms` instead
2142+
pub wait_on_interim_blocks: Option<Duration>,
21422143
/// minimum number of transactions that must be in a block if we're going to replace a pending
21432144
/// block-commit with a new block-commit
21442145
pub min_tx_count: u64,
@@ -2209,7 +2210,7 @@ impl Default for MinerConfig {
22092210
candidate_retry_cache_size: 1024 * 1024,
22102211
unprocessed_block_deadline_secs: 30,
22112212
mining_key: None,
2212-
wait_on_interim_blocks: Duration::from_millis(2_500),
2213+
wait_on_interim_blocks: None,
22132214
min_tx_count: 0,
22142215
only_increase_tx_count: false,
22152216
unconfirmed_commits_helper: None,
@@ -2733,8 +2734,7 @@ impl MinerConfigFile {
27332734
.transpose()?,
27342735
wait_on_interim_blocks: self
27352736
.wait_on_interim_blocks_ms
2736-
.map(Duration::from_millis)
2737-
.unwrap_or(miner_default_config.wait_on_interim_blocks),
2737+
.map(Duration::from_millis),
27382738
min_tx_count: self
27392739
.min_tx_count
27402740
.unwrap_or(miner_default_config.min_tx_count),
@@ -2789,7 +2789,7 @@ impl MinerConfigFile {
27892789
pre_nakamoto_mock_signing: self
27902790
.pre_nakamoto_mock_signing
27912791
.unwrap_or(pre_nakamoto_mock_signing), // Should only default true if mining key is set
2792-
min_time_between_blocks_ms: self.min_time_between_blocks_ms.map(|ms| if ms < DEFAULT_MIN_TIME_BETWEEN_BLOCKS_MS {
2792+
min_time_between_blocks_ms: self.min_time_between_blocks_ms.map(|ms| if ms < DEFAULT_MIN_TIME_BETWEEN_BLOCKS_MS {
27932793
warn!("miner.min_time_between_blocks_ms is less than the minimum allowed value of {DEFAULT_MIN_TIME_BETWEEN_BLOCKS_MS} ms. Using the default value instead.");
27942794
DEFAULT_MIN_TIME_BETWEEN_BLOCKS_MS
27952795
} else {

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -669,11 +669,27 @@ impl BlockMinerThread {
669669
return Ok(());
670670
};
671671

672-
let wait_start = Instant::now();
673-
while wait_start.elapsed() < self.config.miner.wait_on_interim_blocks {
674-
thread::sleep(Duration::from_millis(ABORT_TRY_AGAIN_MS));
675-
if self.check_burn_tip_changed(&sort_db).is_err() {
676-
return Err(NakamotoNodeError::BurnchainTipChanged);
672+
// Wait for the last block to be processed before proceeding
673+
if let Some(last_block_mined) = &self.last_block_mined {
674+
loop {
675+
let (stacks_tip_ch, stacks_tip_bh) =
676+
SortitionDB::get_canonical_stacks_chain_tip_hash(sortdb.conn()).map_err(
677+
|e| {
678+
error!("Failed to load canonical Stacks tip: {e:?}");
679+
NakamotoNodeError::ParentNotFound
680+
},
681+
)?;
682+
683+
if last_block_mined.header.consensus_hash == stacks_tip_ch
684+
&& last_block_mined.header.block_hash() == stacks_tip_bh
685+
{
686+
break;
687+
}
688+
689+
thread::sleep(Duration::from_millis(ABORT_TRY_AGAIN_MS));
690+
if self.check_burn_tip_changed(&sort_db).is_err() {
691+
return Err(NakamotoNodeError::BurnchainTipChanged);
692+
}
677693
}
678694
}
679695

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

Lines changed: 3 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,7 +1480,6 @@ fn simple_neon_integration() {
14801480
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
14811481
let prom_bind = "127.0.0.1:6000".to_string();
14821482
naka_conf.node.prometheus_bind = Some(prom_bind.clone());
1483-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(5);
14841483
// set the block commit delay very high, so that we can safely assert that
14851484
// only one commit is submitted per tenure without generating test flake.
14861485
naka_conf.miner.block_commit_delay = Duration::from_secs(600);
@@ -1707,7 +1706,6 @@ fn restarting_miner() {
17071706
naka_conf.node.prometheus_bind = Some(prom_bind.clone());
17081707
naka_conf.miner.activated_vrf_key_path =
17091708
Some(format!("{}/vrf_key", naka_conf.node.working_dir));
1710-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(5);
17111709
let sender_sk = Secp256k1PrivateKey::from_seed(&[1, 2, 1, 2, 1, 2]);
17121710
// setup sender + recipient for a test stx transfer
17131711
let sender_addr = tests::to_addr(&sender_sk);
@@ -1929,7 +1927,6 @@ fn flash_blocks_on_epoch_3_FLAKY() {
19291927
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
19301928
let prom_bind = "127.0.0.1:6000".to_string();
19311929
naka_conf.node.prometheus_bind = Some(prom_bind);
1932-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
19331930
let sender_sk = Secp256k1PrivateKey::random();
19341931
// setup sender + recipient for a test stx transfer
19351932
let sender_addr = tests::to_addr(&sender_sk);
@@ -2172,7 +2169,6 @@ fn mine_multiple_per_tenure_integration() {
21722169

21732170
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
21742171
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
2175-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
21762172
let sender_sk = Secp256k1PrivateKey::random();
21772173
let sender_signer_sk = Secp256k1PrivateKey::random();
21782174
let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -2356,7 +2352,6 @@ fn multiple_miners() {
23562352
let node_2_rpc = 51026;
23572353
let node_2_p2p = 51025;
23582354
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
2359-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
23602355
naka_conf.node.pox_sync_sample_secs = 30;
23612356
let sender_sk = Secp256k1PrivateKey::random();
23622357
let sender_signer_sk = Secp256k1PrivateKey::random();
@@ -2611,7 +2606,6 @@ fn correct_burn_outs() {
26112606
epochs[StacksEpochId::Epoch30].start_height = 225;
26122607
}
26132608

2614-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
26152609
naka_conf.initial_balances.clear();
26162610
let accounts: Vec<_> = (0..8)
26172611
.map(|ix| {
@@ -3296,7 +3290,7 @@ fn miner_writes_proposed_block_to_stackerdb() {
32963290
}
32973291

32983292
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
3299-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1000);
3293+
naka_conf.miner.min_time_between_blocks_ms = 1_000_000;
33003294
let sender_sk = Secp256k1PrivateKey::random();
33013295
// setup sender + recipient for a test stx transfer
33023296
let sender_addr = tests::to_addr(&sender_sk);
@@ -3413,7 +3407,6 @@ fn vote_for_aggregate_key_burn_op() {
34133407

34143408
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
34153409
let _http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
3416-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
34173410
let signer_sk = Secp256k1PrivateKey::random();
34183411
let signer_addr = tests::to_addr(&signer_sk);
34193412

@@ -3631,7 +3624,6 @@ fn follower_bootup_simple() {
36313624

36323625
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
36333626
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
3634-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
36353627
let sender_sk = Secp256k1PrivateKey::random();
36363628
let sender_signer_sk = Secp256k1PrivateKey::random();
36373629
let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -3948,7 +3940,6 @@ fn follower_bootup_across_multiple_cycles() {
39483940
}
39493941

39503942
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
3951-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
39523943
naka_conf.node.pox_sync_sample_secs = 180;
39533944
naka_conf.burnchain.max_rbf = 10_000_000;
39543945

@@ -4175,7 +4166,6 @@ fn follower_bootup_custom_chain_id() {
41754166
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
41764167
naka_conf.burnchain.chain_id = 0x87654321;
41774168
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
4178-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
41794169
let sender_sk = Secp256k1PrivateKey::random();
41804170
let sender_signer_sk = Secp256k1PrivateKey::random();
41814171
let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -4508,7 +4498,6 @@ fn burn_ops_integration_test() {
45084498

45094499
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
45104500
naka_conf.burnchain.satoshis_per_byte = 2;
4511-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
45124501

45134502
let signer_sk_1 = setup_stacker(&mut naka_conf);
45144503
let signer_addr_1 = tests::to_addr(&signer_sk_1);
@@ -5102,7 +5091,6 @@ fn forked_tenure_is_ignored() {
51025091
}
51035092

51045093
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
5105-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(10);
51065094
naka_conf.miner.block_commit_delay = Duration::from_secs(0);
51075095
let sender_sk = Secp256k1PrivateKey::random();
51085096
// setup sender + recipient for a test stx transfer
@@ -5462,7 +5450,6 @@ fn check_block_heights() {
54625450
let mut signers = TestSigners::default();
54635451
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
54645452
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
5465-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
54665453
let sender_sk = Secp256k1PrivateKey::random();
54675454
let sender_signer_sk = Secp256k1PrivateKey::random();
54685455
let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -6199,7 +6186,6 @@ fn clarity_burn_state() {
61996186
let mut signers = TestSigners::default();
62006187
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
62016188
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
6202-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
62036189
let sender_sk = Secp256k1PrivateKey::random();
62046190
let sender_signer_sk = Secp256k1PrivateKey::random();
62056191
let sender_signer_addr = tests::to_addr(&sender_signer_sk);
@@ -6471,7 +6457,6 @@ fn signer_chainstate() {
64716457
let prom_bind = "127.0.0.1:6000".to_string();
64726458
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
64736459
naka_conf.node.prometheus_bind = Some(prom_bind.clone());
6474-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
64756460
let sender_sk = Secp256k1PrivateKey::random();
64766461
// setup sender + recipient for a test stx transfer
64776462
let sender_addr = tests::to_addr(&sender_sk);
@@ -7044,7 +7029,6 @@ fn continue_tenure_extend() {
70447029
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
70457030
let prom_bind = "127.0.0.1:6000".to_string();
70467031
naka_conf.node.prometheus_bind = Some(prom_bind.clone());
7047-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
70487032
naka_conf.connection_options.block_proposal_max_age_secs = u64::MAX;
70497033
naka_conf.miner.block_commit_delay = Duration::from_secs(600);
70507034
let http_origin = naka_conf.node.data_url.clone();
@@ -7489,7 +7473,6 @@ fn check_block_times() {
74897473
let mut signers = TestSigners::default();
74907474
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
74917475
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
7492-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
74937476
naka_conf.burnchain.chain_id = CHAIN_ID_TESTNET + 1;
74947477
let sender_sk = Secp256k1PrivateKey::random();
74957478
let sender_signer_sk = Secp256k1PrivateKey::random();
@@ -7878,7 +7861,6 @@ fn check_block_info() {
78787861
// change the chain id so that it isn't the same as primary testnet
78797862
naka_conf.burnchain.chain_id = CHAIN_ID_TESTNET + 1;
78807863
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
7881-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
78827864
naka_conf.miner.tenure_cost_limit_per_block_percentage = None;
78837865
let sender_sk = Secp256k1PrivateKey::random();
78847866
let sender_signer_sk = Secp256k1PrivateKey::random();
@@ -8510,7 +8492,6 @@ fn check_block_info_rewards() {
85108492
let mut signers = TestSigners::default();
85118493
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
85128494
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
8513-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
85148495
naka_conf.burnchain.chain_id = CHAIN_ID_TESTNET + 1;
85158496
let sender_sk = Secp256k1PrivateKey::random();
85168497
let sender_signer_sk = Secp256k1PrivateKey::random();
@@ -8838,7 +8819,6 @@ fn mock_mining() {
88388819
}
88398820

88408821
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
8841-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
88428822
naka_conf.node.pox_sync_sample_secs = 30;
88438823
naka_conf.miner.tenure_cost_limit_per_block_percentage = None;
88448824
let sender_sk = Secp256k1PrivateKey::random();
@@ -9143,7 +9123,7 @@ fn utxo_check_on_startup_panic() {
91439123
println!("Nakamoto node started with config: {naka_conf:?}");
91449124
let prom_bind = "127.0.0.1:6000".to_string();
91459125
naka_conf.node.prometheus_bind = Some(prom_bind);
9146-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1000);
9126+
naka_conf.miner.min_time_between_blocks_ms = 1_000_000;
91479127

91489128
test_observer::spawn();
91499129
test_observer::register_any(&mut naka_conf);
@@ -9219,7 +9199,7 @@ fn utxo_check_on_startup_recover() {
92199199
println!("Nakamoto node started with config: {naka_conf:?}");
92209200
let prom_bind = "127.0.0.1:6000".to_string();
92219201
naka_conf.node.prometheus_bind = Some(prom_bind);
9222-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1000);
9202+
naka_conf.miner.min_time_between_blocks_ms = 1_000_000;
92239203

92249204
test_observer::spawn();
92259205
test_observer::register_any(&mut naka_conf);
@@ -9279,7 +9259,6 @@ fn v3_signer_api_endpoint() {
92799259
let (mut conf, _miner_account) = naka_neon_integration_conf(None);
92809260
let password = "12345".to_string();
92819261
conf.connection_options.auth_token = Some(password);
9282-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
92839262
let stacker_sk = setup_stacker(&mut conf);
92849263
let signer_sk = Secp256k1PrivateKey::random();
92859264
let signer_addr = tests::to_addr(&signer_sk);
@@ -9445,7 +9424,6 @@ fn v3_blockbyheight_api_endpoint() {
94459424
let (mut conf, _miner_account) = naka_neon_integration_conf(None);
94469425
let password = "12345".to_string();
94479426
conf.connection_options.auth_token = Some(password);
9448-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
94499427
let stacker_sk = setup_stacker(&mut conf);
94509428
let signer_sk = Secp256k1PrivateKey::random();
94519429
let signer_addr = tests::to_addr(&signer_sk);
@@ -9563,7 +9541,6 @@ fn nakamoto_lockup_events() {
95639541
let (mut conf, _miner_account) = naka_neon_integration_conf(None);
95649542
let password = "12345".to_string();
95659543
conf.connection_options.auth_token = Some(password);
9566-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
95679544
let stacker_sk = setup_stacker(&mut conf);
95689545
let signer_sk = Secp256k1PrivateKey::random();
95699546
let signer_addr = tests::to_addr(&signer_sk);
@@ -9732,7 +9709,6 @@ fn skip_mining_long_tx() {
97329709
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
97339710
let prom_bind = "127.0.0.1:6000".to_string();
97349711
naka_conf.node.prometheus_bind = Some(prom_bind);
9735-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
97369712
naka_conf.miner.nakamoto_attempt_time_ms = 5_000;
97379713
naka_conf.miner.tenure_cost_limit_per_block_percentage = None;
97389714
let sender_1_sk = Secp256k1PrivateKey::from_seed(&[30]);
@@ -10089,7 +10065,6 @@ fn sip029_coinbase_change() {
1008910065
set_test_coinbase_schedule(Some(new_sched));
1009010066

1009110067
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
10092-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1009310068
naka_conf.node.pox_sync_sample_secs = 180;
1009410069
naka_conf.burnchain.max_rbf = 10_000_000;
1009510070

@@ -10289,7 +10264,6 @@ fn clarity_cost_spend_down() {
1028910264
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
1029010265
let http_origin = format!("http://{}", &naka_conf.node.rpc_bind);
1029110266
let num_signers = 30;
10292-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1029310267
let sender_sks: Vec<_> = (0..num_signers)
1029410268
.map(|_| Secp256k1PrivateKey::random())
1029510269
.collect();
@@ -10578,7 +10552,6 @@ fn consensus_hash_event_dispatcher() {
1057810552
let (mut conf, _miner_account) = naka_neon_integration_conf(None);
1057910553
let password = "12345".to_string();
1058010554
conf.connection_options.auth_token = Some(password.clone());
10581-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1058210555
let stacker_sk = setup_stacker(&mut conf);
1058310556
let signer_sk = Secp256k1PrivateKey::random();
1058410557
let signer_addr = tests::to_addr(&signer_sk);
@@ -11021,7 +10994,6 @@ fn mine_invalid_principal_from_consensus_buff() {
1102110994
let password = "12345".to_string();
1102210995
let http_origin = format!("http://{}", &conf.node.rpc_bind);
1102310996
conf.connection_options.auth_token = Some(password.clone());
11024-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1102510997
let stacker_sk = setup_stacker(&mut conf);
1102610998
let signer_sk = Secp256k1PrivateKey::random();
1102710999
let signer_addr = tests::to_addr(&signer_sk);
@@ -11136,7 +11108,6 @@ fn reload_miner_config() {
1113611108
let password = "12345".to_string();
1113711109
let _http_origin = format!("http://{}", &conf.node.rpc_bind);
1113811110
conf.connection_options.auth_token = Some(password.clone());
11139-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1114011111
let stacker_sk = setup_stacker(&mut conf);
1114111112
let signer_sk = Secp256k1PrivateKey::random();
1114211113
let signer_addr = tests::to_addr(&signer_sk);
@@ -11283,7 +11254,6 @@ fn rbf_on_config_change() {
1128311254
let password = "12345".to_string();
1128411255
let _http_origin = format!("http://{}", &conf.node.rpc_bind);
1128511256
conf.connection_options.auth_token = Some(password.clone());
11286-
conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1128711257
conf.node.next_initiative_delay = 500;
1128811258
let stacker_sk = setup_stacker(&mut conf);
1128911259
let signer_sk = Secp256k1PrivateKey::random();
@@ -11423,7 +11393,6 @@ fn large_mempool_base(strategy: MemPoolWalkStrategy, set_fee: impl Fn() -> u64)
1142311393
}
1142411394

1142511395
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
11426-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1142711396
naka_conf.miner.mempool_walk_strategy = strategy;
1142811397

1142911398
let sender_signer_sk = Secp256k1PrivateKey::random();
@@ -11762,7 +11731,6 @@ fn larger_mempool() {
1176211731
}
1176311732

1176411733
let (mut naka_conf, _miner_account) = naka_neon_integration_conf(None);
11765-
naka_conf.miner.wait_on_interim_blocks = Duration::from_secs(1);
1176611734
naka_conf.miner.mempool_walk_strategy = MemPoolWalkStrategy::NextNonceWithHighestFeeRate;
1176711735

1176811736
let sender_signer_sk = Secp256k1PrivateKey::random();

0 commit comments

Comments
 (0)