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

feat: adding interchain account address query to controller submodule (backport #2193) #2292

Merged
merged 2 commits into from
Sep 14, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 14, 2022

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

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

You are currently cherry-picking commit e569045.
  (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:   docs/client/swagger-ui/swagger.yaml
	modified:   docs/ibc/proto-docs.md
	modified:   modules/apps/27-interchain-accounts/controller/client/cli/cli.go
	modified:   modules/apps/27-interchain-accounts/controller/client/cli/query.go
	modified:   modules/apps/27-interchain-accounts/controller/types/query.pb.gw.go
	modified:   proto/ibc/applications/interchain_accounts/controller/v1/query.proto

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go
	both modified:   modules/apps/27-interchain-accounts/controller/keeper/grpc_query_test.go
	both modified:   modules/apps/27-interchain-accounts/controller/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

…#2193)

* adding interchain account address query to ica controller

* adding basic cli query

* satisfy linter, aligning recvr var naming

* Apply suggestions from code review

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* reordering cli args

* regenerate protobufs and swagger docs post review suggestions

* adding changelog

* Update modules/apps/27-interchain-accounts/controller/client/cli/query.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit e569045)

# Conflicts:
#	CHANGELOG.md
#	modules/apps/27-interchain-accounts/controller/keeper/grpc_query.go
#	modules/apps/27-interchain-accounts/controller/keeper/grpc_query_test.go
#	modules/apps/27-interchain-accounts/controller/types/query.pb.go
@colin-axner colin-axner merged commit 0a3c1f2 into release/v4.1.x Sep 14, 2022
@colin-axner colin-axner deleted the mergify/bp/release/v4.1.x/pr-2193 branch September 14, 2022 16:06
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 27, 2023
… (backport cosmos#2193) (cosmos#2292)

* feat: adding interchain account address query to controller submodule (cosmos#2193)

* adding interchain account address query to ica controller

* adding basic cli query

* satisfy linter, aligning recvr var naming

* Apply suggestions from code review

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* reordering cli args

* regenerate protobufs and swagger docs post review suggestions

* adding changelog

* Update modules/apps/27-interchain-accounts/controller/client/cli/query.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit e569045)

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
… (backport cosmos#2193) (cosmos#2292)

* feat: adding interchain account address query to controller submodule (cosmos#2193)

* adding interchain account address query to ica controller

* adding basic cli query

* satisfy linter, aligning recvr var naming

* Apply suggestions from code review

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* reordering cli args

* regenerate protobufs and swagger docs post review suggestions

* adding changelog

* Update modules/apps/27-interchain-accounts/controller/client/cli/query.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit e569045)

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
ulbqb pushed a commit to ulbqb/ibc-go that referenced this pull request Jul 31, 2023
… (backport cosmos#2193) (cosmos#2292)

* feat: adding interchain account address query to controller submodule (cosmos#2193)

* adding interchain account address query to ica controller

* adding basic cli query

* satisfy linter, aligning recvr var naming

* Apply suggestions from code review

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>

* reordering cli args

* regenerate protobufs and swagger docs post review suggestions

* adding changelog

* Update modules/apps/27-interchain-accounts/controller/client/cli/query.go

Co-authored-by: Carlos Rodriguez <carlos@interchain.io>
(cherry picked from commit e569045)

* resolving conflicts

Co-authored-by: Damian Nolan <damiannolan@gmail.com>
@ulbqb ulbqb mentioned this pull request Jul 31, 2023
9 tasks
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