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(abci): add ExecModeVerifyVoteExtension (backport #18915) #18932

Merged
merged 2 commits into from
Jan 3, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 3, 2024

This is an automatic backport of pull request #18915 done by Mergify.
Cherry-pick of 19eddee has failed:

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

You are currently cherry-picking commit 19eddeeb2.
  (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/baseapp.go
	modified:   types/context.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

(cherry picked from commit 19eddee)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot added the conflicts label Jan 3, 2024
@mergify mergify bot requested a review from a team as a code owner January 3, 2024 07:28
Comment on lines 664 to +670
}
}()

ctx = ctx.
WithConsensusParams(cp).
WithBlockGasMeter(storetypes.NewInfiniteGasMeter()).
WithBlockHeight(req.Height).
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).VerifyVoteExtension (baseapp/abci.go:624)

Copy link
Contributor

@likhita-809 likhita-809 left a comment

Choose a reason for hiding this comment

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

need to fix conflicts in changelog
cc: @alexanderbez

@tac0turtle tac0turtle enabled auto-merge (squash) January 3, 2024 12:11
@tac0turtle tac0turtle merged commit 3518df2 into release/v0.50.x Jan 3, 2024
43 of 45 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-18915 branch January 3, 2024 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants