Fix: correct burn view for miner block broadcast #5515
Conversation
|
…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]>
| /// 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
| @@ -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.
…und before extending the ongoing tenure if the miner produced the ongoing tenure
… the miner is "late" in doing so -- e.g. because a flashblock arrived
…f the miner produced the ongoing tenure (but only after a deadline), and to stop the tenure thread if the miner did not win sortition (even if continuation is later possible). If continuation is possible, then start a continuation thread if the ongoing tenure is still active.
|
We should run this against |
| @@ -489,6 +504,7 @@ impl BlockMinerThread { | |||
| // update mined-block counters and mined-tenure counters | |||
| self.globals.counters.bump_naka_mined_blocks(); | |||
| if self.last_block_mined.is_some() { | |||
| // TODO: reviewers: should this be .is_none()? | |||
There was a problem hiding this comment.
Yes, I think it should be is_none().
|
The flakiness in develop has been resolved on |
|
Working on fixing |
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.