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: x/bank/044 migrateDenomMetadata (backport #10239) #10257

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2021

This is an automatic backport of pull request #10239 done by Mergify.
Cherry-pick of 16a953c has failed:

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

You are currently cherry-picking commit 16a953cc9.
  (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/bank/types/key_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   x/bank/migrations/v044/keys.go
	deleted by us:   x/bank/migrations/v044/store.go
	deleted by us:   x/bank/migrations/v044/store_test.go
	both modified:   x/bank/types/key.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.io/

* fix: x/bank/044 migrateDenomMetadata

* adding changelog entry

* comment update

* fix tests

(cherry picked from commit 16a953c)

# Conflicts:
#	CHANGELOG.md
#	x/bank/migrations/v044/keys.go
#	x/bank/migrations/v044/store.go
#	x/bank/migrations/v044/store_test.go
#	x/bank/types/key.go
@amaury1093 amaury1093 added this to the v0.44.1 milestone Sep 29, 2021
Copy link
Contributor

@amaury1093 amaury1093 left a comment

Choose a reason for hiding this comment

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

some merge conflicts on this PR still

x/bank/types/key.go Show resolved Hide resolved
@@ -0,0 +1,16 @@
package v044
Copy link
Contributor

Choose a reason for hiding this comment

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

we should remove all x/bank/migrations files, they are already in x/bank/legacy

copy(key[len(DenomAddressPrefix):], denom)
return key
}
>>>>>>> 16a953cc9 (fix: x/bank/044 migrateDenomMetadata (#10239))
Copy link
Contributor

Choose a reason for hiding this comment

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

same here

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes, I know, was writing about it in the Discord yesterday night. Thanks!

@amaury1093
Copy link
Contributor

amaury1093 commented Sep 29, 2021

Actually, v0.44 doesn't have the denom key changes! They were introduced after we cut release/v0.43.x, so should go into v045: #10260.

Thanks @aleem1314 for pointing this out.

@amaury1093 amaury1093 closed this Sep 29, 2021
@amaury1093 amaury1093 deleted the mergify/bp/release/v0.44.x/pr-10239 branch September 29, 2021 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants