From df6eae3aef916b9a9a748726bf90b6bb42ef9765 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Thu, 12 Sep 2024 13:15:36 -0400 Subject: [PATCH 1/3] chore: add signer logs --- stacks-signer/src/chainstate.rs | 8 ++++++++ stacks-signer/src/v0/signer.rs | 1 + 2 files changed, 9 insertions(+) diff --git a/stacks-signer/src/chainstate.rs b/stacks-signer/src/chainstate.rs index c35ceb67e0..49cf237a03 100644 --- a/stacks-signer/src/chainstate.rs +++ b/stacks-signer/src/chainstate.rs @@ -193,10 +193,18 @@ impl SortitionsView { .cur_sortition .is_timed_out(self.config.block_proposal_timeout, signer_db)? { + info!( + "Current miner timed out, marking as invalid."; + "current_sortition_consensus_hash" => ?self.cur_sortition.consensus_hash, + ); self.cur_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock; } if let Some(last_sortition) = self.last_sortition.as_mut() { if last_sortition.is_timed_out(self.config.block_proposal_timeout, signer_db)? { + info!( + "Last miner timed out, marking as invalid."; + "last_sortition_consensus_hash" => ?last_sortition.consensus_hash, + ); last_sortition.miner_status = SortitionMinerStatus::InvalidatedBeforeFirstBlock; } } diff --git a/stacks-signer/src/v0/signer.rs b/stacks-signer/src/v0/signer.rs index 53a288b7f5..82e6d78ea5 100644 --- a/stacks-signer/src/v0/signer.rs +++ b/stacks-signer/src/v0/signer.rs @@ -353,6 +353,7 @@ impl Signer { "{self}: received a block proposal for a new block. Submit block for validation. "; "signer_sighash" => %signer_signature_hash, "block_id" => %block_proposal.block.block_id(), + "burn_height" => block_proposal.burn_height, ); crate::monitoring::increment_block_proposals_received(); let mut block_info = BlockInfo::from(block_proposal.clone()); From 11c312eda80eac7023a0919a88487ab906ad84c0 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Thu, 12 Sep 2024 13:15:48 -0400 Subject: [PATCH 2/3] chore: change default `nakamoto_attempt_time_ms` to 5s --- testnet/stacks-node/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testnet/stacks-node/src/config.rs b/testnet/stacks-node/src/config.rs index d1b115d9cf..5ab9396ff4 100644 --- a/testnet/stacks-node/src/config.rs +++ b/testnet/stacks-node/src/config.rs @@ -2370,7 +2370,7 @@ impl Default for MinerConfig { first_attempt_time_ms: 10, subsequent_attempt_time_ms: 120_000, microblock_attempt_time_ms: 30_000, - nakamoto_attempt_time_ms: 20_000, + nakamoto_attempt_time_ms: 5_000, probability_pick_no_estimate_tx: 25, block_reward_recipient: None, segwit: false, From 16f127cb80a19d41cad75102e210f04b52b8e9a2 Mon Sep 17 00:00:00 2001 From: Brice Dobry Date: Thu, 12 Sep 2024 14:21:12 -0400 Subject: [PATCH 3/3] chore: change default `burnchain.timeout` to 60s This matches the hard-coded timeout what was previously in the code. --- testnet/stacks-node/src/config.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testnet/stacks-node/src/config.rs b/testnet/stacks-node/src/config.rs index 5ab9396ff4..611bd7cdaf 100644 --- a/testnet/stacks-node/src/config.rs +++ b/testnet/stacks-node/src/config.rs @@ -1457,7 +1457,7 @@ impl BurnchainConfig { rpc_ssl: false, username: None, password: None, - timeout: 300, + timeout: 60, magic_bytes: BLOCKSTACK_MAGIC_MAINNET.clone(), local_mining_public_key: None, process_exit_at_block_height: None,