wip

zeta-chain · Jan 14, 2025 · 63b4a4b · 63b4a4b
1 parent c0a77f4
commit 63b4a4b
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 127 deletions.
diff --git a/examples/call/hardhat.config.ts b/examples/call/hardhat.config.ts
@@ -8,15 +8,15 @@ import "./tasks/universalWithdrawAndCall";
 import "@zetachain/localnet/tasks";
 import "@nomicfoundation/hardhat-toolbox";
 import "@zetachain/toolkit/tasks";
+import * as dotenv from "dotenv";
 
-import { getHardhatConfigNetworks } from "@zetachain/networks";
+import { getHardhatConfig } from "@zetachain/toolkit/client";
 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/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",
-    20000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    500000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",

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",
-    20000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    500000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",

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",
-    20000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    500000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",

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",
-    20000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    500000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",
@@ -116,7 +98,7 @@ task(
   .addOptionalParam(
     "onRevertGasLimit",
     "The gas limit for the revert transaction",
-    50000,
+    500000,
     types.int
   )
   .addFlag("callOptionsIsArbitraryCall", "Call any function")

diff --git a/examples/call/tasks/universalWithdraw.ts b/examples/call/tasks/universalWithdraw.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,
@@ -28,16 +23,14 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const gasZRC20Contract = new ethers.Contract(gasZRC20, ZRC20ABI.abi, signer);
   const gasFeeApprove = await gasZRC20Contract.approve(
     args.contract,
-    gasZRC20 == args.zrc20 ? gasFee.add(amount) : gasFee,
-    txOptions
+    gasZRC20 == args.zrc20 ? gasFee.add(amount) : gasFee
   );
   await gasFeeApprove.wait();
 
   if (gasZRC20 !== args.zrc20) {
     const targetTokenApprove = await zrc20.approve(
       args.contract,
-      gasFee.add(amount),
-      txOptions
+      gasFee.add(amount)
     );
     await targetTokenApprove.wait();
   }
@@ -49,8 +42,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     ethers.utils.hexlify(args.receiver),
     amount,
     args.zrc20,
-    revertOptions,
-    txOptions
+    revertOptions
   );
 
   await tx.wait();

diff --git a/examples/call/tasks/universalWithdrawAndCall.ts b/examples/call/tasks/universalWithdrawAndCall.ts
@@ -14,11 +14,6 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     throw new Error("Function is not allowed for non-arbitrary calls");
   }
 
-  const txOptions = {
-    gasPrice: args.txOptionsGasPrice,
-    gasLimit: args.txOptionsGasLimit,
-  };
-
   const callOptions = {
     isArbitraryCall: args.callOptionsIsArbitraryCall,
     gasLimit: args.callOptionsGasLimit,
@@ -73,7 +68,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     message = encodedParameters;
   }
 
-  const gasLimit = hre.ethers.BigNumber.from(args.txOptionsGasLimit);
+  const gasLimit = hre.ethers.BigNumber.from(callOptions.gasLimit);
 
   const amount = hre.ethers.utils.parseUnits(args.amount, 18);
 
@@ -82,16 +77,14 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
   const gasZRC20Contract = new ethers.Contract(gasZRC20, ZRC20ABI.abi, signer);
   const gasFeeApprove = await gasZRC20Contract.approve(
     args.contract,
-    gasZRC20 == args.zrc20 ? gasFee.add(amount) : gasFee,
-    txOptions
+    gasZRC20 == args.zrc20 ? gasFee.add(amount) : gasFee
   );
   await gasFeeApprove.wait();
 
   if (gasZRC20 !== args.zrc20) {
     const targetTokenApprove = await zrc20.approve(
       args.contract,
-      gasFee.add(amount),
-      txOptions
+      gasFee.add(amount)
     );
     await targetTokenApprove.wait();
   }
@@ -105,8 +98,7 @@ const main = async (args: any, hre: HardhatRuntimeEnvironment) => {
     args.zrc20,
     message,
     callOptions,
-    revertOptions,
-    txOptions
+    revertOptions
   );
 
   await tx.wait();
@@ -120,18 +112,6 @@ task(
 )
   .addParam("contract", "The address of the deployed Hello contract")
   .addParam("zrc20", "The address of ZRC-20 to pay fees")
-  .addOptionalParam(
-    "txOptionsGasPrice",
-    "The gas price for the transaction",
-    20000000000,
-    types.int
-  )
-  .addOptionalParam(
-    "txOptionsGasLimit",
-    "The gas limit for the transaction",
-    500000,
-    types.int
-  )
   .addFlag("callOnRevert", "Whether to call on revert")
   .addOptionalParam(
     "revertAddress",