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

refactor(solidity): rename _channelIBC to _memo for addBridgeToken #948

Merged
merged 1 commit into from
Jan 23, 2025

Conversation

zakir-code
Copy link
Contributor

@zakir-code zakir-code commented Jan 23, 2025

Summary by CodeRabbit

  • Breaking Changes

    • Updated addBridgeToken function across multiple contracts and interfaces
    • Replaced _channelIBC parameter with _memo
    • Modified AddBridgeTokenEvent to use _memo instead of _channelIBC
  • Deprecation

    • Removed FxOriginatedTokenEvent in FxBridgeLogicETH contract

Copy link

coderabbitai bot commented Jan 23, 2025

Walkthrough

The pull request introduces a systematic change across multiple Solidity and Go files, replacing the _channelIBC parameter with a _memo parameter in the addBridgeToken function and related events. This modification affects the FxBridgeLogic, FxBridgeLogicETH, and associated interfaces and contract bindings. The changes maintain the overall function structure while updating the parameter name and type, suggesting a refinement in how bridge token information is tracked and logged.

Changes

File Change Summary
contract/ifx_bridge_logic.sol.go Updated method signatures and event structures, replacing _channelIBC with _memo
solidity/contracts/bridge/FxBridgeBase.sol Modified AddBridgeTokenEvent to use _memo instead of _channelIBC
solidity/contracts/bridge/FxBridgeLogic.sol Changed addBridgeToken function parameter from _channelIBC to _memo
solidity/contracts/bridge/FxBridgeLogicETH.sol Removed FxOriginatedTokenEvent, updated addBridgeToken parameter
solidity/contracts/interfaces/IFxBridgeLogic.sol Updated addBridgeToken interface to use _memo

Possibly related PRs

Suggested reviewers

  • fx0x55

Poem

🐰 Bridging tokens with a memo's grace,
Where channels once held their place,
A rabbit's leap of code so bright,
Transforming bridges with delight!
New parameters dance and sway 🌉

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

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. (Beta)
  • @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: 1

🧹 Nitpick comments (1)
solidity/contracts/bridge/FxBridgeLogicETH.sol (1)

107-107: LGTM! Function parameter and event argument renamed.

The parameter has been renamed from _channelIBC to _memo in both the function signature and event emission while maintaining the same type (bytes32).

Consider adding a comment to document this parameter rename, similar to the existing comment for state_fxOriginatedToken:

+    /**
+     * @dev Parameter renamed from _channelIBC to _memo after fxcore upgrade v3
+     */
     function addBridgeToken(
         address _tokenAddr,
         bytes32 _memo,
         bool _isOriginated
     ) public onlyOwner returns (bool) {

Also applies to: 124-124

📜 Review details

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

📥 Commits

Reviewing files that changed from the base of the PR and between a90006f and 4fd9b80.

📒 Files selected for processing (5)
  • contract/ifx_bridge_logic.sol.go (5 hunks)
  • solidity/contracts/bridge/FxBridgeBase.sol (1 hunks)
  • solidity/contracts/bridge/FxBridgeLogic.sol (2 hunks)
  • solidity/contracts/bridge/FxBridgeLogicETH.sol (2 hunks)
  • solidity/contracts/interfaces/IFxBridgeLogic.sol (1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (2)
  • GitHub Check: Mergify Merge Protections
  • GitHub Check: Summary
🔇 Additional comments (6)
solidity/contracts/interfaces/IFxBridgeLogic.sol (1)

42-42: LGTM! Function parameter renamed.

The function parameter has been renamed from _channelIBC to _memo while maintaining the same type (bytes32).

solidity/contracts/bridge/FxBridgeLogic.sol (1)

96-96: LGTM! Function parameter and event argument renamed.

The parameter has been renamed from _channelIBC to _memo in both the function signature and event emission while maintaining the same type (bytes32).

Also applies to: 113-113

contract/ifx_bridge_logic.sol.go (4)

72-72: LGTM: ABI string updated correctly.

The ABI string has been properly updated to reflect the parameter rename from _channelIBC to _memo while maintaining the same type (bytes32).


771-787: LGTM: Function signatures updated consistently.

The AddBridgeToken function signatures have been updated consistently across all implementations (Transactor, Session, and TransactorSession) to use the new parameter name _memo while maintaining the same type and behavior.


Line range hint 1053-1118: LGTM: Event definitions updated consistently.

The AddBridgeTokenEvent related code has been updated consistently:

  • Event struct field renamed from ChannelIBC to Memo
  • Event signatures updated in all related functions
  • Type maintained as [32]byte

Line range hint 1-1: Verify consistency with Solidity interface.

Since this is an auto-generated binding file, let's verify that the changes match the Solidity interface modifications.

Run this script to check the parameter naming in the Solidity files:

✅ Verification successful

Parameter naming is correctly implemented for chain-specific interfaces

The parameter naming is intentionally different between chain implementations:

  • ETH chain interface uses _memo
  • BSC chain interface uses _channelIBC
  • Go bindings correctly reflect the interface definition
🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify parameter rename consistency between Solidity and Go files

# Check Solidity files for the new parameter name
echo "Checking Solidity files for _memo parameter..."
rg --type solidity "function addBridgeToken.*_memo.*bytes32" -A 2

# Check for any remaining instances of old parameter name
echo -e "\nChecking for any remaining instances of old parameter name..."
rg --type solidity "function addBridgeToken.*_channelIBC.*bytes32" -A 2

Length of output: 449


Script:

#!/bin/bash
# Find Solidity files and search for function signatures
echo "Searching Solidity files..."
fd -e sol . | while read -r file; do
  echo "=== $file ==="
  grep -A 2 "function addBridgeToken" "$file" || true
done

echo -e "\nChecking Go bindings..."
fd -e go . | while read -r file; do
  echo "=== $file ==="
  grep -A 2 "AddBridgeToken" "$file" || true
done

Length of output: 112149

solidity/contracts/bridge/FxBridgeBase.sol Show resolved Hide resolved
@nulnut nulnut merged commit e72fe47 into main Jan 23, 2025
10 checks passed
@nulnut nulnut deleted the zakir/release-solidity branch January 23, 2025 05:58
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