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: handle upgrade empty params #101

Merged
merged 1 commit into from
Nov 6, 2024
Merged

Conversation

beer-1
Copy link
Member

@beer-1 beer-1 commented Nov 6, 2024

Description

If the chain upgraded via upgrade proposal, GasRefundRatio maybe empty. so we need to return zero dec instead of returning nil dec.


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
  • provided a link to the relevant issue or specification
  • reviewed "Files changed" and left comments if necessary
  • included the necessary unit and integration tests
  • 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

Summary by CodeRabbit

  • New Features
    • Updated upgrade version to 0.6.3, improving the upgrade process.
  • Bug Fixes
    • Enhanced error handling for contract address collisions during upgrades.
    • Improved handling of nil values in the Gas Refund Ratio method to prevent errors.

@beer-1 beer-1 self-assigned this Nov 6, 2024
@beer-1 beer-1 requested a review from a team as a code owner November 6, 2024 03:31
Copy link

coderabbitai bot commented Nov 6, 2024

Walkthrough

The pull request introduces updates to two files: app/upgrade.go and x/evm/keeper/params.go. In app/upgrade.go, the upgradeName constant is incremented from "0.6.0" to "0.6.3", and the error handling in the RegisterUpgradeHandlers method is enhanced to ignore contract address collision errors. In x/evm/keeper/params.go, the GasRefundRatio method is modified to handle cases where the gas refund ratio is nil, ensuring a valid return value and improving error handling.

Changes

File Change Summary
app/upgrade.go - Updated upgradeName from "0.6.0" to "0.6.3".
- Modified error handling in RegisterUpgradeHandlers to ignore contract address collision errors.
x/evm/keeper/params.go - Updated GasRefundRatio method to return math.LegacyZeroDec() and nil error if params.GasRefundRatio is nil.

Possibly related PRs

  • fix: make gas refunds error free and panic safe #96: The changes in this PR involve modifications to the GasRefundDecorator and related methods in app/posthandler/gasrefund.go, which may relate to the error handling logic in the RegisterUpgradeHandlers method of the main PR, as both involve enhancing robustness in handling specific operational scenarios.

Suggested reviewers

  • Vritra4

Poem

🐰 In the meadow where upgrades bloom,
A version change dispels the gloom.
Errors once tangled, now set free,
With each new check, we leap with glee!
Hop along, let progress play,
For brighter paths are here to stay! 🌼


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.

CodeRabbit Configuration 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

@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: 0

🧹 Outside diff range and nitpick comments (3)
x/evm/keeper/params.go (1)

22-23: LGTM! Consider adding a comment for context.

The nil check is a good addition that aligns with the PR objective of handling empty GasRefundRatio during upgrades.

Consider adding a comment to explain why this nil check is necessary:

 	if err != nil {
 		return math.LegacyZeroDec(), err
+	// Handle empty GasRefundRatio parameter during blockchain upgrades
 	} else if params.GasRefundRatio.IsNil() {
 		return math.LegacyZeroDec(), nil
 	}
app/upgrade.go (2)

Line range hint 21-24: Improve error handling robustness

The current error handling approach has several potential issues:

  1. String-based error comparison is fragile and could break if the error message changes
  2. It might accidentally mask other errors containing the same string

Consider this more robust approach:

-			if err := app.EVMKeeper.DeployERC20Wrapper(ctx); err != nil &&
-				// ignore contract address collision error (contract already deployed)
-				!strings.Contains(err.Error(), vm.ErrContractAddressCollision.Error()) {
+			if err := app.EVMKeeper.DeployERC20Wrapper(ctx); err != nil {
+				// Explicitly handle the case where the contract is already deployed
+				if !errors.Is(err, vm.ErrContractAddressCollision) {
+					return nil, fmt.Errorf("failed to deploy ERC20 wrapper: %w", err)
+				}
+				// Log that we're ignoring a known condition
+				logger.Info("ERC20 wrapper contract already deployed, skipping deployment")

Also, please add a comment explaining why it's safe to ignore the contract address collision error.


Line range hint 18-27: Consider additional upgrade handler safety measures

The upgrade handler could benefit from additional safety measures:

  1. Validate upgrade preconditions before proceeding
  2. Handle potential state migrations
  3. Consider rollback mechanisms for partial failures

Would you like me to provide an example implementation with these safety measures?

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 09848b7 and 1d12e7b.

📒 Files selected for processing (2)
  • app/upgrade.go (1 hunks)
  • x/evm/keeper/params.go (1 hunks)
🔇 Additional comments (1)
app/upgrade.go (1)

13-13: Verify version bump from 0.6.0 to 0.6.3

The version increment spans 3 minor versions. Please ensure this significant version change is properly documented.

@beer-1 beer-1 merged commit 240904b into main Nov 6, 2024
7 checks passed
@beer-1 beer-1 deleted the fix/handle-upgrade-empty-params branch November 6, 2024 03:39
Copy link

codecov bot commented Nov 6, 2024

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 28.33%. Comparing base (09848b7) to head (1d12e7b).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
x/evm/keeper/params.go 0.00% 2 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #101      +/-   ##
==========================================
- Coverage   28.34%   28.33%   -0.01%     
==========================================
  Files         126      126              
  Lines       14022    14024       +2     
==========================================
  Hits         3974     3974              
- Misses       9487     9489       +2     
  Partials      561      561              
Files with missing lines Coverage Δ
app/upgrade.go 27.27% <ø> (ø)
x/evm/keeper/params.go 30.00% <0.00%> (-3.34%) ⬇️

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant