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: cosmwasmpool state export (backport #6666) #6683

Merged
merged 2 commits into from
Oct 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 12, 2023

This is an automatic backport of pull request #6666 done by Mergify.
Cherry-pick of d4582d4 has failed:

On branch mergify/bp/v19.x/pr-6666
Your branch is up to date with 'origin/v19.x'.

You are currently cherry-picking commit d4582d49.
  (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/cosmwasmpool/model/store_model.go
	modified:   x/cosmwasmpool/pool_module.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/cosmwasmpool/genesis.go
	both modified:   x/cosmwasmpool/genesis_test.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

* use CosmWasmExtension

* add changelog

* just implement getId for deserialization

* separate method for serializable pools

* fix accident

* add test

(cherry picked from commit d4582d4)

# Conflicts:
#	CHANGELOG.md
#	x/cosmwasmpool/genesis.go
#	x/cosmwasmpool/genesis_test.go
@czarcas7ic czarcas7ic merged commit 73be89f into v19.x Oct 12, 2023
1 check passed
@czarcas7ic czarcas7ic deleted the mergify/bp/v19.x/pr-6666 branch October 12, 2023 17:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant