lint

zeta-chain · Sep 6, 2024 · b80fc27 · b80fc27
1 parent ce2aed4
commit b80fc27
Show file tree

Hide file tree

Showing 14 changed files with 71 additions and 66 deletions.
diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts
@@ -4,6 +4,9 @@ import merge from "lodash/merge";
 
 import {
   deposit,
+  evmCall,
+  evmDeposit,
+  evmDepositAndCall,
   getBalances,
   getChainId,
   getEndpoint,
@@ -20,12 +23,9 @@ import {
   solanaDeposit,
   trackCCTX,
   withdraw,
-  zetachainWithdrawAndCall,
-  zetachainWithdraw,
   zetachainCall,
-  evmDepositAndCall,
-  evmCall,
-  evmDeposit,
+  zetachainWithdraw,
+  zetachainWithdrawAndCall,
 } from ".";
 
 export interface ZetaChainClientParamsBase {

diff --git a/packages/client/src/evmCall.ts b/packages/client/src/evmCall.ts
@@ -6,13 +6,13 @@ import { ZetaChainClient } from "./client";
 export const evmCall = async function (
   this: ZetaChainClient,
   args: {
-    receiver: string;
-    gatewayEvm: string;
     callOnRevert: boolean;
-    revertAddress: string;
-    gasPrice: ethers.BigNumber;
     gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
     onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
     revertMessage: string;
     types: string;
     values: any[];

diff --git a/packages/client/src/evmDeposit.ts b/packages/client/src/evmDeposit.ts
@@ -1,22 +1,22 @@
+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";
-import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
 
 export const evmDeposit = async function (
   this: ZetaChainClient,
   args: {
     amount: string;
-    receiver: string;
-    gatewayEvm: string;
     callOnRevert: boolean;
-    revertAddress: string;
-    gasPrice: ethers.BigNumber;
+    erc20: string;
     gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
     onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
     revertMessage: string;
-    erc20: string;
   }
 ) {
   const signer = this.signer;

diff --git a/packages/client/src/evmDepositAndCall.ts b/packages/client/src/evmDepositAndCall.ts
@@ -1,22 +1,22 @@
+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";
-import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
 
 export const evmDepositAndCall = async function (
   this: ZetaChainClient,
   args: {
     amount: string;
-    receiver: string;
-    gatewayEvm: string;
     callOnRevert: boolean;
-    revertAddress: string;
-    gasPrice: ethers.BigNumber;
+    erc20: string;
     gasLimit: number;
+    gasPrice: ethers.BigNumber;
+    gatewayEvm: string;
     onRevertGasLimit: number;
+    receiver: string;
+    revertAddress: string;
     revertMessage: string;
-    erc20: string;
     types: string;
     values: any[];
   }

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -1,5 +1,8 @@
 export * from "./client";
 export * from "./deposit";
+export * from "./evmCall";
+export * from "./evmDeposit";
+export * from "./evmDepositAndCall";
 export * from "./getBalances";
 export * from "./getChainId";
 export * from "./getEndpoint";
@@ -14,9 +17,6 @@ export * from "./sendZeta";
 export * from "./solanaDeposit";
 export * from "./trackCCTX";
 export * from "./withdraw";
-export * from "./zetachainWithdrawAndCall";
-export * from "./zetachainWithdraw";
 export * from "./zetachainCall";
-export * from "./evmDepositAndCall";
-export * from "./evmCall";
-export * from "./evmDeposit";
+export * from "./zetachainWithdraw";
+export * from "./zetachainWithdrawAndCall";
diff --git a/packages/client/src/zetachainCall.ts b/packages/client/src/zetachainCall.ts
@@ -8,18 +8,18 @@ export const zetachainCall = async function (
   this: ZetaChainClient,
   args: {
     amount: string;
-    zrc20: string;
-    receiver: string;
+    callOnRevert: boolean;
     function: string;
-    types: string;
-    values: any[];
     gasLimit: number;
     gasPrice: ethers.BigNumber;
     gatewayZetaChain: string;
-    callOnRevert: boolean;
     onRevertGasLimit: number;
+    receiver: string;
     revertAddress: string;
     revertMessage: string;
+    types: string;
+    values: any[];
+    zrc20: string;
   }
 ) {
   const signer = this.signer;

diff --git a/packages/client/src/zetachainWithdraw.ts b/packages/client/src/zetachainWithdraw.ts
@@ -8,15 +8,15 @@ export const zetachainWithdraw = async function (
   this: ZetaChainClient,
   args: {
     amount: string;
-    zrc20: string;
-    receiver: string;
+    callOnRevert: boolean;
     gasLimit: number;
     gasPrice: ethers.BigNumber;
     gatewayZetaChain: string;
-    callOnRevert: boolean;
     onRevertGasLimit: number;
+    receiver: string;
     revertAddress: string;
     revertMessage: string;
+    zrc20: string;
   }
 ) {
   const signer = this.signer;

diff --git a/packages/client/src/zetachainWithdrawAndCall.ts b/packages/client/src/zetachainWithdrawAndCall.ts
@@ -8,18 +8,18 @@ export const zetachainWithdrawAndCall = async function (
   this: ZetaChainClient,
   args: {
     amount: string;
-    zrc20: string;
-    receiver: string;
+    callOnRevert: boolean;
     function: string;
-    types: string;
-    values: any[];
     gasLimit: number;
     gasPrice: ethers.BigNumber;
     gatewayZetaChain: string;
-    callOnRevert: boolean;
     onRevertGasLimit: number;
+    receiver: string;
     revertAddress: string;
     revertMessage: string;
+    types: string;
+    values: any[];
+    zrc20: string;
   }
 ) {
   const signer = this.signer;

diff --git a/packages/tasks/src/evmCall.ts b/packages/tasks/src/evmCall.ts
@@ -1,19 +1,20 @@
 import { task, types } from "hardhat/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+
 import { ZetaChainClient } from "../../client/src/";
 
 export const evmCall = async (args: any, hre: HardhatRuntimeEnvironment) => {
   try {
     const [signer] = await hre.ethers.getSigners();
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.evmCall({
-      receiver: args.receiver,
-      gatewayEvm: args.gatewayEvm,
       callOnRevert: args.callOnRevert,
-      revertAddress: args.revertAddress,
-      gasPrice: args.gasPrice,
       gasLimit: args.gasLimit,
+      gasPrice: args.gasPrice,
+      gatewayEvm: args.gatewayEvm,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
+      revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
       types: args.types,
       values: args.values,

diff --git a/packages/tasks/src/evmDeposit.ts b/packages/tasks/src/evmDeposit.ts
@@ -1,5 +1,6 @@
 import { task, types } from "hardhat/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+
 import { ZetaChainClient } from "../../client/src/";
 
 export const evmDeposit = async (args: any, hre: HardhatRuntimeEnvironment) => {
@@ -8,15 +9,15 @@ export const evmDeposit = async (args: any, hre: HardhatRuntimeEnvironment) => {
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.evmDeposit({
       amount: args.amount,
-      receiver: args.receiver,
-      gatewayEvm: args.gatewayEvm,
       callOnRevert: args.callOnRevert,
-      revertAddress: args.revertAddress,
-      gasPrice: args.gasPrice,
+      erc20: args.erc20,
       gasLimit: args.gasLimit,
+      gasPrice: args.gasPrice,
+      gatewayEvm: args.gatewayEvm,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
+      revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
-      erc20: args.erc20,
     });
     if (tx) {
       const receipt = await tx.wait();

diff --git a/packages/tasks/src/evmDepositAndCall.ts b/packages/tasks/src/evmDepositAndCall.ts
@@ -1,5 +1,6 @@
 import { task, types } from "hardhat/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+
 import { ZetaChainClient } from "../../client/src/";
 
 export const evmDepositAndCall = async (
@@ -11,15 +12,15 @@ export const evmDepositAndCall = async (
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.evmDepositAndCall({
       amount: args.amount,
-      receiver: args.receiver,
-      gatewayEvm: args.gatewayEvm,
       callOnRevert: args.callOnRevert,
-      revertAddress: args.revertAddress,
-      gasPrice: args.gasPrice,
+      erc20: args.erc20,
       gasLimit: args.gasLimit,
+      gasPrice: args.gasPrice,
+      gatewayEvm: args.gatewayEvm,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
+      revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
-      erc20: args.erc20,
       types: args.types,
       values: args.values,
     });

diff --git a/packages/tasks/src/zetachainCall.ts b/packages/tasks/src/zetachainCall.ts
@@ -1,5 +1,6 @@
 import { task, types } from "hardhat/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+
 import { ZetaChainClient } from "../../client/src/";
 
 export const zetachainCall = async (
@@ -11,18 +12,18 @@ export const zetachainCall = async (
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.zetachainCall({
       amount: args.amount,
-      zrc20: args.zrc20,
-      receiver: args.receiver,
+      callOnRevert: args.callOnRevert,
       function: args.function,
-      types: args.types,
-      values: args.values,
       gasLimit: args.gasLimit,
       gasPrice: args.gasPrice,
       gatewayZetaChain: args.gatewayZetaChain,
-      callOnRevert: args.callOnRevert,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
       revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
+      types: args.types,
+      values: args.values,
+      zrc20: args.zrc20,
     });
     const receipt = await tx.wait();
     console.log("Transaction hash:", receipt.transactionHash);

diff --git a/packages/tasks/src/zetachainWithdraw.ts b/packages/tasks/src/zetachainWithdraw.ts
@@ -1,5 +1,6 @@
 import { task, types } from "hardhat/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types";
+
 import { ZetaChainClient } from "../../client/src/";
 
 export const zetachainWithdraw = async (
@@ -11,15 +12,15 @@ export const zetachainWithdraw = async (
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.zetachainWithdraw({
       amount: args.amount,
-      zrc20: args.zrc20,
-      receiver: args.receiver,
+      callOnRevert: args.callOnRevert,
       gasLimit: args.gasLimit,
       gasPrice: args.gasPrice,
       gatewayZetaChain: args.gatewayZetaChain,
-      callOnRevert: args.callOnRevert,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
       revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
+      zrc20: args.zrc20,
     });
 
     const receipt = await tx.wait();

diff --git a/packages/tasks/src/zetachainWithdrawAndCall.ts b/packages/tasks/src/zetachainWithdrawAndCall.ts
@@ -12,18 +12,18 @@ export const zetachainWithdrawAndCall = async (
     const client = new ZetaChainClient({ network: "testnet", signer });
     const tx = await client.zetachainWithdrawAndCall({
       amount: args.amount,
-      zrc20: args.zrc20,
-      receiver: args.receiver,
+      callOnRevert: args.callOnRevert,
       function: args.function,
-      types: args.types,
-      values: args.values,
       gasLimit: args.gasLimit,
       gasPrice: args.gasPrice,
       gatewayZetaChain: args.gatewayZetaChain,
-      callOnRevert: args.callOnRevert,
       onRevertGasLimit: args.onRevertGasLimit,
+      receiver: args.receiver,
       revertAddress: args.revertAddress,
       revertMessage: args.revertMessage,
+      types: args.types,
+      values: args.values,
+      zrc20: args.zrc20,
     });
 
     const receipt = await tx.wait();