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(server): bootstrap-state command can't parse latest genesis format (backport #20020) #20045

Merged
merged 8 commits into from Apr 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2024

Description

ref: #18477


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
  • confirmed ! in 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
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • 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 all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

Summary by CodeRabbit

  • New Features

    • Enhanced the bootstrap-state command to support both new and legacy genesis formats, improving compatibility across different system versions.
  • Chores

    • Updated dependencies in the project to ensure better performance and security.

This is an automatic backport of pull request #20020 done by [Mergify](https://mergify.com).

#20020)

(cherry picked from commit 84c64b2)

# Conflicts:
#	client/v2/go.mod
#	client/v2/go.sum
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	simapp/gomod2nix.toml
#	tests/go.mod
#	tests/go.sum
#	tests/starship/tests/go.mod
#	tests/starship/tests/go.sum
#	x/accounts/defaults/lockup/go.mod
#	x/accounts/defaults/lockup/go.sum
#	x/accounts/go.mod
#	x/accounts/go.sum
#	x/auth/go.mod
#	x/auth/go.sum
#	x/authz/go.mod
#	x/authz/go.sum
#	x/bank/go.mod
#	x/bank/go.sum
#	x/circuit/go.mod
#	x/circuit/go.sum
#	x/distribution/go.mod
#	x/distribution/go.sum
#	x/epochs/go.mod
#	x/epochs/go.sum
#	x/evidence/go.sum
#	x/feegrant/go.mod
#	x/feegrant/go.sum
#	x/gov/go.mod
#	x/gov/go.sum
#	x/group/go.mod
#	x/group/go.sum
#	x/mint/go.mod
#	x/mint/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
#	x/params/go.mod
#	x/params/go.sum
#	x/protocolpool/go.mod
#	x/protocolpool/go.sum
#	x/slashing/go.mod
#	x/slashing/go.sum
#	x/staking/go.mod
#	x/staking/go.sum
#	x/upgrade/go.mod
#	x/upgrade/go.sum
@mergify mergify bot requested a review from a team as a code owner April 15, 2024 09:54
@mergify mergify bot added the conflicts label Apr 15, 2024
Copy link
Contributor Author

mergify bot commented Apr 15, 2024

Cherry-pick of 84c64b2 has failed:

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

You are currently cherry-picking commit 84c64b204.
  (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:   CHANGELOG.md
	modified:   go.mod
	modified:   server/cmt_cmds.go
	modified:   x/evidence/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   client/v2/go.mod
	both modified:   client/v2/go.sum
	both modified:   go.sum
	both modified:   simapp/go.mod
	both modified:   simapp/go.sum
	deleted by us:   simapp/gomod2nix.toml
	both modified:   tests/go.mod
	both modified:   tests/go.sum
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/go.sum
	deleted by us:   x/accounts/defaults/lockup/go.mod
	deleted by us:   x/accounts/defaults/lockup/go.sum
	deleted by us:   x/accounts/go.mod
	deleted by us:   x/accounts/go.sum
	deleted by us:   x/auth/go.mod
	deleted by us:   x/auth/go.sum
	deleted by us:   x/authz/go.mod
	deleted by us:   x/authz/go.sum
	deleted by us:   x/bank/go.mod
	deleted by us:   x/bank/go.sum
	both modified:   x/circuit/go.mod
	both modified:   x/circuit/go.sum
	deleted by us:   x/distribution/go.mod
	deleted by us:   x/distribution/go.sum
	deleted by us:   x/epochs/go.mod
	deleted by us:   x/epochs/go.sum
	both modified:   x/evidence/go.sum
	both modified:   x/feegrant/go.mod
	both modified:   x/feegrant/go.sum
	deleted by us:   x/gov/go.mod
	deleted by us:   x/gov/go.sum
	deleted by us:   x/group/go.mod
	deleted by us:   x/group/go.sum
	deleted by us:   x/mint/go.mod
	deleted by us:   x/mint/go.sum
	both modified:   x/nft/go.mod
	both modified:   x/nft/go.sum
	deleted by us:   x/params/go.mod
	deleted by us:   x/params/go.sum
	deleted by us:   x/protocolpool/go.mod
	deleted by us:   x/protocolpool/go.sum
	deleted by us:   x/slashing/go.mod
	deleted by us:   x/slashing/go.sum
	deleted by us:   x/staking/go.mod
	deleted by us:   x/staking/go.sum
	both modified:   x/upgrade/go.mod
	both modified:   x/upgrade/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

blocked on comet release

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

This is now unblocked

CHANGELOG.md Outdated
@@ -63,6 +63,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (baseapp) [#19970](https://github.com/cosmos/cosmos-sdk/pull/19970) Fix default config values to use no-op mempool as default.
* (crypto) [#20027](https://github.com/cosmos/cosmos-sdk/pull/20027) secp256r1 keys now implement gogoproto's customtype interface.
* (x/bank) [#20028](https://github.com/cosmos/cosmos-sdk/pull/20028) Align query with multi denoms for send-enabled.
* (cli) [#20020](https://github.com/cosmos/cosmos-sdk/pull/20020) Make bootstrap-state command support both new and legacy genesis format.
Copy link
Member

Choose a reason for hiding this comment

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

Should go under unreleased

@julienrbrt julienrbrt removed the S:blocked Status: Blocked label Apr 29, 2024
@tac0turtle tac0turtle enabled auto-merge (squash) April 29, 2024 13:59
@tac0turtle tac0turtle merged commit a65c2f7 into release/v0.50.x Apr 29, 2024
43 of 44 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-20020 branch April 29, 2024 14:07
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.

None yet

4 participants