Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure miner builds on its own blocks when reorging due to badly timed blocks #5691

Merged
merged 10 commits into from
Jan 22, 2025
Merged

Ensure miner builds on its own blocks when reorging due to badly timed blocks #5691

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4c25a90
test: add `allow_reorg_within_first_proposal_burn_block_timing_secs`
obycode Jan 14, 2025
1607145
test: improvements to `allow_reorg_within_first_proposal_burn_block_t…
obycode Jan 14, 2025
978fddc
fix: ensure miner continues mining off its own block
obycode Jan 14, 2025
bc51cbb
test: improvements to `allow_reorg_within_first_proposal_burn_block_t…
obycode Jan 15, 2025
994bc83
test: further improvements to integration test
obycode Jan 17, 2025
612dc5d
Merge branch 'develop' into test/allow_reorg_within_first_proposal_bu…
obycode Jan 17, 2025
fa80e0a
test: fix conflict in test after merge
obycode Jan 17, 2025
be9e05f
Merge branch 'develop' into test/allow_reorg_within_first_proposal_bu…
obycode Jan 18, 2025
13aaa3f
docs: add changelog entry
obycode Jan 18, 2025
cf38139
Merge branch 'develop' into test/allow_reorg_within_first_proposal_bu…
obycode Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/bitcoin-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ jobs:
- tests::signer::v0::incoming_signers_ignore_block_proposals
- tests::signer::v0::outgoing_signers_ignore_block_proposals
- tests::signer::v0::injected_signatures_are_ignored_across_boundaries
- tests::signer::v0::allow_reorg_within_first_proposal_burn_block_timing_secs
- tests::nakamoto_integrations::burn_ops_integration_test
- tests::nakamoto_integrations::check_block_heights
- tests::nakamoto_integrations::clarity_burn_state
Expand Down
3 changes: 1 addition & 2 deletions testnet/stacks-node/src/nakamoto_node/miner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,9 +845,8 @@ impl BlockMinerThread {
})?;

let stacks_tip_block_id = StacksBlockId::new(&stacks_tip_ch, &stacks_tip_bh);
let tenure_tip_opt = NakamotoChainState::get_highest_block_header_in_tenure(
let tenure_tip_opt = NakamotoChainState::get_highest_known_block_header_in_tenure(
jferrant marked this conversation as resolved.
Show resolved Hide resolved
&mut chain_state.index_conn(),
&stacks_tip_block_id,
&self.burn_election_block.consensus_hash,
)
.map_err(|e| {
Expand Down
Loading
Loading