Backport #1203, #1231: Avoid process proposal when correct nodes validated it; prevote nil when proposal != locked block#21
Merged
teddyding merged 1 commit intodydx-fork-v0.37.2from Sep 6, 2023
Conversation
teddyding
commented
Sep 6, 2023
| // } | ||
| // | ||
| // Determine if the proposed block has a sane, non-nil proof-of-lock. | ||
| if cs.Proposal.POLRound >= 0 && cs.Proposal.POLRound < cs.Round { |
Author
There was a problem hiding this comment.
This is replaced by upstream fix, on line 1395
BrendanChou
approved these changes
Sep 6, 2023
Author
|
Test / tests (03) (pull_request) is currently timing out; however the test |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport two PRs from
cometbft/cometbftmain:nilwhen proposal block does not match locked block cometbft/cometbft#1203: update state to prevote nil when proposal block does not match locked blockNote: these PRs replace previous hot fix in #14