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 a query to retrieve validator set that was last sent to the consumer chain #1867

Merged
merged 4 commits into from
May 17, 2024

Conversation

insumity
Copy link
Contributor

@insumity insumity commented May 8, 2024

Description

Closes: #XXXX

This PR introduces a query to retrieve the validator set that was last sent to the consumer chain.
Note that this does not necessarily mean that the consumer chain is using this validator set because a VSCPacket could be delayed, etc.


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • Included the correct type prefix in the PR title
  • Added ! to the type prefix if the change is state-machine breaking
  • Confirmed this PR does not introduce changes requiring state migrations, OR migration code has been added to consumer and/or provider modules
  • Targeted the correct branch (see PR Targeting)
  • Provided a link to the relevant issue or specification
  • Followed the guidelines for building SDK modules
  • Included the necessary unit and integration tests
  • Added a changelog entry to CHANGELOG.md
  • Included comments for documenting Go code
  • Updated the relevant documentation or specification
  • Reviewed "Files changed" and left comments if necessary
  • Confirmed all CI checks have passed
  • If this PR is library API breaking, bump the go.mod version string of the repo, and follow through on a new major release

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! the type prefix if the change is state-machine breaking
  • confirmed this PR does not introduce changes requiring state migrations, OR confirmed migration code has been added to consumer and/or provider modules
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage

Summary by CodeRabbit

  • New Features

    • Introduced a new query to fetch the latest consumer-validator set for a consumer chain.
    • Added a new command to query consumer validators by consumer chain ID.
  • Documentation

    • Renamed section header for clarity and added detailed instructions on querying consumer validators.
    • Added a new section on retrieving all consumer validators with a warning note.

@github-actions github-actions bot added the C:x/provider Assigned automatically by the PR labeler label May 8, 2024
@insumity insumity force-pushed the insumity/new-query branch 2 times, most recently from 64991d4 to f7cd09b Compare May 8, 2024 11:18
@@ -103,3 +105,147 @@ func TestQueryOldestUnconfirmedVsc(t *testing.T) {
}
require.Equal(t, expectedResult, response.VscSendTimestamp)
}

func TestQueryConsumerChainOptedInValidators(t *testing.T) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Although not specific to this PR, I added some basic tests for some of the other queries.

string chain_id = 1;
}

message QueryConsumerChainConsumerValidator {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could potentially have used ConsumerValidator from here instead of creating a new message. However, ConsumerValidator has the provider_address as a bytes so it would not parse in a nice way when showing it as part of the response.

@insumity insumity marked this pull request as ready for review May 8, 2024 11:26
@insumity insumity requested a review from a team as a code owner May 8, 2024 11:26
Copy link
Contributor

coderabbitai bot commented May 8, 2024

Warning

Rate Limit Exceeded

@insumity has exceeded the limit for the number of commits or files that can be reviewed per hour. Please wait 16 minutes and 6 seconds before requesting another review.

How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.
Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.
Please see our FAQ for further information.

Commits Files that changed from the base of the PR and between edef130 and 258a807.

Walkthrough

The update introduces a new query, consumer-validators, to fetch the latest set of consumer validators for a specified consumer chain. This involves adding a new RPC method, message types, CLI command, and corresponding tests. Documentation has been updated to reflect these changes, including instructions on how to use the new query and a warning about the possible discrepancy between the returned validators and the current validator set.

Changes

Files / Paths Change Summary
.changelog/unreleased/features/provider/1867-add-query-for-latest-consumer-validator-set.md Added summary for the new consumer-validators query.
proto/interchain_security/ccv/provider/v1/query.proto Introduced QueryConsumerValidators RPC method and associated message types.
x/ccv/provider/client/cli/query.go Added CmdConsumerValidators() command to query consumer validators by chain ID.
x/ccv/provider/keeper/grpc_query.go Added QueryConsumerValidators function to retrieve consumer validators for a chain.
x/ccv/provider/keeper/grpc_query_test.go Added tests for various query scenarios related to consumer validators.
docs/docs/validators/partial-set-security-for-validators.md Updated section header and added instructions on retrieving consumer validators, including a warning.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@MSalopek MSalopek left a comment

Choose a reason for hiding this comment

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

LGTM, not concrete complaints just some nits.

@github-actions github-actions bot added the C:Docs Assigned automatically by the PR labeler label May 17, 2024
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 3

Out of diff range and nitpick comments (1)
docs/docs/validators/partial-set-security-for-validators.md (1)

163-167: Clarify the potential delay of the VSCPacket.

The warning about the potential delay of the VSCPacket is crucial for understanding the temporal discrepancies in validator sets. It might be helpful to provide an example or a more detailed explanation of how such delays can occur and their typical duration or impact.

Comment on lines 146 to 168
### How to retrieve all the opted-in validators on a consumer chain?
With the following query:
```bash
interchain-security-pd query provider consumer-opted-in-validators <consumer-chain-id>
```
we can see all the opted-in validators on `consumer-chain-id` that were manually or automatically opted in.

### How to retrieve all the consumer validators on a consumer chain?
With the following query:
```bash
interchain-security-pd query provider consumer-validators <consumer-chain-id>
```
we can see all the _consumer validators_ (i.e., validator set) of `consumer-chain-id`. The consumer validators are the
ones that are currently (or in the future, see warning) validate the consumer chain. A _consumer validator_ is an opted-in
validator but not vice versa. For example, an opted-in validator `V` might not be a consumer validator because `V` is
denylisted or because `V` is removed due to a validator-set cap.

:::warning
The returned consumer validators from this query do not necessarily correspond to the validator set that is
validating the consumer chain at this exact moment. This is because the `VSCPacket` sent to a consumer chain might be
delayed and hence this query might return the validator set that the consumer chain would have at some future
point in time.
:::
Copy link
Contributor

Choose a reason for hiding this comment

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

Clarify the distinction between "consumer validators" and "opted-in validators".

The new section introduces important concepts but could benefit from clearer definitions to avoid confusion. Consider adding a brief explanation or a diagram to visually distinguish between "consumer validators" and "opted-in validators". This will enhance understanding, especially for new users.

:::warning
The returned consumer validators from this query do not necessarily correspond to the validator set that is
validating the consumer chain at this exact moment. This is because the `VSCPacket` sent to a consumer chain might be
delayed and hence this query might return the validator set that the consumer chain would have at some future
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove redundancy in the phrase.

- at some future point in time.
+ in the future.

This simplification removes redundancy without losing any meaning, making the sentence clearer and more concise.


Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
delayed and hence this query might return the validator set that the consumer chain would have at some future
delayed and hence this query might return the validator set that the consumer chain would have in the future

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 2

Comment on lines +109 to +136
func TestQueryConsumerChainOptedInValidators(t *testing.T) {
chainID := "chainID"

pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
defer ctrl.Finish()

req := types.QueryConsumerChainOptedInValidatorsRequest{
ChainId: chainID,
}

// error returned from not yet proposed or not yet registered chain
_, err := pk.QueryConsumerChainOptedInValidators(ctx, &req)
require.Error(t, err)

pk.SetProposedConsumerChain(ctx, chainID, 1)

providerAddr1 := types.NewProviderConsAddress([]byte("providerAddr1"))
providerAddr2 := types.NewProviderConsAddress([]byte("providerAddr2"))
expectedResponse := types.QueryConsumerChainOptedInValidatorsResponse{
ValidatorsProviderAddresses: []string{providerAddr1.String(), providerAddr2.String()},
}

pk.SetOptedIn(ctx, chainID, providerAddr1)
pk.SetOptedIn(ctx, chainID, providerAddr2)
res, err := pk.QueryConsumerChainOptedInValidators(ctx, &req)
require.NoError(t, err)
require.Equal(t, &expectedResponse, res)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

The tests for QueryConsumerChainOptedInValidators are well-implemented. Consider adding a test case for a scenario where the chain is valid but has no opted-in validators, to ensure the function handles empty validator lists correctly.

Would you like me to help implement this additional test case?

Comment on lines +138 to +174
func TestQueryConsumerValidators(t *testing.T) {
chainID := "chainID"

pk, ctx, ctrl, _ := testkeeper.GetProviderKeeperAndCtx(t, testkeeper.NewInMemKeeperParams(t))
defer ctrl.Finish()

req := types.QueryConsumerValidatorsRequest{
ChainId: chainID,
}

// error returned from not-started chain
_, err := pk.QueryConsumerValidators(ctx, &req)
require.Error(t, err)

providerAddr1 := types.NewProviderConsAddress([]byte("providerAddr1"))
consumerKey1 := cryptotestutil.NewCryptoIdentityFromIntSeed(1).TMProtoCryptoPublicKey()
consumerValidator1 := types.ConsumerValidator{ProviderConsAddr: providerAddr1.ToSdkConsAddr(), Power: 1, ConsumerPublicKey: &consumerKey1}

providerAddr2 := types.NewProviderConsAddress([]byte("providerAddr2"))
consumerKey2 := cryptotestutil.NewCryptoIdentityFromIntSeed(2).TMProtoCryptoPublicKey()
consumerValidator2 := types.ConsumerValidator{ProviderConsAddr: providerAddr2.ToSdkConsAddr(), Power: 2, ConsumerPublicKey: &consumerKey2}

expectedResponse := types.QueryConsumerValidatorsResponse{
Validators: []*types.QueryConsumerValidatorsValidator{
{providerAddr1.String(), &consumerKey1, 1},
{providerAddr2.String(), &consumerKey2, 2},
},
}

// set up the client id so the chain looks like it "started"
pk.SetConsumerClientId(ctx, chainID, "clientID")
pk.SetConsumerValSet(ctx, chainID, []types.ConsumerValidator{consumerValidator1, consumerValidator2})

res, err := pk.QueryConsumerValidators(ctx, &req)
require.NoError(t, err)
require.Equal(t, &expectedResponse, res)
}
Copy link
Contributor

Choose a reason for hiding this comment

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

The tests for QueryConsumerValidators cover error scenarios and a valid request. It's good to see thorough testing of edge cases. Ensure that all possible error types returned by the keeper are tested to improve coverage.

If needed, I can assist in adding these additional error case tests.

@insumity insumity added this pull request to the merge queue May 17, 2024
Merged via the queue into main with commit e1b191a May 17, 2024
20 of 21 checks passed
@insumity insumity deleted the insumity/new-query branch May 17, 2024 08:48
mergify bot pushed a commit that referenced this pull request May 17, 2024
… consumer chain (#1867)

* init commit

* took into account comments

* add docs

* Update docs/docs/validators/partial-set-security-for-validators.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit e1b191a)
mergify bot pushed a commit that referenced this pull request May 17, 2024
… consumer chain (#1867)

* init commit

* took into account comments

* add docs

* Update docs/docs/validators/partial-set-security-for-validators.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit e1b191a)
insumity added a commit that referenced this pull request May 17, 2024
… consumer chain (backport #1867) (#1889)

feat: add a query to retrieve validator set that was last sent to the consumer chain (#1867)

* init commit

* took into account comments

* add docs

* Update docs/docs/validators/partial-set-security-for-validators.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit e1b191a)

Co-authored-by: insumity <karolos@informal.systems>
insumity added a commit that referenced this pull request May 17, 2024
… consumer chain (backport #1867) (#1890)

feat: add a query to retrieve validator set that was last sent to the consumer chain (#1867)

* init commit

* took into account comments

* add docs

* Update docs/docs/validators/partial-set-security-for-validators.md

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
(cherry picked from commit e1b191a)

Co-authored-by: insumity <karolos@informal.systems>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A:backport/v4.2.x A:backport/v4.2.x-lsm C:Docs Assigned automatically by the PR labeler C:x/provider Assigned automatically by the PR labeler
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants