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.

Sign up for GitHub

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

Jump to bottom

fix: revert double close fix #15255

Merged
merged 1 commit into from
Mar 3, 2023
Merged

fix: revert double close fix #15255

merged 1 commit into from
Mar 3, 2023

Conversation

julienrbrt
Copy link
Member

Description

Revert double close fix introduced at: #15090
Tested statesync with quicksilver v1.2.3 and it worked.

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)

@julienrbrt julienrbrt requested a review from a team as a code owner March 3, 2023 11:00
@tac0turtle tac0turtle merged commit 578c160 into release/v0.46.x Mar 3, 2023
@tac0turtle tac0turtle deleted the julien/revert-double-close-fix branch March 3, 2023 11:43
@mmsqe
Copy link
Contributor

mmsqe commented Mar 4, 2023

You can pass the test when upgraded from go 1.18 to 1.19 since there is no double close issue in such go version. But should we bump up the snapshot? The checksum of snapshots would be different once the double close is removed.

@julienrbrt
Copy link
Member Author

You can pass the test when upgraded from go 1.18 to 1.19 since there is no double close issue in such go version. But should we bump up the snapshot? The checksum of snapshots would be different once the double close is removed.

We have not bumped it to not broke statesync until nodes upgraded. It has been bumped in v0.47 in your PR: #13400

SpicyLemon added a commit to provenance-io/cosmos-sdk that referenced this pull request Jun 9, 2023
@SpicyLemon @mergify
@yihuang @catShaark @tac0turtle @julienrbrt @max-hontar @mmsqe @robert-zaremba @atheeshp @alexanderbez @javiersuweijie @JeancarloBarrios @facundomedica
Bring in upstream changes through v0.46.13 (#572)
90c2acd 
* fix: create snapshot dir for rocksdb backend (backport cosmos#15054) (cosmos#15065)

Co-authored-by: yihuang <[email protected]>

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

Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

Co-authored-by: Marko <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: atheeshp <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

Co-authored-by: Robert Zaremba <[email protected]>

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

Co-authored-by: Daniel Wedul <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

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

Co-authored-by: Javier Su <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

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

Co-authored-by: Marko <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

Co-authored-by: Marko <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: Jeancarlo Barrios <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>

* 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 <[email protected]>
Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Maksym Hontar <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: atheeshp <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Javier Su <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Jeancarlo Barrios <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
SpicyLemon added a commit to provenance-io/cosmos-sdk that referenced this pull request Jun 9, 2023
@SpicyLemon @mergify
@yihuang @catShaark @tac0turtle @julienrbrt @max-hontar @mmsqe @robert-zaremba @atheeshp @alexanderbez @javiersuweijie @JeancarloBarrios @facundomedica
Bring in upstream changes through v0.46.13 (#572)
90c8ed0 
* fix: create snapshot dir for rocksdb backend (backport cosmos#15054) (cosmos#15065)

Co-authored-by: yihuang <[email protected]>

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

Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

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

Co-authored-by: Marko <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: atheeshp <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

Co-authored-by: Robert Zaremba <[email protected]>

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

Co-authored-by: Daniel Wedul <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>

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

Co-authored-by: Javier Su <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

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

Co-authored-by: Marko <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

Co-authored-by: Marko <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: yihuang <[email protected]>
Co-authored-by: marbar3778 <[email protected]>

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

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: Julien Robert <[email protected]>

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

Co-authored-by: Jeancarlo Barrios <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>

* 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 <[email protected]>
Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Maksym Hontar <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: atheeshp <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Javier Su <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Jeancarlo Barrios <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
SpicyLemon added a commit to provenance-io/cosmos-sdk that referenced this pull request Jun 9, 2023
@SpicyLemon @mergify
@yihuang @catShaark @tac0turtle @julienrbrt @max-hontar @mmsqe @robert-zaremba @atheeshp @alexanderbez @javiersuweijie @JeancarloBarrios @facundomedica
Bring in upstream changes through v0.46.13 (#572) (#574)
0f28842 
* 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 <[email protected]>
Co-authored-by: khanh-notional <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Julien Robert <[email protected]>
Co-authored-by: Maksym Hontar <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Robert Zaremba <[email protected]>
Co-authored-by: atheeshp <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
Co-authored-by: Javier Su <[email protected]>
Co-authored-by: mmsqe <[email protected]>
Co-authored-by: Jeancarlo Barrios <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@julienrbrt @JeancarloBarrios
fix: revert double close fix (cosmos#15255)
4e64b58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle approved these changes

Assignees
No one assigned
Labels
C:Store
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@julienrbrt @mmsqe @tac0turtle