Fix: correct burn view for miner block broadcast #5515
+747
−217
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
jferrant
previously approved these changes
Dec 4, 2024
…tenure nor extend the ongoing tenure, and fail-out of continue_tenure
…cks-core into fix/burn-view
Signed-off-by: Jacinta Ferrant <[email protected]>
jferrant
reviewed
Dec 10, 2024
| @@ -66,6 +66,9 @@ use crate::run_loop::nakamoto::{Globals, RunLoop}; | |||
| use crate::run_loop::RegisteredKey; | |||
| use crate::BitcoinRegtestController; | |||
|
|
|||
| #[cfg(test)] | |||
| pub static TEST_MINER_THREAD_STALL: std::sync::Mutex<Option<bool>> = std::sync::Mutex::new(None); | |||
There was a problem hiding this comment.
could use TestFlag here if you wanted.
jferrant
reviewed
Dec 10, 2024
| ) | ||
| { | ||
| if ongoing_tenure_id.burn_view_consensus_hash != sort_tip.consensus_hash { | ||
| todo!(); |
There was a problem hiding this comment.
Do we have an issue for this? D: If we plan to leave a todo! in the code, would be good to add a message to it.
jferrant
reviewed
Dec 10, 2024
| /// sortition, make sure we first mine a tenure-change block and then a tenure-extend block. | ||
| #[test] | ||
| #[ignore] | ||
| fn test_tenure_change_and_extend_from_flashblocks() { |
There was a problem hiding this comment.
I am prob just misunderstanding the test, but I don't see any confirmation about a tenure change/extend being issued in the correct order in this test. Is the fact the follower boots up and the chain advances proof enough?
…nction, and drop unused code
…cks-core into fix/burn-view
obycode
reviewed
Dec 16, 2024
| @@ -960,6 +980,7 @@ impl BlockMinerThread { | |||
| self.burn_election_block.sortition_hash.as_bytes(), | |||
| ) | |||
| } else { | |||
| // TODO: shouldn't this be self.burn_block.sortition_hash? | |||
There was a problem hiding this comment.
Let's resolve this TODO in this PR. I'm not immediately sure what the correct answer is.
obycode
reviewed
Dec 16, 2024
Comment on lines
+718
to
+719
| /// (1) 2 block commits have been issued ** or ** more than 10 seconds have | ||
| /// passed since (1) occurred |
There was a problem hiding this comment.
This is copy-pasted from these other methods, but I think it should say:
Suggested change
| /// (1) 2 block commits have been issued ** or ** more than 10 seconds have | |
| /// passed since (1) occurred | |
| /// Mine a bitcoin block, and wait until a block commit has been issued | |
| /// ** or ** more than timeout_secs seconds have passed |
Comment on lines
403
to
408
| let stacks_tip = StacksBlockId::new(&cur_stacks_tip_ch, &cur_stacks_tip_bh); | ||
| let highest_tenure_start_block_header = NakamotoChainState::get_tenure_start_block_header( | ||
| &mut self.chainstate.index_conn(), | ||
| &stacks_tip, | ||
| &cur_stacks_tip_ch, | ||
| ) | ||
| .expect( | ||
| "Relayer: Failed to get tenure-start block header for stacks tip {stacks_tip}: {e:?}", | ||
| ) | ||
| .expect("Relayer: Failed to find tenure-start block header for stacks tip {stacks_tip}"); | ||
|
|
||
| let stacks_tip_sortition = | ||
| SortitionDB::get_block_snapshot_consensus(&self.sortdb.conn(), &cur_stacks_tip_ch) | ||
| .expect("Relayer: Failed to load canonical Stacks tip's tenure snapshot") | ||
| .expect("Relayer: Canonical Stacks tip has no tenure snapshot"); |
There was a problem hiding this comment.
Neither of these variables are used. I think they can both be deleted.
| .map_err(|e| { | ||
| error!("Relayer: failed to get last snapshot with sortition: {e:?}"); | ||
| // Get the necessary snapshots and state | ||
| let burn_tip = SortitionDB::get_block_snapshot_consensus(sortdb.conn(), &new_burn_view)? |
There was a problem hiding this comment.
I don't think this is used any where.
Comment on lines
1030
to
1032
| let Some(mining_pkh) = self.get_mining_key_pkh() else { | ||
| return Ok(()); | ||
| }; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes the burn view calculation for the Nakamoto miner when accepting and broadcasting a block.
It builds atop #5508, so don't bother merging until #5508 is in
develop.