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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Jan 12, 2022
Merged

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

merged 3 commits into from
Jan 12, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 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.0.x/pr-679
Your branch is up to date with 'origin/release/v2.0.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

@nir1218
add cli to get denom hash from trace path and base denom (#679)
04c4afe 
* 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
@mergify mergify bot added the conflicts label Jan 11, 2022
@crodriguezvega crodriguezvega merged commit 6f6af9b into release/v2.0.x Jan 12, 2022
@crodriguezvega crodriguezvega deleted the mergify/bp/release/v2.0.x/pr-679 branch January 12, 2022 14:47
colin-axner added a commit that referenced this pull request Feb 2, 2022
@colin-axner
Revert "add cli to get denom hash from trace path and base denom (bac…
acf1cee 
…kport #679) (#710)"

This reverts commit 6f6af9b.
colin-axner added a commit that referenced this pull request Feb 3, 2022
@colin-axner
Revert "add cli to get denom hash from trace path and base denom (bac…
12b96bc 
…kport #679) (#710)" (#827)

This reverts commit 6f6af9b.
CosmosCar pushed a commit to caelus-labs/ibc-go that referenced this pull request Nov 6, 2023
@dependabot
build(deps): bump github.com/libp2p/go-libp2p-pubsub from 0.8.2 to 0.…
a1643e1 
…8.3 (cosmos#710)

Bumps
[github.com/libp2p/go-libp2p-pubsub](https://github.com/libp2p/go-libp2p-pubsub)
from 0.8.2 to 0.8.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/libp2p/go-libp2p-pubsub/releases">github.com/libp2p/go-libp2p-pubsub's
releases</a>.</em></p>
<blockquote>
<h2>v0.8.3</h2>
<h2>What's Changed</h2>
<ul>
<li>feat: expire messages from the cache based on last seen time by <a
href="https://github.com/smrz2001"><code>@​smrz2001</code></a> in <a
href="https://github-redirect.dependabot.com/libp2p/go-libp2p-pubsub/pull/513">libp2p/go-libp2p-pubsub#513</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/smrz2001"><code>@​smrz2001</code></a>
made their first contribution in <a
href="https://github-redirect.dependabot.com/libp2p/go-libp2p-pubsub/pull/513">libp2p/go-libp2p-pubsub#513</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/libp2p/go-libp2p-pubsub/compare/v0.8.2...v0.8.3">https://github.com/libp2p/go-libp2p-pubsub/compare/v0.8.2...v0.8.3</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/libp2p/go-libp2p-pubsub/commit/973fef56e1e6fd6afc568ea3c1c2f654f7754d49"><code>973fef5</code></a>
feat: expire messages from the cache based on last seen time (<a
href="https://github-redirect.dependabot.com/libp2p/go-libp2p-pubsub/issues/513">#513</a>)</li>
<li>See full diff in <a
href="https://github.com/libp2p/go-libp2p-pubsub/compare/v0.8.2...v0.8.3">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/libp2p/go-libp2p-pubsub&package-manager=go_modules&previous-version=0.8.2&new-version=0.8.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crodriguezvega crodriguezvega crodriguezvega approved these changes

@colin-axner colin-axner colin-axner approved these changes

@AdityaSripal AdityaSripal Awaiting requested review from AdityaSripal AdityaSripal is a code owner

@charleenfei charleenfei Awaiting requested review from charleenfei

@damiannolan damiannolan Awaiting requested review from damiannolan damiannolan is a code owner

@fedekunze fedekunze Awaiting requested review from fedekunze

@seantking seantking Awaiting requested review from seantking

Assignees
No one assigned
Labels
conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@crodriguezvega @colin-axner @nir1218