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

Bring in upstream changes through v0.46.13 #572

Merged
merged 51 commits into from
Jun 9, 2023

Conversation

SpicyLemon
Copy link

@SpicyLemon SpicyLemon commented Jun 2, 2023

Description

This PR pulls in changes from the SDK's v0.46.11, v0.46.12, and v0.46.13.

This PR also applies the following customizations:

  1. The SetCircuit function is added to the IMsgServiceRouter interface.
  2. Fix an issue with x/group sims random genesis where it could generate two policies with the same address.
  3. Put the better legacy gov prop error handling back in (it was added in .12 and removed again in .13 but it's something we want, so I put it back.
  4. Add the quarantine and sanction stores to the import-export sim test.
  5. Regenerate the swagger file.

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • included the correct type prefix in the PR title
  • added ! to the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • followed the guidelines for building modules
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • included comments for documenting Go code
  • updated the relevant documentation or specification
  • reviewed "Files changed" and left comments if necessary
  • confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage
  • manually tested (if applicable)

mergify bot and others added 30 commits February 17, 2023 17:57
…osmos#15115)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
…cosmos#15243) (cosmos#15245)

Co-authored-by: Maksym Hontar <99190705+max-hontar@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
…#15476)

Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
…egacy handler returns an error. (backport cosmos#13051) (cosmos#15667)

Co-authored-by: Daniel Wedul <github@wedul.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
…os#15669)

Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…15717)

Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…mos#15683) (cosmos#15775)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…port cosmos#15903) (cosmos#15925)

Co-authored-by: mmsqe <tqd0800210105@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…s#15979) (cosmos#15981)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
…example (backport cosmos#16085) (cosmos#16087)

Co-authored-by: Julien Robert <julien@rbrt.fr>
…cosmos#16103)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…s#16138) (cosmos#16140)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
mergify bot and others added 21 commits May 19, 2023 10:03
…kport cosmos#16193) (cosmos#16205)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
…16262)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
) (cosmos#16314)

Co-authored-by: Julien Robert <julien@rbrt.fr>
…smos#16306)

Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Release v0.46.11

# Conflicts:
#	RELEASE_NOTES.md
#	go.mod
#	go.sum
#	store/v2alpha1/dbadapter/store.go
#	store/v2alpha1/multi/store.go
#	store/v2alpha1/multi/store_test.go
#	store/v2alpha1/multi/sub_store.go
#	store/v2alpha1/multi/view_store.go
#	store/v2alpha1/types.go
Release v0.46.12

# Conflicts:
#	RELEASE_NOTES.md
#	baseapp/baseapp.go
#	proto/cosmos/tx/v1beta1/service.proto
… (backport cosmos#16430) (cosmos#16432)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Facundo Medica <facundomedica@gmail.com>
Release v0.46.13

# Conflicts:
#	RELEASE_NOTES.md
#	baseapp/msg_service_router.go
#	go.mod
#	go.sum
…wice for the group policies since that address is the primary key for the table. Also, output the genesis state after it's randomized just like all the other modules do.
@SpicyLemon SpicyLemon marked this pull request as ready for review June 8, 2023 23:34
@SpicyLemon
Copy link
Author

The following make targets ran and finished successfully: test test-sim-nondeterminism test-sim-import-export test-sim-after-import test-sim-multi-seed-short

I also pulled this branch in locally and ran those same make targets in the provenance repo. They all completed successfully over there too.

Copy link
Member

@iramiller iramiller left a comment

Choose a reason for hiding this comment

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

Reviewed the commits put on top of the upstream. LGTM.

@SpicyLemon SpicyLemon changed the title Prov/dwedul/bump to 0.46.13 Bring in upstream changes through v0.46.13 Jun 9, 2023
@SpicyLemon SpicyLemon merged commit 90c2acd into main-pio Jun 9, 2023
SpicyLemon added a commit that referenced this pull request Jun 9, 2023
* fix: create snapshot dir for rocksdb backend (backport cosmos#15054) (cosmos#15065)

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

* chore: Add check for uneven stores' height (backport cosmos#14410) (cosmos#15115)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>

* refactor!: remove store v2alpha1 (cosmos#15152)

* build: use cometbft in v0.46 (cosmos#15090)

* chore: bump cometbft to v0.34.27 final (cosmos#15206)

* fix: Change proposer address cast for `sdk_block` conversion (backport cosmos#15243) (cosmos#15245)

Co-authored-by: Maksym Hontar <99190705+max-hontar@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: revert double close fix (cosmos#15255)

* chore: prepare v0.46.11 release (cosmos#15259)

* feat: add extend cb to avoid unmarshal state twice for sim test (backport: cosmos#15305) (cosmos#15321)

* feat: add extend cb with genesisState for sim test (backport: cosmos#15305) (cosmos#15349)

* fix: add extra check in vesting (backport cosmos#15373) (cosmos#15383)

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

* docs: update cosmwasm link (cosmos#15441)

* fix: remove extra `;` in service.proto (cosmos#15443)

* fix: flaky group genesis sim (backport cosmos#15447) (cosmos#15461)

Co-authored-by: Robert Zaremba <robert@zaremba.ch>

* feat: add delegator to withdraw address (backport cosmos#15462) (cosmos#15473)

Co-authored-by: Marko <marbar3778@yahoo.com>

* docs: improve proto vesting docs about time attributes (backport cosmos#15474) (cosmos#15481)

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

* feat: add query `groups` in `x/group` (backport cosmos#14879) (cosmos#15476)

Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>

* fix: Makefile rocksdb (backport cosmos#15422) (cosmos#15525)

Co-authored-by: Robert Zaremba <robert@zaremba.ch>

* fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. (backport cosmos#13051) (cosmos#15667)

Co-authored-by: Daniel Wedul <github@wedul.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* fix: remove unnecessary cms typecasting (backport cosmos#14054) (cosmos#15669)

Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* chore: prepare v0.46.12 release notes (cosmos#15685)

* fix: upstream error on empty version (backport cosmos#13355) (cosmos#15717)

Co-authored-by: Marko <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat: More flexibility for `CacheMultiStoreWithVersion` (backport cosmos#15683) (cosmos#15775)

Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat: add moduleStateCb to allow access moduleState in sim test (backport cosmos#15903) (cosmos#15925)

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

* build(deps): bump cometbft to v0.34.28 (cosmos#15973)

* chore(gov): improve proposal conversion error message (backport cosmos#15979) (cosmos#15981)

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

* feat!: bootstrap comet cmd for local state sync  (backport cosmos#16061) (cosmos#16080)

Co-authored-by: Marko <marbar3778@yahoo.com>

* chore(auth/vesting): fix typo in `create-period-vesting-account` cmd example (backport cosmos#16085) (cosmos#16087)

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

* feat: add local snapshots management commands (backport cosmos#16067) (cosmos#16103)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: snapshot commands panic if snapshot don't exists (backport cosmos#16138) (cosmos#16140)

Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* feat: add Close method for resource cleanup in graceful shutdown (backport cosmos#16193) (cosmos#16205)

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

* feat: save restored snapshot locally (backport cosmos#16060) (cosmos#16262)

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

* chore: update sidebar v0.46 (cosmos#16304)

* chore: add baseapp circuit breaker setter (cosmos#16289)

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

* fix: allow any address in `ValidatePromptAddress` (backport cosmos#16312) (cosmos#16314)

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

* feat(group): add group event tally result (backport cosmos#16191) (cosmos#16306)

Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>

* fix: Revert "fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. (backport cosmos#13051) (cosmos#15667)" (cosmos#16331)

* chore: prepare v0.46.13 (cosmos#16249)

* chore: small snapshot commands & docs improvement (backport cosmos#16404) (cosmos#16409)

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

* Add the quarantine and sanction stores to the import-export sim test.

* refactor: avoid breaking change due to cosmos#16415 included in v0.50 (backport cosmos#16430) (cosmos#16432)

Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Facundo Medica <facundomedica@gmail.com>

* chore: prepare v0.46.13 (2/2) (cosmos#16443)

* fix: patch barberry (cosmos#16466)

* Better gov prop error handling.

* Fix the group sims random genesis so it can't pick the same account twice for the group policies since that address is the primary key for the table. Also, output the genesis state after it's randomized just like all the other modules do.

* Add changelog entries.

* Regen the swagger docs.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Maksym Hontar <99190705+max-hontar@users.noreply.github.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: mmsqe <tqd0800210105@gmail.com>
Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: Facundo Medica <facundomedica@gmail.com>
SpicyLemon added a commit that referenced this pull request Jun 9, 2023
* fix: create snapshot dir for rocksdb backend (backport cosmos#15054) (cosmos#15065)



* chore: Add check for uneven stores' height (backport cosmos#14410) (cosmos#15115)




* refactor!: remove store v2alpha1 (cosmos#15152)

* build: use cometbft in v0.46 (cosmos#15090)

* chore: bump cometbft to v0.34.27 final (cosmos#15206)

* fix: Change proposer address cast for `sdk_block` conversion (backport cosmos#15243) (cosmos#15245)




* fix: revert double close fix (cosmos#15255)

* chore: prepare v0.46.11 release (cosmos#15259)

* feat: add extend cb to avoid unmarshal state twice for sim test (backport: cosmos#15305) (cosmos#15321)

* feat: add extend cb with genesisState for sim test (backport: cosmos#15305) (cosmos#15349)

* fix: add extra check in vesting (backport cosmos#15373) (cosmos#15383)



* docs: update cosmwasm link (cosmos#15441)

* fix: remove extra `;` in service.proto (cosmos#15443)

* fix: flaky group genesis sim (backport cosmos#15447) (cosmos#15461)



* feat: add delegator to withdraw address (backport cosmos#15462) (cosmos#15473)



* docs: improve proto vesting docs about time attributes (backport cosmos#15474) (cosmos#15481)



* feat: add query `groups` in `x/group` (backport cosmos#14879) (cosmos#15476)




* fix: Makefile rocksdb (backport cosmos#15422) (cosmos#15525)



* fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. (backport cosmos#13051) (cosmos#15667)




* fix: remove unnecessary cms typecasting (backport cosmos#14054) (cosmos#15669)




* chore: prepare v0.46.12 release notes (cosmos#15685)

* fix: upstream error on empty version (backport cosmos#13355) (cosmos#15717)




* feat: More flexibility for `CacheMultiStoreWithVersion` (backport cosmos#15683) (cosmos#15775)




* feat: add moduleStateCb to allow access moduleState in sim test (backport cosmos#15903) (cosmos#15925)




* build(deps): bump cometbft to v0.34.28 (cosmos#15973)

* chore(gov): improve proposal conversion error message (backport cosmos#15979) (cosmos#15981)




* feat!: bootstrap comet cmd for local state sync  (backport cosmos#16061) (cosmos#16080)



* chore(auth/vesting): fix typo in `create-period-vesting-account` cmd example (backport cosmos#16085) (cosmos#16087)



* feat: add local snapshots management commands (backport cosmos#16067) (cosmos#16103)





* fix: snapshot commands panic if snapshot don't exists (backport cosmos#16138) (cosmos#16140)





* feat: add Close method for resource cleanup in graceful shutdown (backport cosmos#16193) (cosmos#16205)




* feat: save restored snapshot locally (backport cosmos#16060) (cosmos#16262)




* chore: update sidebar v0.46 (cosmos#16304)

* chore: add baseapp circuit breaker setter (cosmos#16289)



* fix: allow any address in `ValidatePromptAddress` (backport cosmos#16312) (cosmos#16314)



* feat(group): add group event tally result (backport cosmos#16191) (cosmos#16306)





* fix: Revert "fix(x/gov): Return ErrInvalidProposalContent in SubmitProposal when legacy handler returns an error. (backport cosmos#13051) (cosmos#15667)" (cosmos#16331)

* chore: prepare v0.46.13 (cosmos#16249)

* chore: small snapshot commands & docs improvement (backport cosmos#16404) (cosmos#16409)



* Add the quarantine and sanction stores to the import-export sim test.

* refactor: avoid breaking change due to cosmos#16415 included in v0.50 (backport cosmos#16430) (cosmos#16432)




* chore: prepare v0.46.13 (2/2) (cosmos#16443)

* fix: patch barberry (cosmos#16466)

* Better gov prop error handling.

* Fix the group sims random genesis so it can't pick the same account twice for the group policies since that address is the primary key for the table. Also, output the genesis state after it's randomized just like all the other modules do.

* Add changelog entries.

* Regen the swagger docs.

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: yihuang <huang@crypto.com>
Co-authored-by: khanh-notional <50263489+catShaark@users.noreply.github.com>
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: Julien Robert <julien@rbrt.fr>
Co-authored-by: Maksym Hontar <99190705+max-hontar@users.noreply.github.com>
Co-authored-by: mmsqe <mavis@crypto.com>
Co-authored-by: Robert Zaremba <robert@zaremba.ch>
Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Javier Su <javier.su.weijie@gmail.com>
Co-authored-by: mmsqe <tqd0800210105@gmail.com>
Co-authored-by: Jeancarlo Barrios <JeancarloBarrios@users.noreply.github.com>
Co-authored-by: Facundo Medica <facundomedica@gmail.com>
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.

6 participants