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

)
PundiAI · Jan 23, 2025 · e72fe47 · e72fe47
1 parent a90006f
commit e72fe47
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 29 deletions.
diff --git a/contract/ifx_bridge_logic.sol.go b/contract/ifx_bridge_logic.sol.go
diff --git a/solidity/contracts/bridge/FxBridgeBase.sol b/solidity/contracts/bridge/FxBridgeBase.sol
@@ -65,7 +65,7 @@ interface FxBridgeBase {
         string _symbol,
         uint8 _decimals,
         uint256 _eventNonce,
-        bytes32 _channelIBC
+        bytes32 _memo
     );
     event OracleSetUpdatedEvent(
         uint256 indexed _newOracleSetNonce,

diff --git a/solidity/contracts/bridge/FxBridgeLogic.sol b/solidity/contracts/bridge/FxBridgeLogic.sol
@@ -93,7 +93,7 @@ contract FxBridgeLogic is
 
     function addBridgeToken(
         address _tokenAddr,
-        bytes32 _channelIBC,
+        bytes32 _memo,
         bool _isOriginated
     ) public onlyOwner returns (bool) {
         require(_tokenAddr != address(0), "Invalid token address.");
@@ -110,7 +110,7 @@ contract FxBridgeLogic is
             IERC20MetadataUpgradeable(_tokenAddr).symbol(),
             IERC20MetadataUpgradeable(_tokenAddr).decimals(),
             state_lastEventNonce,
-            _channelIBC
+            _memo
         );
         return true;
     }

diff --git a/solidity/contracts/bridge/FxBridgeLogicETH.sol b/solidity/contracts/bridge/FxBridgeLogicETH.sol
@@ -53,15 +53,6 @@ contract FxBridgeLogicETH is
     mapping(uint256 => bool) public state_lastBridgeCallNonces;
     /* solhint-enable var-name-mixedcase */
 
-    /* FxOriginatedTokenEvent Deprecated: after fxcore upgrade v3 */
-    event FxOriginatedTokenEvent(
-        address indexed _tokenContract,
-        string _name,
-        string _symbol,
-        uint8 _decimals,
-        uint256 _eventNonce
-    );
-
     /* =============== INIT =============== */
 
     function init(
@@ -113,7 +104,7 @@ contract FxBridgeLogicETH is
 
     function addBridgeToken(
         address _tokenAddr,
-        bytes32 _channelIBC,
+        bytes32 _memo,
         bool _isOriginated
     ) public onlyOwner returns (bool) {
         require(_tokenAddr != address(0), "Invalid token address.");
@@ -130,7 +121,7 @@ contract FxBridgeLogicETH is
             IERC20MetadataUpgradeable(_tokenAddr).symbol(),
             IERC20MetadataUpgradeable(_tokenAddr).decimals(),
             state_lastEventNonce,
-            _channelIBC
+            _memo
         );
         return true;
     }

diff --git a/solidity/contracts/interfaces/IFxBridgeLogic.sol b/solidity/contracts/interfaces/IFxBridgeLogic.sol
@@ -39,7 +39,7 @@ interface IFxBridgeLogic is IBridgeCall, FxBridgeBase {
 
     function addBridgeToken(
         address _tokenAddr,
-        bytes32 _channelIBC,
+        bytes32 _memo,
         bool _isOriginated
     ) external returns (bool);