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: add support for spendable balances gRPC query (backport #11417) #11459

Merged
merged 6 commits into from
Mar 27, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 25, 2022

This is an automatic backport of pull request #11417 done by Mergify.
Cherry-pick of 9e1ec7b has failed:

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

You are currently cherry-picking commit 9e1ec7b61.
  (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:   proto/cosmos/bank/v1beta1/query.proto
	modified:   x/bank/keeper/grpc_query.go
	modified:   x/bank/types/querier.go
	modified:   x/bank/types/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   x/bank/keeper/grpc_query_test.go
	both modified:   x/bank/keeper/keeper_test.go
	both modified:   x/bank/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

* updates

* cl++

* tests++

* updates

* updates

(cherry picked from commit 9e1ec7b)

# Conflicts:
#	CHANGELOG.md
#	x/bank/keeper/grpc_query_test.go
#	x/bank/keeper/keeper_test.go
#	x/bank/types/query.pb.go
@alexanderbez alexanderbez requested a review from tac0turtle March 26, 2022 23:38
@alexanderbez alexanderbez merged commit 7997b26 into release/v0.45.x Mar 27, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.45.x/pr-11417 branch March 27, 2022 00:47
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants