kylefang/stacks-puppet-node
1
0
Fork 0
mirror of https://github.com/alexgo-io/stacks-puppet-node.git synced 2026-01-12 22:43:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4495 from stacks-network/bugfix/do-not-unconditionally-attempt-block-post-failure

Browse Source 
Bugfix/do not unconditionally attempt block post submit failure
This commit is contained in:
saralab
2024-03-14 14:12:49 +00:00
committed by GitHub
parent 53173e593f ceff67302e
commit 87347e4e28
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
testnet/stacks-node/src/neon_node.rs
View File

@@ -516,6 +516,8 @@ pub(crate) struct BlockMinerThread {
burn_block: BlockSnapshot,
/// Handle to the node's event dispatcher
event_dispatcher: EventDispatcher,
/// Failed to submit last attempted block
failed_to_submit_last_attempt: bool,
}
/// State representing the microblock miner.
@@ -1020,6 +1022,7 @@ impl BlockMinerThread {
registered_key,
burn_block,
event_dispatcher: rt.event_dispatcher.clone(),
failed_to_submit_last_attempt: false,
}
}
@@ -1543,7 +1546,9 @@ impl BlockMinerThread {
Self::find_inflight_mined_blocks(self.burn_block.block_height, &self.last_mined_blocks);
// has the tip changed from our previously-mined block for this epoch?
let (attempt, max_txs) = if last_mined_blocks.len() <= 1 {
let should_unconditionally_mine = last_mined_blocks.is_empty()
|| (last_mined_blocks.len() == 1 && self.failed_to_submit_last_attempt);
let (attempt, max_txs) = if should_unconditionally_mine {
// always mine if we've not mined a block for this epoch yet, or
// if we've mined just one attempt, unconditionally try again (so we
// can use `subsequent_miner_time_ms` in this attempt)
@@ -2482,12 +2487,14 @@ impl BlockMinerThread {
let res = bitcoin_controller.submit_operation(target_epoch_id, op, &mut op_signer, attempt);
if res.is_none() {
self.failed_to_submit_last_attempt = true;
if !self.config.node.mock_mining {
warn!("Relayer: Failed to submit Bitcoin transaction");
return None;
} else {
debug!("Relayer: Mock-mining enabled; not sending Bitcoin transaction");
}
debug!("Relayer: Mock-mining enabled; not sending Bitcoin transaction");
} else {
self.failed_to_submit_last_attempt = false;
}
Some(MinerThreadResult::Block(