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

feat: add grants by grantee authz query (backport #10944) #11523

Merged
merged 7 commits into from
Apr 1, 2022
Merged

feat: add grants by grantee authz query (backport #10944) #11523

merged 7 commits into from
Apr 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 1, 2022

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

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

You are currently cherry-picking commit fa8099da9.
  (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/authz/v1beta1/authz.proto
	modified:   x/authz/client/testutil/cli_test.go
	modified:   x/authz/keeper/keys.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   api/cosmos/app/module/v1alpha1/module.pulsar.go
	deleted by us:   api/cosmos/app/v1alpha1/config.pulsar.go
	deleted by us:   api/cosmos/app/v1alpha1/module.pulsar.go
	deleted by us:   api/cosmos/app/v1alpha1/query.pulsar.go
	deleted by us:   api/cosmos/authz/v1beta1/authz.pulsar.go
	deleted by us:   api/cosmos/authz/v1beta1/genesis.pulsar.go
	deleted by us:   api/cosmos/authz/v1beta1/query.pulsar.go
	deleted by us:   api/cosmos/authz/v1beta1/query_grpc.pb.go
	deleted by us:   api/cosmos/base/query/v1beta1/pagination.pulsar.go
	deleted by us:   api/cosmos/tx/signing/v1beta1/signing.pulsar.go
	both modified:   proto/cosmos/authz/v1beta1/genesis.proto
	both modified:   proto/cosmos/authz/v1beta1/query.proto
	both modified:   x/authz/authz.pb.go
	both modified:   x/authz/client/cli/query.go
	both modified:   x/authz/client/rest/grpc_query_test.go
	both modified:   x/authz/genesis.pb.go
	both modified:   x/authz/keeper/grpc_query.go
	both modified:   x/authz/keeper/grpc_query_test.go
	both modified:   x/authz/query.pb.go
	both modified:   x/authz/query.pb.gw.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

@cmwaters
feat: add grants by grantee authz query (#10944)
55ea1ed 
(cherry picked from commit fa8099d)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/app/module/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/config.pulsar.go
#	api/cosmos/app/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/query.pulsar.go
#	api/cosmos/authz/v1beta1/authz.pulsar.go
#	api/cosmos/authz/v1beta1/genesis.pulsar.go
#	api/cosmos/authz/v1beta1/query.pulsar.go
#	api/cosmos/authz/v1beta1/query_grpc.pb.go
#	api/cosmos/base/query/v1beta1/pagination.pulsar.go
#	api/cosmos/tx/signing/v1beta1/signing.pulsar.go
#	proto/cosmos/authz/v1beta1/genesis.proto
#	proto/cosmos/authz/v1beta1/query.proto
#	x/authz/authz.pb.go
#	x/authz/client/cli/query.go
#	x/authz/client/rest/grpc_query_test.go
#	x/authz/genesis.pb.go
#	x/authz/keeper/grpc_query.go
#	x/authz/keeper/grpc_query_test.go
#	x/authz/query.pb.go
#	x/authz/query.pb.gw.go
@mergify mergify bot added the conflicts label Apr 1, 2022
@mergify mergify bot mentioned this pull request Apr 1, 2022
Merged
19 tasks
@tac0turtle tac0turtle mentioned this pull request Apr 1, 2022
Closed
amaury1093
amaury1093 reviewed Apr 1, 2022
View reviewed changes
proto/cosmos/authz/v1beta1/authz.proto Show resolved Hide resolved
proto/cosmos/authz/v1beta1/query.proto Outdated Show resolved Hide resolved
proto/cosmos/authz/v1beta1/query.proto Outdated Show resolved Hide resolved
x/authz/client/rest/grpc_query_test.go Outdated
@@ -232,6 +234,113 @@ func (s *IntegrationTestSuite) TestQueryGrantsGRPC() {
}
}

<<<<<<< HEAD:x/authz/client/rest/grpc_query_test.go
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflict

tac0turtle
tac0turtle reviewed Apr 1, 2022
View reviewed changes
go.mod Outdated
@@ -13,6 +13,7 @@ require (
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/iavl v0.17.3
github.com/cosmos/ledger-cosmos-go v0.11.1
github.com/ethereum/go-ethereum v1.9.25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah wait, I need to remove this

@tac0turtle tac0turtle merged commit f43228d into release/v0.45.x Apr 1, 2022
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.45.x/pr-10944 branch April 1, 2022 16:11
JimLarson pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Jul 7, 2022
@mergify @cmwaters
@tac0turtle @amaury1093 @JimLarson
feat: add grants by grantee authz query (backport cosmos#10944) (cosm…
f0b35b9 
…os#11523)

* feat: add grants by grantee authz query (cosmos#10944)

(cherry picked from commit fa8099d)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/app/module/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/config.pulsar.go
#	api/cosmos/app/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/query.pulsar.go
#	api/cosmos/authz/v1beta1/authz.pulsar.go
#	api/cosmos/authz/v1beta1/genesis.pulsar.go
#	api/cosmos/authz/v1beta1/query.pulsar.go
#	api/cosmos/authz/v1beta1/query_grpc.pb.go
#	api/cosmos/base/query/v1beta1/pagination.pulsar.go
#	api/cosmos/tx/signing/v1beta1/signing.pulsar.go
#	proto/cosmos/authz/v1beta1/genesis.proto
#	proto/cosmos/authz/v1beta1/query.proto
#	x/authz/authz.pb.go
#	x/authz/client/cli/query.go
#	x/authz/client/rest/grpc_query_test.go
#	x/authz/genesis.pb.go
#	x/authz/keeper/grpc_query.go
#	x/authz/keeper/grpc_query_test.go
#	x/authz/query.pb.go
#	x/authz/query.pb.gw.go

* fix conflicts

* remove doc

* remove scalar

* Apply suggestions from code review

Co-authored-by: Amaury <[email protected]>

* fix conflicts

* remove go-eth dep

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Amaury <[email protected]>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
@mergify @cmwaters
@tac0turtle @amaury1093 @randy75828
feat: add grants by grantee authz query (backport cosmos#10944) (cosm…
3c6075e 
…os#11523)

* feat: add grants by grantee authz query (cosmos#10944)

(cherry picked from commit fa8099d)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/app/module/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/config.pulsar.go
#	api/cosmos/app/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/query.pulsar.go
#	api/cosmos/authz/v1beta1/authz.pulsar.go
#	api/cosmos/authz/v1beta1/genesis.pulsar.go
#	api/cosmos/authz/v1beta1/query.pulsar.go
#	api/cosmos/authz/v1beta1/query_grpc.pb.go
#	api/cosmos/base/query/v1beta1/pagination.pulsar.go
#	api/cosmos/tx/signing/v1beta1/signing.pulsar.go
#	proto/cosmos/authz/v1beta1/genesis.proto
#	proto/cosmos/authz/v1beta1/query.proto
#	x/authz/authz.pb.go
#	x/authz/client/cli/query.go
#	x/authz/client/rest/grpc_query_test.go
#	x/authz/genesis.pb.go
#	x/authz/keeper/grpc_query.go
#	x/authz/keeper/grpc_query_test.go
#	x/authz/query.pb.go
#	x/authz/query.pb.gw.go

* fix conflicts

* remove doc

* remove scalar

* Apply suggestions from code review

Co-authored-by: Amaury <[email protected]>

* fix conflicts

* remove go-eth dep

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Amaury <[email protected]>
randy75828 pushed a commit to Switcheo/cosmos-sdk that referenced this pull request Aug 10, 2022
@mergify @cmwaters
@tac0turtle @amaury1093 @randy75828
feat: add grants by grantee authz query (backport cosmos#10944) (cosm…
6595d13 
…os#11523)

* feat: add grants by grantee authz query (cosmos#10944)

(cherry picked from commit fa8099d)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/app/module/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/config.pulsar.go
#	api/cosmos/app/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/query.pulsar.go
#	api/cosmos/authz/v1beta1/authz.pulsar.go
#	api/cosmos/authz/v1beta1/genesis.pulsar.go
#	api/cosmos/authz/v1beta1/query.pulsar.go
#	api/cosmos/authz/v1beta1/query_grpc.pb.go
#	api/cosmos/base/query/v1beta1/pagination.pulsar.go
#	api/cosmos/tx/signing/v1beta1/signing.pulsar.go
#	proto/cosmos/authz/v1beta1/genesis.proto
#	proto/cosmos/authz/v1beta1/query.proto
#	x/authz/authz.pb.go
#	x/authz/client/cli/query.go
#	x/authz/client/rest/grpc_query_test.go
#	x/authz/genesis.pb.go
#	x/authz/keeper/grpc_query.go
#	x/authz/keeper/grpc_query_test.go
#	x/authz/query.pb.go
#	x/authz/query.pb.gw.go

* fix conflicts

* remove doc

* remove scalar

* Apply suggestions from code review

Co-authored-by: Amaury <[email protected]>

* fix conflicts

* remove go-eth dep

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Amaury <[email protected]>
Eengineer1 pushed a commit to cheqd/cosmos-sdk that referenced this pull request Aug 26, 2022
@mergify @cmwaters
@tac0turtle @amaury1093 @Eengineer1
feat: add grants by grantee authz query (backport cosmos#10944) (cosm…
dc7b1b2 
…os#11523)

* feat: add grants by grantee authz query (cosmos#10944)

(cherry picked from commit fa8099d)

* fix conflicts

* remove doc

* remove scalar

* Apply suggestions from code review

Co-authored-by: Amaury <[email protected]>

* fix conflicts

* remove go-eth dep

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Amaury <[email protected]>
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
@mergify @cmwaters
@tac0turtle @amaury1093 @JeancarloBarrios
feat: add grants by grantee authz query (backport cosmos#10944) (cosm…
115a235 
…os#11523)

* feat: add grants by grantee authz query (cosmos#10944)

(cherry picked from commit fa8099d)

# Conflicts:
#	CHANGELOG.md
#	api/cosmos/app/module/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/config.pulsar.go
#	api/cosmos/app/v1alpha1/module.pulsar.go
#	api/cosmos/app/v1alpha1/query.pulsar.go
#	api/cosmos/authz/v1beta1/authz.pulsar.go
#	api/cosmos/authz/v1beta1/genesis.pulsar.go
#	api/cosmos/authz/v1beta1/query.pulsar.go
#	api/cosmos/authz/v1beta1/query_grpc.pb.go
#	api/cosmos/base/query/v1beta1/pagination.pulsar.go
#	api/cosmos/tx/signing/v1beta1/signing.pulsar.go
#	proto/cosmos/authz/v1beta1/genesis.proto
#	proto/cosmos/authz/v1beta1/query.proto
#	x/authz/authz.pb.go
#	x/authz/client/cli/query.go
#	x/authz/client/rest/grpc_query_test.go
#	x/authz/genesis.pb.go
#	x/authz/keeper/grpc_query.go
#	x/authz/keeper/grpc_query_test.go
#	x/authz/query.pb.go
#	x/authz/query.pb.gw.go

* fix conflicts

* remove doc

* remove scalar

* Apply suggestions from code review

Co-authored-by: Amaury <[email protected]>

* fix conflicts

* remove go-eth dep

Co-authored-by: Callum Waters <[email protected]>
Co-authored-by: marbar3778 <[email protected]>
Co-authored-by: Amaury <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle left review comments

@amaury1093 amaury1093 amaury1093 approved these changes

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

@alexanderbez alexanderbez Awaiting requested review from alexanderbez

@cmwaters cmwaters Awaiting requested review from cmwaters

Assignees

@amaury1093 amaury1093

@likhita-809 likhita-809

Labels
C:CLI C:x/authz conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@amaury1093 @tac0turtle @likhita-809 @cmwaters