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 QueryAllPairsValConAddrByConsumerChainID (backport #1503) #1551

Merged
merged 1 commit into from
Jan 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 5, 2024

This is an automatic backport of pull request #1503 done by Mergify.
Cherry-pick of 56399f6 has failed:

On branch mergify/bp/release/v3.3.x/pr-1503
Your branch is up to date with 'origin/release/v3.3.x'.

You are currently cherry-picking commit 56399f6.
  (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:
	new file:   .changelog/unreleased/improvements/provider/1503-query-key-assignment.md
	modified:   docs/docs/features/key-assignment.md
	modified:   proto/interchain_security/ccv/provider/v1/query.proto
	modified:   tests/e2e/tracehandler_testdata/changeover.json
	modified:   tests/e2e/tracehandler_testdata/consumer-double-sign.json
	modified:   tests/e2e/tracehandler_testdata/consumer-misbehaviour.json
	modified:   tests/e2e/tracehandler_testdata/democracy.json
	modified:   tests/e2e/tracehandler_testdata/democracyRewardsSteps.json
	modified:   tests/e2e/tracehandler_testdata/happyPath.json
	modified:   tests/e2e/tracehandler_testdata/multipleConsumers.json
	modified:   tests/e2e/tracehandler_testdata/shorthappy.json
	modified:   x/ccv/provider/client/cli/query.go
	modified:   x/ccv/provider/keeper/grpc_query.go
	new file:   x/ccv/provider/keeper/grpc_query_test.go
	modified:   x/ccv/provider/types/query.pb.go
	modified:   x/ccv/provider/types/query.pb.gw.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tests/e2e/tracehandler_testdata/slashThrottle.json

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

* add QueryAllPairsValConAddrByConsumerChainID

* Lint

* add pubkey in PairValConAddrProviderAndConsumer struct

* add test TestQueryAllPairsValConAddrByConsumerChainID

* add doc

* Update docs/docs/features/key-assignment.md

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

* add changelog

* update with Marius Poke's suggestions

* update logic get data

---------

Co-authored-by: Du Nguyen <[email protected]>
Co-authored-by: MSalopek <[email protected]>
(cherry picked from commit 56399f6)

# Conflicts:
#	tests/e2e/tracehandler_testdata/slashThrottle.json
@mergify mergify bot requested a review from a team as a code owner January 5, 2024 17:36
@mergify mergify bot added the conflicts label Jan 5, 2024
@mpoke mpoke merged commit b4daea5 into release/v3.3.x Jan 5, 2024
11 of 13 checks passed
@mpoke mpoke deleted the mergify/bp/release/v3.3.x/pr-1503 branch January 5, 2024 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants