Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: halt-height behavior is not deterministic (backport #16639) #16722

Merged
merged 2 commits into from
Jun 27, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 27, 2023

This is an automatic backport of pull request #16639 done by Mergify.
Cherry-pick of c0e9e8c has failed:

On branch mergify/bp/release/v0.50.x/pr-16639
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit c0e9e8ce8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   baseapp/abci.go
	modified:   baseapp/abci_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
(cherry picked from commit c0e9e8c)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 27, 2023 13:43
@mergify mergify bot added the conflicts label Jun 27, 2023
Comment on lines 648 to 654

if err := app.checkHalt(req.Height, req.Time); err != nil {
return nil, err
}

if err := app.validateFinalizeBlockHeight(req); err != nil {
return nil, err
Copy link
Contributor

Choose a reason for hiding this comment

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

Change potentially affects state.

Call sequence:

(*github.com/cosmos/cosmos-sdk/baseapp.BaseApp).FinalizeBlock (baseapp/abci.go:648)

@julienrbrt julienrbrt enabled auto-merge (squash) June 27, 2023 13:49
@julienrbrt julienrbrt merged commit 1ac4a4d into release/v0.50.x Jun 27, 2023
45 of 47 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-16639 branch June 27, 2023 14:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants