Upgrade fixes #3232
Merged
Upgrade fixes #3232
+88
−130
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
bfish713
approved these changes
May 28, 2024
| @@ -372,76 +372,6 @@ pub(crate) async fn parent_leaf_and_state<TYPES: NodeType>( | |||
| Ok((parent_leaf, Arc::clone(state))) | |||
| } | |||
|
|
|||
| /// Send a proposal for the view `view` from the latest high_qc given an upgrade cert. This is a special | |||
There was a problem hiding this comment.
Nice I'm glad we can merge these two functions
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.
No linked issue
This PR:
Fixes some miscellaneous issues related to proposing blank blocks during the upgrade process that seem to have appeared between moving the consensus functionality around and integrating the builder in the transactions task.
This led to some simplifications: notably, the explicit null block override when we are between versions is moved from the proposal logic in consensus into the transaction task, though the voting logic remains unchanged.
This PR does not:
Key places to review: