Skip to content

Merge latest changes from v0.37.x#89

Closed
thanethomson wants to merge 1 commit intorelease/v0.37.1from
thane/update-v0.37.1
Closed

Merge latest changes from v0.37.x#89
thanethomson wants to merge 1 commit intorelease/v0.37.1from
thane/update-v0.37.1

Conversation

@thanethomson
Copy link
Contributor

Updates the release/v0.37.1 branch with the latest changes from the v0.37.x branch.


PR checklist

  • Tests written/updated, or no tests needed
  • CHANGELOG_PENDING.md updated, or no changelog entry needed
  • Updated relevant documentation (docs/) and code comments, or no
    documentation updates needed

Signed-off-by: Thane Thomson <connect@thanethomson.com>
if psHeight+1 == msg.Height && psRound == msg.LastCommitRound {
ps.PRS.LastCommitRound = msg.LastCommitRound
ps.PRS.LastCommit = lastPrecommits
ps.PRS.LastCommit = ps.PRS.Precommits
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the undo-ed change right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, please revert the change on v0.37.x.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry about the confusion. The PR is up #96

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@jmalicevic
Copy link
Collaborator

#92

@thanethomson thanethomson deleted the thane/update-v0.37.1 branch January 12, 2023 12:10
cometcrafter pushed a commit to graphprotocol/cometbft that referenced this pull request Jun 25, 2024
…v0.37.4/pr-88

perf: Speedup flowrate by removing time.Now() from every update call … (backport cometbft#88)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants