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(baseapp): sort res.Validators before comparing in InitChain #22757

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

damiannolan
Copy link
Member

@damiannolan damiannolan commented Dec 4, 2024

Description

Sort the validators returned from the app in InitChain before comparing with those in InitChainRequest.

Caught in genesis export test here: https://github.com/cosmos/ibc-go/actions/runs/12123056947/job/33797947420?pr=7587

Nodes fail to restart after genesis export and restart.

ERR failure when running app err="error during handshake: error on replay: genesisValidators[0] != req.Validators[0]

Noticed that on v0.50 both validator sets are sorted, so think this was accidentally removed at some point in v0.52 dev.
https://github.com/cosmos/cosmos-sdk/blob/v0.50.10/baseapp/abci.go#L118-L119


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, you can find examples of the prefixes below:
  • 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.

Please see Pull Request Reviewer section in the contributing guide for more information on how to review a pull request.

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

Summary by CodeRabbit

  • Bug Fixes
    • Improved the validation process for genesis validators during initialization to ensure consistent comparison regardless of order.
    • Enhanced error handling for mismatched validator lengths and individual validator discrepancies.

@damiannolan damiannolan added the backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release label Dec 4, 2024
Copy link
Contributor

coderabbitai bot commented Dec 4, 2024

📝 Walkthrough

Walkthrough

The changes in this pull request involve a modification to the InitChain method of the BaseApp class located in baseapp/abci.go. The primary change is the addition of a sorting step for the res.Validators slice to ensure both request and response validators are sorted before comparison. This adjustment aims to maintain consistency in validating the equality of genesis validators, preventing mismatches due to differing orderings. The error handling logic remains unchanged, and no other methods are affected.

Changes

File Change Summary
baseapp/abci.go Modified InitChain method to add sorting for res.Validators for consistent validation of genesis validators. Error handling logic remains unchanged.

Possibly related PRs

  • fix(runtime/v2): return genesis val updates #22729: The changes in this PR involve modifications to the initGenesis method, which is closely related to the InitChain method in the main PR, as both deal with the initialization of validators during the genesis phase.

Suggested labels

C:server/v2, C:server/v2 appmanager

Suggested reviewers

  • kocubinski
  • facundomedica
  • auricom
  • hieuvubk
  • tac0turtle
  • sontrinh16

📜 Recent review details

Configuration used: .coderabbit.yml
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between eb3bf8b and 8c76c40.

📒 Files selected for processing (1)
  • baseapp/abci.go (1 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
baseapp/abci.go (1)

Pattern **/*.go: Review the Golang code for conformity with the Uber Golang style guide, highlighting any deviations.

🔇 Additional comments (1)
baseapp/abci.go (1)

124-124: LGTM: Restoring validator sorting ensures consistent genesis export.

The addition of sort.Sort(abcitypes.ValidatorUpdates(res.Validators)) is correct and necessary. This change restores the sorting behavior that was present in v0.50 but inadvertently removed in v0.52. By sorting both request and response validators before comparison, we ensure consistent ordering and prevent false mismatches during genesis export and node restart.

Let's verify the validator sorting implementation:

✅ Verification successful

Let me gather more context about the validator comparison logic:


Based on the comprehensive analysis of the codebase, I can now generate the final response:

Sorting validators in InitChain is correct and necessary for deterministic validation

The sorting of both req.Validators and res.Validators in InitChain is essential for deterministic validation during genesis export. The implementation is consistent with the codebase's validator handling patterns:

  • The sorting ensures consistent ordering before comparison, which is critical for deterministic validation during genesis export and node restart
  • The code follows the same pattern used in other validator update operations throughout the codebase
  • The change restores important functionality that was present in v0.50 and needed to be brought back
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if validator sorting is consistently implemented across the codebase
# Look for other instances where ValidatorUpdates are compared to ensure consistent sorting

# Search for validator comparison patterns
ast-grep --pattern 'proto.Equal($v1, $v2)' 

# Search for validator sorting patterns
rg 'sort.*ValidatorUpdates'

Length of output: 218


Script:

#!/bin/bash
# Search for the InitChain method implementation and surrounding context
ast-grep --pattern 'func (app $_) InitChain($_) $_' -A 20

# Look for validator update related code
rg -A 5 "ValidatorUpdates?" 

Length of output: 66678


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>, please review it.
    • 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 gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @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.
    • @coderabbitai help me debug CodeRabbit configuration file.

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 using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

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

github-actions bot commented Dec 4, 2024

@damiannolan your pull request is missing a changelog!

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

I had to look twice, they look identical 😅, that's probably how it got removed :D

@julienrbrt julienrbrt enabled auto-merge December 4, 2024 14:58
@julienrbrt julienrbrt added this pull request to the merge queue Dec 4, 2024
Merged via the queue into main with commit 92ddbf7 Dec 4, 2024
79 of 82 checks passed
@julienrbrt julienrbrt deleted the damian/fix-init-chain-validators-mismatch branch December 4, 2024 15:23
mergify bot pushed a commit that referenced this pull request Dec 4, 2024
julienrbrt pushed a commit that referenced this pull request Dec 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/v0.52.x PR scheduled for inclusion in the v0.52's next stable release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants