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(baseapp): Utilizing voting power from VEs in ValidateVoteExtensions (backport #17518) #17552

Merged
merged 2 commits into from
Aug 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

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

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

You are currently cherry-picking commit bb0c86619.
  (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_test.go
	modified:   baseapp/abci_utils.go
	modified:   baseapp/abci_utils_test.go
	modified:   baseapp/testutil/mock/mocks.go
	modified:   tests/integration/staking/keeper/vote_extensions_test.go
	modified:   x/staking/keeper/validator.go
	modified:   x/staking/testutil/expected_keepers_mocks.go
	modified:   x/staking/types/expected_keepers.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   docs/architecture/adr-064-abci-2.0.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

…ns (#17518)

Co-authored-by: Aleksandr Bezobchuk <[email protected]>
(cherry picked from commit bb0c866)

# Conflicts:
#	CHANGELOG.md
#	docs/architecture/adr-064-abci-2.0.md
@mergify mergify bot requested a review from a team as a code owner August 25, 2023 17:55
@mergify mergify bot added the conflicts label Aug 25, 2023
@@ -38,6 +38,10 @@ Ref: https://keepachangelog.com/en/1.0.0/

## [Unreleased]

### Bug Fixes

* (baseapp) [#17518](https://github.com/cosmos/cosmos-sdk/pull/17518) Utilizing voting power from vote extensions (CometBFT) instead of the current bonded tokens (x/staking) to determine if a set of vote extensions are valid.
Copy link
Member

Choose a reason for hiding this comment

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

I leave so changelog so that people on rc.0 can check what changed by looking at the commit before rc.1.
However this will not be included in the collapsed changelog of rc.1 as this is still part of the same vote extension addition compared to v0.47. Possibly we can link the PR to abci 2.0 implementation.

Copy link
Member

Choose a reason for hiding this comment

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

leaving for now, we can merge later on

Copy link
Member

Choose a reason for hiding this comment

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

Yeah that's what I meant 😀

@tac0turtle tac0turtle merged commit b922a37 into release/v0.50.x Aug 28, 2023
48 of 49 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-17518 branch August 28, 2023 13:49
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