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

fix(x/staking): Refactor GetLastValidators #19226

Merged
merged 4 commits into from
Jan 25, 2024
Merged

Conversation

alexanderbez
Copy link
Contributor

Description

Changelog

Refactor GetLastValidators to not error in the sanity check when the cursor moves beyond MaxValidators. We remove the error and return nil so we can handle cases where the validator set is decreased.


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
  • confirmed ! in the type prefix if API or client breaking change
  • targeted the correct branch (see PR Targeting)
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • added a changelog entry to CHANGELOG.md
  • updated the relevant documentation or specification, including comments for documenting Go code
  • confirmed all CI checks have passed

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 all author checklist items have been addressed
  • reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

@alexanderbez alexanderbez marked this pull request as ready for review January 24, 2024 19:39
@alexanderbez alexanderbez requested a review from a team as a code owner January 24, 2024 19:39
Copy link
Contributor

coderabbitai bot commented Jan 24, 2024

Walkthrough

The updates to the cosmos-sdk primarily address enhancements and bug fixes in the staking and server modules. A significant change involves the dynamic handling of the maxValidators parameter within the staking module, ensuring proper initialization and error handling. Additionally, the governance module has seen improvements. To validate these updates, new tests have been implemented for the GetLastValidators function, confirming its correct behavior when the maximum number of validators is modified.

Changes

File(s) Summary
CHANGELOG.md Bug fixes and improvements in staking, baseapp, client, and server modules, focusing on governance and server modules.
x/staking/keeper/validator.go Modified GetLastValidators to handle changes in the maxValidators parameter, initializing the validators slice after retrieving the actual maxValidators value from storage. Error handling and comments related to the maxValidators parameter have been adjusted.
x/staking/keeper/validator_test.go Added new tests for GetLastValidators to verify functionality of retrieving the last validators before and after reducing the maximum validators.

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:

Note: Auto-reply has been disabled for this repository by the repository owner. The CodeRabbit bot will not respond to your comments unless it is explicitly tagged.

  • 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 tests 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 from git and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @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.
  • The JSON schema for the configuration file is available here.
  • 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/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

@@ -542,14 +543,14 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i

### Bug Fixes

* [#19106](https://github.com/cosmos/cosmos-sdk/pull/19106) Allow empty public keys when setting signatures. Public keys aren't needed for every transaction.
* [#19106](https://github.com/cosmos/cosmos-sdk/pull/19106) Allow empty public keys when setting signatures. Public keys aren't needed for every transaction.
Copy link
Contributor

Choose a reason for hiding this comment

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

The entry for the server module fix mentions a consensus failure but does not specify the nature of the fix. It would be beneficial to include a brief description of how the issue was resolved.

Consider adding a short description of the fix applied to address the consensus failure issue.

Comment on lines 383 to 401
if err != nil {
return nil, err
}
validators = make([]types.Validator, maxValidators)

i := 0
validators = make([]types.Validator, maxValidators)

err = k.LastValidatorPower.Walk(ctx, nil, func(key []byte, _ gogotypes.Int64Value) (bool, error) {
// sanity check
// Note, we do NOT error here as the MaxValidators param may change via on-chain
// governance. In cases where the param is increased, this case should never
// be hit. In cases where the param is decreased, we will simply not return
// the remainder of the validator set, as the ApplyAndReturnValidatorSetUpdates
// call should ensure the validators past the cliff will be moved to the
// unbonding set.
if i >= int(maxValidators) {
return true, fmt.Errorf("more validators than maxValidators found")
return true, nil
}

validator, err := k.GetValidator(ctx, key)
Copy link
Contributor

Choose a reason for hiding this comment

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

📝 NOTE
This review was outside the diff hunks and was mapped to the diff hunk with the greatest overlap. Original lines [388-408]

The refactored GetLastValidators function now initializes the validators slice after retrieving the maxValidators value from storage, which is a logical change to handle dynamic validator set sizes. However, the function does not handle the case where maxValidators could be zero, which would lead to an unnecessary allocation of a slice. It would be more efficient to check if maxValidators is zero and return an empty slice immediately.

- validators = make([]types.Validator, maxValidators)
+ if maxValidators == 0 {
+     return []types.Validator{}, nil
+ }
+ validators = make([]types.Validator, maxValidators)

@julienrbrt julienrbrt added backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release labels Jan 24, 2024
@alexanderbez alexanderbez added this pull request to the merge queue Jan 25, 2024
Merged via the queue into main with commit a69836b Jan 25, 2024
58 of 59 checks passed
@alexanderbez alexanderbez deleted the bez/fix-val-set-retrieval branch January 25, 2024 00:38
mergify bot pushed a commit that referenced this pull request Jan 25, 2024
(cherry picked from commit a69836b)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/validator.go
mergify bot pushed a commit that referenced this pull request Jan 25, 2024
(cherry picked from commit a69836b)

# Conflicts:
#	CHANGELOG.md
#	x/staking/keeper/validator.go
if i >= int(maxValidators) {
return true, fmt.Errorf("more validators than maxValidators found")
return true, nil
Copy link
Member

Choose a reason for hiding this comment

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

i dont think this is correct, we should add a test case to make sure the validators have entered the unbond queue. We could leave the state machine in a weird limbo if they are still in the bonded queue

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yup -- on it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release C:x/staking
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants