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(affiliates): Check address is valid in ReferredBy query [OTE-896] #2567

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

teddyding
Copy link
Contributor

@teddyding teddyding commented Nov 12, 2024

Changelist

ReferredBy query returns error if input address is not valid bech32 address. Prevents confusion when user/client typos the address

Test Plan

Test on localnet

% dydxprotocold query affiliates referred-by dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju4
affiliate_address: dydx1q54yvrslnu0xp4drpde6f4e0k2ap9efss5hpsd
% dydxprotocold query affiliates referred-by dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju
Error: rpc error: code = Unknown desc = address: dydx199tqg4wdlnu4qjlxchpd7seg454937hjrknju, error: decoding bech32 failed: invalid checksum (expected w8faqe got jrknju): Invalid address: unknown request

Author/Reviewer Checklist

  • If this PR has changes that result in a different app state given the same prior state and transaction list, manually add the state-breaking label.
  • If the PR has breaking postgres changes to the indexer add the indexer-postgres-breaking label.
  • If this PR isn't state-breaking but has changes that modify behavior in PrepareProposal or ProcessProposal, manually add the label proposal-breaking.
  • If this PR is one of many that implement a specific feature, manually label them all feature:[feature-name].
  • If you wish to for mergify-bot to automatically create a PR to backport your change to a release branch, manually add the label backport/[branch-name].
  • Manually add any of the following labels: refactor, chore, bug.

Summary by CodeRabbit

  • New Features

    • Enhanced error handling for invalid addresses in the referral process.
  • Bug Fixes

    • Added validation for bech32 address format to prevent processing of invalid addresses.
  • Tests

    • Introduced a new test case for handling invalid bech32 addresses in the referral method.
    • Improved existing tests to ensure comprehensive coverage of various scenarios.

Copy link
Contributor

coderabbitai bot commented Nov 12, 2024

Walkthrough

The changes in this pull request enhance the error handling in the ReferredBy method of the Keeper struct by adding a validation check for the req.Address parameter. If the address cannot be converted from bech32 format, an error is returned. Additionally, a new test case is introduced in the TestReferredBy function to validate the handling of an invalid address scenario, alongside improvements to the structure of existing test cases for comprehensive coverage.

Changes

File Change Summary
protocol/x/affiliates/keeper/grpc_query.go Added validation check for req.Address in ReferredBy method; returns error for invalid bech32 addresses.
protocol/x/affiliates/keeper/grpc_query_test.go Added new test case for handling invalid bech32 address in TestReferredBy; structured existing tests for better coverage.

Possibly related PRs

  • [OTE-694]implement queries for affiliates #2214: This PR implements queries for affiliates, including the ReferredBy method in the Keeper struct, which is directly related to the changes made in the main PR that enhances the error handling in the same method.
  • [OTE-762] Affiliates comlink affiliate info #2269: This PR enhances the affiliate information functionality, including modifications to the getSnapshot method that retrieves affiliate data, which is relevant to the changes in the ReferredBy method that also deals with affiliate addresses.

Suggested reviewers

  • jonfung-dydx
  • affanv14

Poem

🐇 In the meadow where rabbits play,
A new check was added today!
For addresses that go astray,
We’ll catch the errors without delay.
With tests that hop and bounce around,
Validity in every sound! 🌼


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.

@teddyding teddyding changed the title Check address is valid in x/affiliates ReferredBy query fix(affiliates): Check address is valid in ReferredBy query Nov 12, 2024
@teddyding
Copy link
Contributor Author

@Mergifyio backport release/protocol/v7.x

Copy link
Contributor

mergify bot commented Nov 12, 2024

backport release/protocol/v7.x

✅ Backports have been created

@teddyding teddyding changed the title fix(affiliates): Check address is valid in ReferredBy query fix(affiliates): Check address is valid in ReferredBy query [OTE-896] Nov 12, 2024
Copy link

linear bot commented Nov 12, 2024

@teddyding teddyding marked this pull request as ready for review November 13, 2024 15:59
@teddyding teddyding requested a review from a team as a code owner November 13, 2024 15:59
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: 0

🧹 Outside diff range and nitpick comments (2)
protocol/x/affiliates/keeper/grpc_query.go (1)

62-68: Consider extracting common address validation logic.

This address validation pattern appears in multiple methods (e.g., AffiliateInfo and ReferredBy). Consider extracting it into a helper method to reduce code duplication and maintain consistency.

Example implementation:

+ func (k Keeper) validateBech32Address(address string) error {
+     _, err := sdk.AccAddressFromBech32(address)
+     if err != nil {
+         return errorsmod.Wrapf(types.ErrInvalidAddress, "address: %s, error: %s",
+             address, err.Error())
+     }
+     return nil
+ }

Then use it in both methods:

- // Check req.Address is a valid bech32 address
- _, err := sdk.AccAddressFromBech32(req.GetAddress())
- if err != nil {
-     return nil, errorsmod.Wrapf(types.ErrInvalidAddress, "address: %s, error: %s",
-         req.GetAddress(), err.Error())
- }
+ if err := k.validateBech32Address(req.GetAddress()); err != nil {
+     return nil, err
+ }
protocol/x/affiliates/keeper/grpc_query_test.go (1)

193-200: LGTM! Consider adding more invalid address test cases.

The new test case correctly verifies that an invalid bech32 address returns ErrInvalidAddress. The implementation follows the established test pattern and aligns with the PR objective.

Consider adding more test cases to cover different invalid address scenarios:

  1. Empty string
  2. Valid string but not a bech32 address (e.g., "cosmos1...")
  3. Malformed bech32 string with valid prefix
  4. Address with incorrect length

Example addition:

 "Invalid bech32 address": {
     req: &types.ReferredByRequest{
         Address: "Foo",
     },
     setup:       func(ctx sdk.Context, k keeper.Keeper) {},
     expected:    nil,
     expectError: types.ErrInvalidAddress,
 },
+"Empty address": {
+    req: &types.ReferredByRequest{
+        Address: "",
+    },
+    setup:       func(ctx sdk.Context, k keeper.Keeper) {},
+    expected:    nil,
+    expectError: types.ErrInvalidAddress,
+},
+"Invalid bech32 format": {
+    req: &types.ReferredByRequest{
+        Address: "cosmos1invalid",
+    },
+    setup:       func(ctx sdk.Context, k keeper.Keeper) {},
+    expected:    nil,
+    expectError: types.ErrInvalidAddress,
+},
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

📥 Commits

Reviewing files that changed from the base of the PR and between 62fdf68 and 6bf1852.

📒 Files selected for processing (2)
  • protocol/x/affiliates/keeper/grpc_query.go (1 hunks)
  • protocol/x/affiliates/keeper/grpc_query_test.go (1 hunks)
🔇 Additional comments (2)
protocol/x/affiliates/keeper/grpc_query.go (1)

62-68: LGTM! Address validation implementation looks good.

The validation is implemented correctly and follows the same pattern as other methods in the keeper.

protocol/x/affiliates/keeper/grpc_query_test.go (1)

193-200: Implementation aligns with PR objectives

The new test case successfully validates the enhancement to the ReferredBy query by ensuring it returns an error for invalid bech32 addresses. This implementation directly addresses the PR's goal of preventing confusion from user input errors.

@teddyding teddyding merged commit 6a13081 into main Dec 16, 2024
22 checks passed
@teddyding teddyding deleted the td/referedby-invalid-address branch December 16, 2024 15:31
mergify bot pushed a commit that referenced this pull request Dec 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants