feat: Gateway methods and Solana deposit (#179)

contracts/SwapHelperLib.sol

@@ -103,7 +103,11 @@ library SwapHelperLib {
         if (!existsPairPool) {
             return false;
         }
-        uint256[] memory amounts = UniswapV2Library.getAmountsOut(uniswapV2Factory, amountIn, path);
+        uint256[] memory amounts = UniswapV2Library.getAmountsOut(
+            uniswapV2Factory,
+            amountIn,
+            path
+        );
         return amounts[amounts.length - 1] >= minAmountOut;
     }
 
@@ -114,7 +118,6 @@ library SwapHelperLib {
         address targetZRC20,
         uint256 minAmountOut
     ) internal returns (uint256) {
-
         address[] memory path;
         path = new address[](2);
         path[0] = zrc20;
@@ -127,7 +130,8 @@ library SwapHelperLib {
             path
         );
 
-        bool isZETA = targetZRC20 == systemContract.wZetaContractAddress() || zrc20 == systemContract.wZetaContractAddress();
+        bool isZETA = targetZRC20 == systemContract.wZetaContractAddress() ||
+            zrc20 == systemContract.wZetaContractAddress();
 
         if (!isSufficientLiquidity && !isZETA) {
             path = new address[](3);
@@ -234,20 +238,36 @@ library SwapHelperLib {
         return amounts[0];
     }
 
-    function getMinOutAmount(SystemContract systemContract, address zrc20, address target, uint256 amountIn) public view returns (uint256 minOutAmount) {
+    function getMinOutAmount(
+        SystemContract systemContract,
+        address zrc20,
+        address target,
+        uint256 amountIn
+    ) public view returns (uint256 minOutAmount) {
         address[] memory path;
 
         path = new address[](2);
         path[0] = zrc20;
         path[1] = target;
-        uint[] memory amounts1 = UniswapV2Library.getAmountsOut(systemContract.uniswapv2FactoryAddress(), amountIn, path);
+        uint[] memory amounts1 = UniswapV2Library.getAmountsOut(
+            systemContract.uniswapv2FactoryAddress(),
+            amountIn,
+            path
+        );
 
         path = new address[](3);
         path[0] = zrc20;
         path[1] = systemContract.wZetaContractAddress();
         path[2] = target;
-        uint[] memory amounts2 = UniswapV2Library.getAmountsOut(systemContract.uniswapv2FactoryAddress(), amountIn, path);
+        uint[] memory amounts2 = UniswapV2Library.getAmountsOut(
+            systemContract.uniswapv2FactoryAddress(),
+            amountIn,
+            path
+        );
 
-        minOutAmount = amounts1[amounts1.length - 1] > amounts2[amounts2.length - 1] ? amounts1[amounts1.length - 1] : amounts2[amounts2.length - 1];
+        minOutAmount = amounts1[amounts1.length - 1] >
+            amounts2[amounts2.length - 1]
+            ? amounts1[amounts1.length - 1]
+            : amounts2[amounts2.length - 1];
     }
 }

package.json

@@ -86,10 +86,12 @@
     "typechain-types"
   ],
   "dependencies": {
+    "@coral-xyz/anchor": "^0.30.1",
     "@inquirer/prompts": "^2.1.1",
     "@inquirer/select": "1.1.3",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@openzeppelin/contracts": "^4.9.6",
+    "@solana/web3.js": "^1.95.3",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "@zetachain/faucet-cli": "^4.1.1",
     "@zetachain/networks": "^10.0.0",

packages/client/src/client.ts

@@ -4,6 +4,9 @@ import merge from "lodash/merge";
 
 import {
   deposit,
+  evmCall,
+  evmDeposit,
+  evmDepositAndCall,
   getBalances,
   getChainId,
   getEndpoint,
@@ -17,8 +20,12 @@ import {
   getZRC20FromERC20,
   getZRC20GasToken,
   sendZeta,
+  solanaDeposit,
   trackCCTX,
   withdraw,
+  zetachainCall,
+  zetachainWithdraw,
+  zetachainWithdrawAndCall,
 } from ".";
 
 export interface ZetaChainClientParamsBase {
@@ -126,4 +133,11 @@ export class ZetaChainClient {
   getRefundFee = getRefundFee;
   getZRC20FromERC20 = getZRC20FromERC20;
   getZRC20GasToken = getZRC20GasToken;
+  solanaDeposit = solanaDeposit;
+  zetachainWithdrawAndCall = zetachainWithdrawAndCall;
+  zetachainWithdraw = zetachainWithdraw;
+  zetachainCall = zetachainCall;
+  evmDepositAndCall = evmDepositAndCall;
+  evmCall = evmCall;
+  evmDeposit = evmDeposit;
 }

packages/client/src/evmCall.ts

@@ -0,0 +1,48 @@
+import { ethers } from "ethers";
+
+import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
+import { ZetaChainClient } from "./client";
+
+export const evmCall = async function (
+  this: ZetaChainClient,
+  args: {
+    callOnRevert: boolean;
+    gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
+    onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
+    revertMessage: string;
+    types: string;
+    values: any[];
+  }
+) {
+  const signer = this.signer;
+  const { utils } = ethers;
+  const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer);
+
+  const encodedParameters = utils.defaultAbiCoder.encode(
+    JSON.parse(args.types),
+    args.values
+  );
+  const tx = await gateway[
+    "call(address,bytes,(address,bool,address,bytes,uint256))"
+  ](
+    args.receiver,
+    encodedParameters,
+    {
+      abortAddress: "0x0000000000000000000000000000000000000000",
+      callOnRevert: args.callOnRevert,
+      onRevertGasLimit: args.onRevertGasLimit,
+      revertAddress: args.revertAddress,
+      revertMessage: utils.hexlify(utils.toUtf8Bytes(args.revertMessage)),
+    },
+    {
+      gasLimit: args.gasLimit,
+      gasPrice: args.gasPrice,
+    }
+  );
+
+  return tx;
+};

packages/client/src/evmDeposit.ts

@@ -0,0 +1,68 @@
+import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
+import { ethers } from "ethers";
+
+import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
+import { ZetaChainClient } from "./client";
+
+export const evmDeposit = async function (
+  this: ZetaChainClient,
+  args: {
+    amount: string;
+    callOnRevert: boolean;
+    erc20: string;
+    gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
+    onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
+    revertMessage: string;
+  }
+) {
+  const signer = this.signer;
+  const { utils } = ethers;
+  const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer);
+
+  const revertOptions = {
+    abortAddress: "0x0000000000000000000000000000000000000000",
+    callOnRevert: args.callOnRevert,
+    onRevertGasLimit: args.onRevertGasLimit,
+    revertAddress: args.revertAddress,
+    // not used
+    revertMessage: utils.hexlify(utils.toUtf8Bytes(args.revertMessage)),
+  };
+
+  const txOptions = {
+    gasLimit: args.gasLimit,
+    gasPrice: args.gasPrice,
+  };
+  let tx;
+  if (args.erc20) {
+    const erc20Contract = new ethers.Contract(
+      args.erc20,
+      ERC20_ABI.abi,
+      signer
+    );
+    const decimals = await erc20Contract.decimals();
+    const value = utils.parseUnits(args.amount, decimals);
+    await erc20Contract.connect(signer).approve(args.gatewayEvm, value);
+    const method =
+      "deposit(address,uint256,address,(address,bool,address,bytes,uint256))";
+    tx = await gateway[method](
+      args.receiver,
+      value,
+      args.erc20,
+      revertOptions,
+      txOptions
+    );
+  } else {
+    const value = utils.parseEther(args.amount);
+    const method = "deposit(address,(address,bool,address,bytes,uint256))";
+    tx = await gateway[method](args.receiver, revertOptions, {
+      ...txOptions,
+      value,
+    });
+  }
+
+  return tx;
+};

packages/client/src/evmDepositAndCall.ts

@@ -0,0 +1,82 @@
+import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
+import { ethers } from "ethers";
+
+import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
+import { ZetaChainClient } from "./client";
+
+export const evmDepositAndCall = async function (
+  this: ZetaChainClient,
+  args: {
+    amount: string;
+    callOnRevert: boolean;
+    erc20: string;
+    gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
+    onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
+    revertMessage: string;
+    types: string;
+    values: any[];
+  }
+) {
+  const signer = this.signer;
+  const { utils } = ethers;
+  const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer);
+
+  const revertOptions = {
+    abortAddress: "0x0000000000000000000000000000000000000000",
+    callOnRevert: args.callOnRevert,
+    onRevertGasLimit: args.onRevertGasLimit,
+    revertAddress: args.revertAddress,
+    // not used
+    revertMessage: utils.hexlify(utils.toUtf8Bytes(args.revertMessage)),
+  };
+
+  const txOptions = {
+    gasLimit: args.gasLimit,
+    gasPrice: args.gasPrice,
+  };
+
+  const encodedParameters = utils.defaultAbiCoder.encode(
+    JSON.parse(args.types),
+    args.values
+  );
+  let tx;
+  if (args.erc20) {
+    const erc20Contract = new ethers.Contract(
+      args.erc20,
+      ERC20_ABI.abi,
+      signer
+    );
+    const decimals = await erc20Contract.decimals();
+    const value = utils.parseUnits(args.amount, decimals);
+    await erc20Contract.connect(signer).approve(args.gatewayEvm, value);
+    const method =
+      "depositAndCall(address,uint256,address,bytes,(address,bool,address,bytes,uint256))";
+    tx = await gateway[method](
+      args.receiver,
+      value,
+      args.erc20,
+      encodedParameters,
+      revertOptions,
+      txOptions
+    );
+  } else {
+    const value = utils.parseEther(args.amount);
+    const method =
+      "depositAndCall(address,bytes,(address,bool,address,bytes,uint256))";
+    tx = await gateway[method](
+      args.receiver,
+      encodedParameters,
+      revertOptions,
+      {
+        ...txOptions,
+        value,
+      }
+    );
+  }
+
+  return tx;
+};