Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 14, 2022

This is an automatic backport of pull request #1451 done by Mergify.
Cherry-pick of 3a235af has failed:

On branch mergify/bp/release/v1.5.x/pr-1451
Your branch is up to date with 'origin/release/v1.5.x'.

You are currently cherry-picking commit 3a235af.
  (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:
	new file:   docs/migrations/support-denoms-with-slashes.md
	modified:   modules/apps/transfer/types/trace.go
	modified:   modules/apps/transfer/types/trace_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

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

* fix to correctly parse denoms with slashes in the base denom

* some logic refinement

* review comments

* add changelog entry an other review comments

* review comment

* Add slash migration guide (#1518)

* add migration guide

* Update docs/migrations/support-slashed-denoms.md

Co-authored-by: Federico Kunze Küllmer <[email protected]>

* clarify upgrade name

* remove unnecessary store loader

* review comment, update migration code

Co-authored-by: Federico Kunze Küllmer <[email protected]>
Co-authored-by: Carlos Rodriguez <[email protected]>

* rename migration file

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: Aditya <[email protected]>
Co-authored-by: Federico Kunze Küllmer <[email protected]>
(cherry picked from commit 3a235af)

# Conflicts:
#	CHANGELOG.md
@crodriguezvega crodriguezvega merged commit 68e04d3 into release/v1.5.x Jun 14, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v1.5.x/pr-1451 branch June 14, 2022 11:47
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.

2 participants