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

feat(x/gov): Emit VoterAddr (backport #17354) #17357

Merged
merged 2 commits into from
Aug 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 11, 2023

This is an automatic backport of pull request #17354 done by Mergify.
Cherry-pick of 85d9791 has failed:

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

You are currently cherry-picking commit 85d9791ed.
  (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:   x/gov/keeper/vote.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   x/gov/types/events.go

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 85d9791)

# Conflicts:
#	x/gov/types/events.go
@mergify mergify bot requested a review from a team as a code owner August 11, 2023 07:54
@mergify mergify bot added the conflicts label Aug 11, 2023
@tac0turtle tac0turtle enabled auto-merge (squash) August 11, 2023 08:29
@tac0turtle tac0turtle merged commit dd028ed into release/v0.46.x Aug 11, 2023
29 of 30 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.46.x/pr-17354 branch August 11, 2023 08:39
cmwaters added a commit to celestiaorg/cosmos-sdk that referenced this pull request Aug 15, 2023
* build(deps): bump cometbft to v0.34.29 (cosmos#16553)

* fix(x/auth): ensure nil .BaseAccounts are reported in ModuleAccount.Validate (backport cosmos#16554) (cosmos#16570)

Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: snapshotter's failure is not propogated (backport cosmos#16588) (cosmos#16604)

Co-authored-by: yihuang <huang@crypto.com>

* feat: add custom max gas for block for sim config (backport cosmos#16656) (cosmos#16731)

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>

* fix: accaddr cachefix (backport cosmos#15433) (cosmos#16823)

Co-authored-by: KyleMoser <KyleMoser@users.noreply.github.com>
Co-authored-by: HuangYi <huang@crypto.com>

* fix(cli): improve `prune` command ux (backport cosmos#16856) (cosmos#16876)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: query tx events with `>=` and `<=` operators (cosmos#16994)

* docs: change bank multi-send command description (backport cosmos#16950) (cosmos#17019)

* chore: prepare v0.46.14 (cosmos#16879)

* refactor: add MigrateHandler to allow reuse migrate genesis related function  (backport cosmos#17296) (cosmos#17301)

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: resolve migration map in MigrateHandler (cosmos#17301) (cosmos#17302)

* feat(x/gov): Emit VoterAddr (backport cosmos#17354) (cosmos#17357)

Co-authored-by: Devon Bear <itsdevbear@berachain.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat(x/gov): add MsgSubmitProposal SetMsgs method (backport cosmos#17387) (cosmos#17388)

Co-authored-by: Julien Robert <julien@rbrt.fr>

---------

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Emmanuel T Odeke <emmanuel@orijtech.com>
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: KyleMoser <KyleMoser@users.noreply.github.com>
Co-authored-by: Rootul P <rootulp@gmail.com>
Co-authored-by: Devon Bear <itsdevbear@berachain.com>
rootulp pushed a commit to rootulp/cosmos-sdk that referenced this pull request Nov 7, 2023
Co-authored-by: Devon Bear <itsdevbear@berachain.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
rootulp added a commit to celestiaorg/cosmos-sdk that referenced this pull request Nov 14, 2023
* refactor: add MigrateHandler to allow reuse migrate genesis related function  (backport cosmos#17296) (cosmos#17301)

Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: resolve migration map in MigrateHandler (cosmos#17301) (cosmos#17302)

* feat(x/gov): Emit VoterAddr (backport cosmos#17354) (cosmos#17357)

Co-authored-by: Devon Bear <itsdevbear@berachain.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat(x/gov): add MsgSubmitProposal SetMsgs method (backport cosmos#17387) (cosmos#17388)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: use correct config key for db_backend (backport cosmos#17406) (cosmos#17412)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* chore: prepare v0.46.15 (cosmos#17408)

* fix(x/authz): GetAuthorizations (backport cosmos#17334) (cosmos#17527)

Co-authored-by: devon <80245700+devon-chain@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* docs: update x/group create-proposal to submit-proposal (backport cosmos#17544) (cosmos#17549)

Co-authored-by: Félix C. Morency <1102868+fmorency@users.noreply.github.com>

* fix: typo in comment (backport cosmos#17635) (cosmos#17638)

Co-authored-by: Bryan White <bryanchriswhite@gmail.com>
Co-authored-by: Marko <marbar3778@yahoo.com>

* build(deps): bump cosmos/ledger-cosmos-go to v0.12.3 in v0.46 (backport cosmos#18105) (cosmos#18112)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* chore: prepare release notes v0.46.16 (cosmos#18118)

* fix(server): don't hardcode grpc address to localhost (backport cosmos#18254) (cosmos#18260)

Co-authored-by: Julien Robert <julien@rbrt.fr>

* chore: update tag date v0.46.16 (cosmos#18385)

* revert: Go 1.19

* revert: c226e8b

* chore(deps): upgrade to v1.29.0-tm-v0.34.29

* chore: downgrade to grpc 1.54.0

to match the versions used in upstream

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Devon Bear <itsdevbear@berachain.com>
Co-authored-by: devon <80245700+devon-chain@users.noreply.github.com>
Co-authored-by: Félix C. Morency <1102868+fmorency@users.noreply.github.com>
Co-authored-by: Bryan White <bryanchriswhite@gmail.com>
Co-authored-by: Marko <marbar3778@yahoo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants