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

add cli to get denom hash from trace path and base denom (backport #679) #982

Merged
merged 3 commits into from
Feb 23, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2022

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

On branch mergify/bp/release/v2.1.x/pr-679
Your branch is up to date with 'origin/release/v2.1.x'.

You are currently cherry-picking commit cb9bf5d.
  (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:   .gitignore
	modified:   docs/client/swagger-ui/swagger.yaml
	modified:   docs/ibc/proto-docs.md
	modified:   modules/apps/transfer/client/cli/cli.go
	modified:   modules/apps/transfer/client/cli/query.go
	modified:   modules/apps/transfer/keeper/grpc_query.go
	modified:   modules/apps/transfer/keeper/grpc_query_test.go
	modified:   modules/apps/transfer/types/query.pb.gw.go
	modified:   proto/ibc/applications/transfer/v1/query.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/apps/transfer/types/query.pb.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

* get denom hash from denom trace

* revert .gitignore

* final revert

* ignore history files

* Update modules/apps/transfer/client/cli/query.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* Update modules/apps/transfer/keeper/grpc_query.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* Update modules/apps/transfer/keeper/keeper.go

Co-authored-by: Carlos Rodriguez <[email protected]>

* Update modules/apps/transfer/keeper/grpc_query.go

Co-authored-by: colin axnér <[email protected]>

* code review feedback integration

* moved new feature  to unreleased section

* fix duplicate block in success test case

* fix CHANGELOG format

* fix invalid trace path argument error handling

* refactor positive test case code

Co-authored-by: Carlos Rodriguez <[email protected]>
Co-authored-by: colin axnér <[email protected]>
(cherry picked from commit cb9bf5d)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/transfer/types/query.pb.go
@crodriguezvega crodriguezvega merged commit 545ccd1 into release/v2.1.x Feb 23, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.1.x/pr-679 branch February 23, 2022 21:21
CosmosCar pushed a commit to caelus-labs/ibc-go that referenced this pull request Nov 6, 2023
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