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!: refactor with account number fix on shorthand account #132

Merged
merged 1 commit into from
Dec 12, 2024

Conversation

beer-1
Copy link
Collaborator

@beer-1 beer-1 commented Dec 12, 2024

Description

Refactor to reduce redundant code and keep account number at shorthand account creation.


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

    • Enhanced logic for managing account numbers during the conversion of Cosmos addresses to EVM addresses, particularly for shorthand accounts.
    • Introduced a new method for validating arguments when creating and calling contracts, improving parameter validation.
  • Bug Fixes

    • Improved error handling for account number verification and contract deployment processes.
  • Tests

    • Added a new test case to verify account number consistency for long Cosmos addresses.
  • Refactor

    • Streamlined validation and authorization logic within contract creation methods for better clarity and maintainability.

@beer-1 beer-1 self-assigned this Dec 12, 2024
@beer-1 beer-1 requested a review from a team as a code owner December 12, 2024 08:48
Copy link

coderabbitai bot commented Dec 12, 2024

Walkthrough

The pull request introduces modifications to the keeper package in the EVM module, enhancing the convertToEVMAddress method to better manage account numbers for shorthand accounts. A new test function is added to verify the handling of long Cosmos addresses with empty accounts. Additionally, significant changes are made to the msgServerImpl struct, introducing a new argument validation method and a publisher authorization check, which streamlines the contract creation and calling processes.

Changes

File Change Summary
x/evm/keeper/address.go Modified convertToEVMAddress to handle account numbers for shorthand accounts, introducing logic to check for existing accounts and retrieve or assign account numbers.
x/evm/keeper/address_test.go Added Test_AllowLongCosmosAddress_ConvertEmptyAccount to test the creation of empty accounts and verify account numbers for long Cosmos addresses.
x/evm/keeper/msg_server.go Introduced validateArguments for consolidated argument validation in Create, Create2, and Call methods, and added assertAllowedPublishers for authorization checks.

Possibly related PRs

  • fix: audit #80: The changes in the main PR regarding account number handling in the convertToEVMAddress method may relate to the overall context of EVM interactions, which is also touched upon in the error handling improvements in the context.go file of PR fix: audit #80, although there is no direct code overlap.

Poem

In the land where addresses roam,
We tweak and tune to make them home.
With accounts in line, and tests that sing,
EVM's magic, oh what joy it brings!
So hop along, dear friends of code,
For every change, a brighter road! 🐇✨


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 generate docstrings to generate docstrings for this PR. (Experiment)
  • @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

codecov bot commented Dec 12, 2024

Codecov Report

Attention: Patch coverage is 60.00000% with 18 lines in your changes missing coverage. Please review.

Project coverage is 57.04%. Comparing base (55ab7cf) to head (d9d48d8).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
x/evm/keeper/msg_server.go 60.52% 10 Missing and 5 partials ⚠️
x/evm/keeper/address.go 57.14% 2 Missing and 1 partial ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #132      +/-   ##
==========================================
+ Coverage   56.93%   57.04%   +0.11%     
==========================================
  Files         110      110              
  Lines       10063    10045      -18     
==========================================
+ Hits         5729     5730       +1     
+ Misses       3508     3493      -15     
+ Partials      826      822       -4     
Files with missing lines Coverage Δ
x/evm/keeper/address.go 66.66% <57.14%> (-4.77%) ⬇️
x/evm/keeper/msg_server.go 58.38% <60.52%> (+6.34%) ⬆️

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/msg_server.go (2)

236-257: Enhance error handling and input validation in validateArguments

The validateArguments method effectively consolidates validation, but consider the following improvements:

  • Consistent Error Messages: Ensure all error messages provide clear context to aid debugging.
  • Input Data Length Check: For non-creation transactions, validate that dataBz is not excessively large to prevent potential performance issues.

259-283: Optimize publisher authorization lookup

Currently, the authorization check iterates over params.AllowedPublishers. To improve performance:

  • Use a Map for Efficient Lookups: Convert AllowedPublishers to a map to achieve constant-time lookups, which is beneficial if the list grows.

    allowedPublishers := make(map[string]struct{}, len(params.AllowedPublishers))
    for _, publisher := range params.AllowedPublishers {
        allowedPublishers[publisher] = struct{}{}
    }
    if _, allowed := allowedPublishers[sender]; !allowed {
        return sdkerrors.ErrUnauthorized.Wrapf("`%s` is not allowed to deploy a contract", sender)
    }
x/evm/keeper/address_test.go (1)

77-111: Strengthen assertions in Test_AllowLongCosmosAddress_ConvertEmptyAccount

The new test effectively verifies the account number consistency. To enhance the test:

  • Assert Account Creation: After minting to evmAddr2, add an assertion to confirm the account exists.

    account := input.AccountKeeper.GetAccount(ctx, addr2)
    require.NotNil(t, account)
  • Check Account Number Consistency: Ensure the account number remains the same after all operations to verify that account numbers are managed correctly.

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 05f54b7 and d9d48d8.

📒 Files selected for processing (3)
  • x/evm/keeper/address.go (2 hunks)
  • x/evm/keeper/address_test.go (1 hunks)
  • x/evm/keeper/msg_server.go (5 hunks)
🔇 Additional comments (8)
x/evm/keeper/msg_server.go (5)

45-49: Consolidate argument validation for improved maintainability

The use of ms.validateArguments centralizes the argument validation logic, reducing code duplication across message handlers. This enhances maintainability and ensures consistent validation.


51-54: Standardize publisher authorization checks

By introducing ms.assertAllowedPublishers, the code now consistently enforces publisher authorization. This improves code clarity and security by keeping the authorization logic in one place.


83-87: Reuse validation logic in Create2 method

Using ms.validateArguments in the Create2 method promotes code reuse and ensures that argument validation is consistent with the Create method.


89-92: Apply consistent authorization in Create2 method

Applying ms.assertAllowedPublishers in Create2 ensures that only authorized publishers can deploy contracts using this method as well.


126-130: Leverage centralized validation in Call method

Integrating ms.validateArguments into the Call method maintains consistency across all message handlers and simplifies validation.

x/evm/keeper/address.go (3)

Line range hint 21-41: Verify thread safety when handling account numbers

The addition of accountNumber management improves account handling for shorthand accounts. Ensure that when retrieving and assigning accountNumber, the operations are thread-safe to prevent race conditions in concurrent environments.


45-49: Avoid unnecessary account number increments

The check if accountNumber == 0 before calling NextAccountNumber prevents overwriting existing account numbers, ensuring that only new accounts receive a new account number.


57-58: Assign account number before setting the account

Assigning shorthandAccount.AccountNumber = accountNumber prior to SetAccount ensures that the account number is correctly associated with the account upon creation.

Copy link
Contributor

@djm07073 djm07073 left a comment

Choose a reason for hiding this comment

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

LGTM

@beer-1 beer-1 merged commit e4c92d4 into main Dec 12, 2024
10 checks passed
@beer-1 beer-1 deleted the feat/refactor branch December 12, 2024 09:28
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.

2 participants