refactor: crosschain bridge call (PundiAI#512)

zakir-code · May 10, 2024 · e49f1eb · e49f1eb
1 parent c0f4e53
commit e49f1eb
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 54 deletions.
diff --git a/contract/FIP20Upgradable.go b/contract/FIP20Upgradable.go
diff --git a/contract/ICrossChain.go b/contract/ICrossChain.go
diff --git a/contract/WFXUpgradable.go b/contract/WFXUpgradable.go
diff --git a/solidity/contracts/crosschain/CrossChainCall.sol b/solidity/contracts/crosschain/CrossChainCall.sol
@@ -137,23 +137,25 @@ library Encode {
 
     function bridgeCall(
         string memory _dstChainId,
-        uint256 _gasLimit,
         address _receiver,
+        address[] memory _tokens,
+        uint256[] memory _amounts,
         address _to,
-        bytes calldata _message,
+        bytes memory _data,
         uint256 _value,
-        bytes memory _asset
+        bytes memory _memo
     ) internal pure returns (bytes memory) {
         return
             abi.encodeWithSignature(
-                "bridgeCall(string,uint256,address,address,bytes,uint256,bytes)",
+                "bridgeCall(string,address,address[],uint256[],address,bytes,uint256,bytes)",
                 _dstChainId,
-                _gasLimit,
                 _receiver,
+                _tokens,
+                _amounts,
                 _to,
-                _message,
+                _data,
                 _value,
-                _asset
+                _memo
             );
     }
 }
@@ -240,24 +242,26 @@ library CrossChainCall {
 
     function bridgeCall(
         string memory _dstChainId,
-        uint256 _gasLimit,
         address _receiver,
+        address[] memory _tokens,
+        uint256[] memory _amounts,
         address _to,
-        bytes calldata _message,
+        bytes memory _data,
         uint256 _value,
-        bytes memory _asset
+        bytes memory _memo
     ) internal returns (bool) {
         (bool result, bytes memory data) = CROSS_CHAIN_ADDRESS.call{
             value: msg.value
         }(
             Encode.bridgeCall(
                 _dstChainId,
-                _gasLimit,
                 _receiver,
+                _tokens,
+                _amounts,
                 _to,
-                _message,
+                _data,
                 _value,
-                _asset
+                _memo
             )
         );
         Decode.ok(result, data, "bridge call failed");

diff --git a/solidity/contracts/crosschain/ICrossChain.sol b/solidity/contracts/crosschain/ICrossChain.sol
@@ -41,13 +41,13 @@ interface ICrossChain {
 
     function bridgeCall(
         string memory _dstChain,
-        uint256 _gasLimit,
         address _receiver,
-        address _to,
         address[] memory _tokens,
         uint256[] memory _amounts,
-        bytes calldata _message,
-        uint256 _value
+        address _to,
+        bytes memory _data,
+        uint256 _value,
+        bytes memory _memo
     ) external payable returns (bool _result);
 
     event CrossChain(
@@ -79,12 +79,13 @@ interface ICrossChain {
         address indexed _sender,
         address indexed _receiver,
         address indexed _to,
+        address _txOrigin,
+        uint256 _value,
         uint256 _eventNonce,
         string _dstChain,
-        uint256 _gasLimit,
-        uint256 _value,
-        bytes _message,
         address[] _tokens,
-        uint256[] _amounts
+        uint256[] _amounts,
+        bytes _data,
+        bytes _memo
     );
 }
diff --git a/solidity/contracts/test/CrossChainTest.sol b/solidity/contracts/test/CrossChainTest.sol
@@ -81,23 +81,25 @@ contract CrossChainTest {
     }
 
     function bridgeCall(
-        string memory _dstChainId,
-        uint256 _gasLimit,
+        string memory _dstChain,
         address _receiver,
+        address[] memory _tokens,
+        uint256[] memory _amounts,
         address _to,
-        bytes calldata _message,
+        bytes memory _data,
         uint256 _value,
-        bytes memory _asset
+        bytes memory _memo
     ) internal returns (bool) {
         return
             CrossChainCall.bridgeCall(
-                _dstChainId,
-                _gasLimit,
+                _dstChain,
                 _receiver,
+                _tokens,
+                _amounts,
                 _to,
-                _message,
+                _data,
                 _value,
-                _asset
+                _memo
             );
     }
 }
diff --git a/tests/contract/CrossChainTest.go b/tests/contract/CrossChainTest.go