Merge latest changes from v0.37.x #89
Conversation
Signed-off-by: Thane Thomson <connect@thanethomson.com>
| @@ -1322,7 +1321,7 @@ func (ps *PeerState) ApplyNewRoundStepMessage(msg *NewRoundStepMessage) { | |||
| // Shift Precommits to LastCommit. | |||
| if psHeight+1 == msg.Height && psRound == msg.LastCommitRound { | |||
| ps.PRS.LastCommitRound = msg.LastCommitRound | |||
| ps.PRS.LastCommit = lastPrecommits | |||
| ps.PRS.LastCommit = ps.PRS.Precommits | |||
There was a problem hiding this comment.
This is the undo-ed change right?
There was a problem hiding this comment.
Yes, we still have to revert this on the v0.37.x branch. Perhaps we should do that first. @jmalicevic would you mind submitting a PR to revert William's change to the v0.37.x branch? Once we merge that I'll rebase this PR.
There was a problem hiding this comment.
I created a PR that reverts this on 0.37.1 but reading this again, you want to revert the revert on 0.37.x? :)
There was a problem hiding this comment.
Yes, please revert the change on v0.37.x.
There was a problem hiding this comment.
Sorry about the confusion. The PR is up #96
There was a problem hiding this comment.
I just realized that I totally created the confusion here - I was under the impression that the change was still on v0.37.x and we hadn't reverted it yet 🤦 So sorry about that!
Please rather close #96 for now, I'll close this PR and submit another one that exclusively updates the codeowners on the release/v0.37.1 branch.
…v0.37.4/pr-88 perf: Speedup flowrate by removing time.Now() from every update call … (backport cometbft#88)
Updates the
release/v0.37.1branch with the latest changes from thev0.37.xbranch.PR checklist
CHANGELOG_PENDING.mdupdated, or no changelog entry neededdocs/) and code comments, or nodocumentation updates needed