refactor: improve structure of fx bridge logic contract

PundiAI · Dec 31, 2024 · b658aa5 · b658aa5
1 parent 67b3ec3
commit b658aa5
Show file tree

Hide file tree

Showing 28 changed files with 918 additions and 1,344 deletions.
diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml
@@ -62,11 +62,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Install abigen
+      - name: Install abigen # https://geth.ethereum.org/downloads
         run: |
-          wget -q https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.12.0-e501b3b0.tar.gz
-          tar -zxvf geth-alltools-linux-amd64-1.12.0-e501b3b0.tar.gz
-          sudo mv geth-alltools-linux-amd64-1.12.0-e501b3b0/abigen /usr/local/bin
+          wget -q https://gethstore.blob.core.windows.net/builds/geth-alltools-linux-amd64-1.14.12-293a300d.tar.gz
+          tar -zxvf geth-alltools-linux-amd64-1.14.12-293a300d.tar.gz
+          sudo mv geth-alltools-linux-amd64-1.14.12-293a300d/abigen /usr/local/bin
       - name: Run abigen
         run: make contract-abigen
       - name: Check diff

diff --git a/contract/compile.sh b/contract/compile.sh
@@ -10,8 +10,8 @@ for cmd in "${commands[@]}"; do
 done
 
 abigen_version=$(abigen --version | awk '{print $3}')
-if ! [[ "$abigen_version" =~ ^1.12.0-stable.* ]]; then
-  echo "expected abigen version 1.12.0, but got $abigen_version, please upgrade abigen first" && exit 1
+if ! [[ "$abigen_version" =~ ^1.14.12-stable.* ]]; then
+  echo "expected abigen version 1.14.12, but got $abigen_version, please upgrade abigen first" && exit 1
 fi
 
 project_dir="$(git rev-parse --show-toplevel)"

diff --git a/contract/contract.go b/contract/contract.go
@@ -191,21 +191,12 @@ func PackSubmitBatchCheckpoint(gravityID, methodName [32]byte, amounts []*big.In
 	)
 }
 
-func PackBridgeCallCheckpoint(gravityID, methodName [32]byte, sender, refund common.Address, tokens []common.Address, amounts []*big.Int, to common.Address, data, memo []byte, nonce, timeout, gasLimit, eventNonce *big.Int) ([]byte, error) {
+func PackBridgeCallCheckpoint(gravityID, methodName [32]byte, nonce *big.Int, input *FxBridgeBaseBridgeCallData) ([]byte, error) {
 	return fxBridgeABI.Pack("bridgeCallCheckpoint",
 		gravityID,
 		methodName,
-		sender,
-		refund,
-		tokens,
-		amounts,
-		to,
-		data,
-		memo,
 		nonce,
-		timeout,
-		gasLimit,
-		eventNonce,
+		input,
 	)
 }
 

diff --git a/contract/icrosschain.sol.go b/contract/icrosschain.sol.go
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
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+interface FxBridgeBase {
+    struct TokenStatus {
+        bool isOriginated;
+        bool isActive;
+        bool isExist;
+    }
+
+    struct TransferInfo {
+        uint256 amount;
+        address destination;
+        uint256 fee;
+        address exchange;
+        uint256 minExchange;
+    }
+
+    struct BridgeToken {
+        address addr;
+        string name;
+        string symbol;
+        uint8 decimals;
+    }
+
+    struct OracleSignatures {
+        address[] oracles;
+        uint256[] powers;
+        bytes32[] r;
+        bytes32[] s;
+        uint8[] v;
+    }
+
+    struct BridgeCallData {
+        address sender;
+        address refund;
+        address[] tokens;
+        uint256[] amounts;
+        address to;
+        bytes data;
+        bytes memo;
+        uint256 timeout;
+        uint256 gasLimit;
+        uint256 eventNonce;
+    }
+
+    /* =============== EVENTS =============== */
+
+    event TransactionBatchExecutedEvent(
+        uint256 indexed _batchNonce,
+        address indexed _token,
+        uint256 _eventNonce
+    );
+    event SendToFxEvent(
+        address indexed _tokenContract,
+        address indexed _sender,
+        bytes32 indexed _destination,
+        bytes32 _targetIBC,
+        uint256 _amount,
+        uint256 _eventNonce
+    );
+    event AddBridgeTokenEvent(
+        address indexed _tokenContract,
+        string _name,
+        string _symbol,
+        uint8 _decimals,
+        uint256 _eventNonce,
+        bytes32 _channelIBC
+    );
+    event OracleSetUpdatedEvent(
+        uint256 indexed _newOracleSetNonce,
+        uint256 _eventNonce,
+        address[] _oracles,
+        uint256[] _powers
+    );
+    event TransferOwnerEvent(address _token, address _newOwner);
+
+    event SubmitBridgeCallEvent(
+        address indexed _txOrigin,
+        uint256 _nonce,
+        uint256 _eventNonce,
+        bool _success,
+        bytes _cause
+    );
+}