feat: check withdraw fee in Swap, callMulti example, universal NFT/FT (…

…#229)
zeta-chain · Feb 5, 2025 · a760288 · a760288
1 parent 77d0fbf
commit a760288
Show file tree

Hide file tree

Showing 59 changed files with 4,914 additions and 3,848 deletions.
diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -25,10 +25,6 @@ jobs:
             file: "call.sarif"
           - project: "examples/swap"
             file: "swap.sarif"
-          - project: "examples/nft"
-            file: "nft.sarif"
-          - project: "examples/token"
-            file: "token.sarif"
     permissions:
       contents: read
       security-events: write

diff --git a/examples/call/contracts/Connected.sol b/examples/call/contracts/Connected.sol
@@ -6,7 +6,7 @@ import "@zetachain/protocol-contracts/contracts/evm/GatewayEVM.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract Connected {
-    using SafeERC20 for IERC20; // Use SafeERC20 for IERC20 operations
+    using SafeERC20 for IERC20;
 
     GatewayEVM public immutable gateway;
 

diff --git a/examples/call/contracts/Universal.sol b/examples/call/contracts/Universal.sol
@@ -41,6 +41,36 @@ contract Universal is UniversalContract {
         gateway.call(receiver, zrc20, message, callOptions, revertOptions);
     }
 
+    function callMulti(
+        bytes[] memory receiverArray,
+        address[] memory zrc20Array,
+        bytes calldata messages,
+        CallOptions memory callOptions,
+        RevertOptions memory revertOptions
+    ) external {
+        for (uint256 i = 0; i < zrc20Array.length; i++) {
+            (, uint256 gasFee) = IZRC20(zrc20Array[i])
+                .withdrawGasFeeWithGasLimit(callOptions.gasLimit);
+            if (
+                !IZRC20(zrc20Array[i]).transferFrom(
+                    msg.sender,
+                    address(this),
+                    gasFee
+                )
+            ) {
+                revert TransferFailed();
+            }
+            IZRC20(zrc20Array[i]).approve(address(gateway), gasFee);
+            gateway.call(
+                receiverArray[i],
+                zrc20Array[i],
+                messages,
+                callOptions,
+                revertOptions
+            );
+        }
+    }
+
     function withdraw(
         bytes memory receiver,
         uint256 amount,

diff --git a/examples/call/hardhat.config.ts b/examples/call/hardhat.config.ts
@@ -1,22 +1,16 @@
-import "./tasks/deploy";
-import "./tasks/universalCall";
-import "./tasks/connectedCall";
-import "./tasks/connectedDeposit";
-import "./tasks/connectedDepositAndCall";
-import "./tasks/universalWithdraw";
-import "./tasks/universalWithdrawAndCall";
-import "@zetachain/localnet/tasks";
 import "@nomicfoundation/hardhat-toolbox";
+import { HardhatUserConfig } from "hardhat/config";
+import * as dotenv from "dotenv";
+
+import "./tasks";
+import "@zetachain/localnet/tasks";
 import "@zetachain/toolkit/tasks";
+import { getHardhatConfig } from "@zetachain/toolkit/client";
 
-import { getHardhatConfigNetworks } from "@zetachain/networks";
-import { HardhatUserConfig } from "hardhat/config";
+dotenv.config();
 
 const config: HardhatUserConfig = {
-  networks: {
-    ...getHardhatConfigNetworks(),
-  },
-  solidity: "0.8.26",
+  ...getHardhatConfig({ accounts: [process.env.PRIVATE_KEY] }),
 };
 
 export default config;
diff --git a/examples/call/package.json b/examples/call/package.json
@@ -29,7 +29,7 @@
     "@typescript-eslint/eslint-plugin": "^5.59.9",
     "@typescript-eslint/parser": "^5.59.9",
     "@zetachain/localnet": "4.0.0-rc6",
-    "@zetachain/toolkit": "13.0.0-rc7",
+    "@zetachain/toolkit": "13.0.0-rc15",
     "axios": "^1.3.6",
     "chai": "^4.2.0",
     "dotenv": "^16.0.3",
@@ -57,6 +57,8 @@
     "@solana-developers/helpers": "^2.4.0",
     "@solana/spl-memo": "^0.2.5",
     "@solana/web3.js": "^1.95.8",
-    "@zetachain/protocol-contracts": "11.0.0-rc3"
+    "@zetachain/networks": "10.0.0-rc4",
+    "@zetachain/protocol-contracts": "11.0.0-rc3",
+    "@zetachain/protocol-contracts-solana": "2.0.0-rc1"
   }
-}
+}
diff --git a/examples/call/scripts/localnet.sh b/examples/call/scripts/localnet.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 set -e
+set -x
+set -o pipefail
 
 if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 10; fi
 

diff --git a/examples/call/tasks/connectedCall.ts b/examples/call/tasks/connectedCall.ts
@@ -5,11 +5,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
 
-  const txOptions = {
-    gasPrice: args.txOptionsGasPrice,
-    gasLimit: args.txOptionsGasLimit,
-  };
-
   const revertOptions = {
     abortAddress: "0x0000000000000000000000000000000000000000", // not used
     callOnRevert: args.callOnRevert,
@@ -54,8 +49,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const tx = await contract.call(
     args.receiver,
     encodedParameters,
-    revertOptions,
-    txOptions
+    revertOptions
   );
 
   await tx.wait();
@@ -68,18 +62,6 @@ task(
   main
 )
   .addParam("contract", "The address of the deployed contract")
-  .addOptionalParam(
-    "txOptionsGasPrice",
-    "The gas price for the transaction",
-    10000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    7000000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",
@@ -94,7 +76,7 @@ task(
   .addOptionalParam(
     "onRevertGasLimit",
     "The gas limit for the revert transaction",
-    7000000,
+    500000,
     types.int
   )
   .addParam("name", "The name of the contract", "Connected")

diff --git a/examples/call/tasks/connectedDeposit.ts b/examples/call/tasks/connectedDeposit.ts
@@ -6,11 +6,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
 
-  const txOptions = {
-    gasPrice: args.txOptionsGasPrice,
-    gasLimit: args.txOptionsGasLimit,
-  };
-
   const revertOptions = {
     abortAddress: "0x0000000000000000000000000000000000000000", // not used
     callOnRevert: args.callOnRevert,
@@ -43,16 +38,12 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
       args.receiver,
       value,
       args.erc20,
-      revertOptions,
-      txOptions
+      revertOptions
     );
   } else {
     const value = hre.ethers.utils.parseEther(args.amount);
     const method = "deposit(address,(address,bool,address,bytes,uint256))";
-    tx = await contract[method](args.receiver, revertOptions, {
-      ...txOptions,
-      value,
-    });
+    tx = await contract[method](args.receiver, revertOptions, { value });
   }
 
   await tx.wait();
@@ -61,18 +52,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
 
 task("connected-deposit", "Deposit tokens to ZetaChain", main)
   .addParam("contract", "The address of the deployed contract")
-  .addOptionalParam(
-    "txOptionsGasPrice",
-    "The gas price for the transaction",
-    10000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    7000000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",
@@ -87,7 +66,7 @@ task("connected-deposit", "Deposit tokens to ZetaChain", main)
   .addOptionalParam(
     "onRevertGasLimit",
     "The gas limit for the revert transaction",
-    7000000,
+    500000,
     types.int
   )
   .addOptionalParam("erc20", "The address of the ERC20 token to deposit")

diff --git a/examples/call/tasks/connectedDepositAndCall.ts b/examples/call/tasks/connectedDepositAndCall.ts
@@ -6,11 +6,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
 
-  const txOptions = {
-    gasPrice: args.txOptionsGasPrice,
-    gasLimit: args.txOptionsGasLimit,
-  };
-
   const revertOptions = {
     abortAddress: "0x0000000000000000000000000000000000000000", // not used
     callOnRevert: args.callOnRevert,
@@ -72,8 +67,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
       value,
       args.erc20,
       encodedParameters,
-      revertOptions,
-      txOptions
+      revertOptions
     );
   } else {
     const value = hre.ethers.utils.parseEther(args.amount);
@@ -83,10 +77,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
       args.receiver,
       encodedParameters,
       revertOptions,
-      {
-        ...txOptions,
-        value,
-      }
+      { value }
     );
   }
 
@@ -100,18 +91,6 @@ task(
   main
 )
   .addParam("contract", "The address of the deployed contract")
-  .addOptionalParam(
-    "txOptionsGasPrice",
-    "The gas price for the transaction",
-    10000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    7000000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",
@@ -126,7 +105,7 @@ task(
   .addOptionalParam(
     "onRevertGasLimit",
     "The gas limit for the revert transaction",
-    7000000,
+    500000,
     types.int
   )
   .addParam("amount", "The amount of tokens to deposit")

diff --git a/examples/call/tasks/index.ts b/examples/call/tasks/index.ts
@@ -0,0 +1,8 @@
+import "./deploy";
+import "./universalCall";
+import "./universalCallMulti";
+import "./connectedCall";
+import "./connectedDeposit";
+import "./connectedDepositAndCall";
+import "./universalWithdraw";
+import "./universalWithdrawAndCall";
diff --git a/examples/call/tasks/universalCall.ts b/examples/call/tasks/universalCall.ts
@@ -6,11 +6,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const { ethers } = hre;
   const [signer] = await ethers.getSigners();
 
-  const txOptions = {
-    gasPrice: args.txOptionsGasPrice,
-    gasLimit: args.txOptionsGasLimit,
-  };
-
   const callOptions = {
     isArbitraryCall: args.callOptionsIsArbitraryCall,
     gasLimit: args.callOptionsGasLimit,
@@ -60,10 +55,10 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     ethers.utils.concat([functionSignature, encodedParameters])
   );
 
-  const gasLimit = hre.ethers.BigNumber.from(args.txOptionsGasLimit);
+  const gasLimit = hre.ethers.BigNumber.from(callOptions.gasLimit);
   const zrc20 = new ethers.Contract(args.zrc20, ZRC20ABI.abi, signer);
   const [, gasFee] = await zrc20.withdrawGasFeeWithGasLimit(gasLimit);
-  const zrc20TransferTx = await zrc20.approve(args.contract, gasFee, txOptions);
+  const zrc20TransferTx = await zrc20.approve(args.contract, gasFee);
 
   await zrc20TransferTx.wait();
 
@@ -75,8 +70,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     args.zrc20,
     message,
     callOptions,
-    revertOptions,
-    txOptions
+    revertOptions
   );
 
   await tx.wait();
@@ -90,18 +84,6 @@ task(
 )
   .addParam("contract", "The address of the deployed universal contract")
   .addParam("zrc20", "The address of ZRC-20 to pay fees")
-  .addOptionalParam(
-    "txOptionsGasPrice",
-    "The gas price for the transaction",
-    10000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    7000000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",
@@ -116,14 +98,14 @@ task(
   .addOptionalParam(
     "onRevertGasLimit",
     "The gas limit for the revert transaction",
-    7000000,
+    500000,
     types.int
   )
   .addFlag("callOptionsIsArbitraryCall", "Call any function")
   .addOptionalParam(
     "callOptionsGasLimit",
     "The gas limit for the call",
-    7000000,
+    500000,
     types.int
   )
   .addParam("function", `Function to call (example: "hello(string)")`)