Skip to content

fix: BootstrapState use custom genesis doc provider#2791

Merged
melekes merged 1 commit intocometbft:mainfrom
yihuang:main
Apr 12, 2024
Merged

fix: BootstrapState use custom genesis doc provider#2791
melekes merged 1 commit intocometbft:mainfrom
yihuang:main

Conversation

@yihuang
Copy link
Contributor

@yihuang yihuang commented Apr 12, 2024

The cosmos-sdk 0.50 genesis doc marshalling not being compatible with the cometbft default one (see cosmos/cosmos-sdk#18477), so we need to support custom genesis doc provider in this public API as well, it's called by the bootstrap-state command in cosmos-sdk.

Please backport to 0.38, the SDK 0.50 bootstrap-state command is already broken.


PR checklist

  • Tests written/updated
  • Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments
  • Title follows the Conventional Commits spec

The cosmos-sdk 0.50 genesis doc marshalling not being compatible with the
cometbft default one (see cosmos/cosmos-sdk#18477),
so we need to support custom genesis doc provider in this public API as well,
it's called by the `bootstrap-state` command in cosmos-sdk.
Copy link
Collaborator

@melekes melekes left a comment

Choose a reason for hiding this comment

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

Thanks @yihuang ❤️

@melekes
Copy link
Collaborator

melekes commented Apr 12, 2024

Please backport to 0.38

Unfortunately, we can't do that because this PR changes the public Go API.

@yihuang
Copy link
Contributor Author

yihuang commented Apr 12, 2024

Please backport to 0.38

Unfortunately, we can't do that because this PR changes the public Go API.

I can introduce a new API BootstrapStateWithGenProvider when backport.

yihuang added a commit to yihuang/cometbft that referenced this pull request Apr 12, 2024
…ft#2791)

The cosmos-sdk 0.50 genesis doc marshalling not being compatible with the
cometbft default one (see cosmos/cosmos-sdk#18477),
so we need to support custom genesis doc provider in this public API as well,
it's called by the `bootstrap-state` command in cosmos-sdk.
@yihuang
Copy link
Contributor Author

yihuang commented Apr 12, 2024

Please backport to 0.38

Unfortunately, we can't do that because this PR changes the public Go API.

I can introduce a new API BootstrapStateWithGenProvider when backport.

here it is: #2793, WDYT?

@melekes
Copy link
Collaborator

melekes commented Apr 12, 2024

Please backport to 0.38

Unfortunately, we can't do that because this PR changes the public Go API.

I can introduce a new API BootstrapStateWithGenProvider when backport.

here it is: #2793, WDYT?

Awesome, thanks 👍

@melekes melekes added this pull request to the merge queue Apr 12, 2024
Merged via the queue into cometbft:main with commit 7279fe8 Apr 12, 2024
@julienrbrt
Copy link
Contributor

julienrbrt commented Apr 12, 2024

Can it get backported to v0.38? I see the v1 backport label only.
Nvm, saw the other PR.

mergify bot pushed a commit that referenced this pull request Apr 12, 2024
The cosmos-sdk 0.50 genesis doc marshalling not being compatible with
the cometbft default one (see
cosmos/cosmos-sdk#18477), so we need to
support custom genesis doc provider in this public API as well, it's
called by the `bootstrap-state` command in cosmos-sdk.

Please backport to 0.38, the SDK 0.50 `bootstrap-state` command is
already broken.

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

(cherry picked from commit 7279fe8)
andynog added a commit that referenced this pull request Apr 12, 2024
…2796)

The cosmos-sdk 0.50 genesis doc marshalling not being compatible with
the cometbft default one (see
cosmos/cosmos-sdk#18477), so we need to
support custom genesis doc provider in this public API as well, it's
called by the `bootstrap-state` command in cosmos-sdk.

Please backport to 0.38, the SDK 0.50 `bootstrap-state` command is
already broken.



---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec
<hr>This is an automatic backport of pull request #2791 done by
[Mergify](https://mergify.com).

Co-authored-by: yihuang <yi.codeplayer@gmail.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
Co-authored-by: Andy Nogueira <me@andynogueira.dev>
andynog pushed a commit that referenced this pull request Apr 12, 2024
…#2793)

The cosmos-sdk 0.50 genesis doc marshalling not being compatible with
the cometbft default one (see
cosmos/cosmos-sdk#18477), so we need to
support custom genesis doc provider in this public API as well, it's
called by the `bootstrap-state` command in cosmos-sdk.

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

#### PR checklist

- [ ] Tests written/updated
- [ ] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
- [ ] Title follows the [Conventional
Commits](https://www.conventionalcommits.org/en/v1.0.0/) spec

Co-authored-by: Anton Kaliaev <anton.kalyaev@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.

3 participants