fix: use callOptions in call/withdrawAndCall (#195)

zeta-chain · Nov 29, 2024 · cf3b5f0 · cf3b5f0
1 parent 5d9873c
commit cf3b5f0
Show file tree

Hide file tree

Showing 103 changed files with 1,938 additions and 4,943 deletions.
diff --git a/contracts/TestSystemContract.sol b/contracts/TestSystemContract.sol
diff --git a/contracts/ZetaConnectorMock.sol b/contracts/ZetaConnectorMock.sol
diff --git a/contracts/shared/MockSystemContract.sol b/contracts/shared/MockSystemContract.sol
diff --git a/package.json b/package.json
@@ -96,7 +96,7 @@
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
     "@zetachain/faucet-cli": "^4.1.1",
     "@zetachain/networks": "10.0.0",
-    "@zetachain/protocol-contracts": "9.0.0",
+    "@zetachain/protocol-contracts": "11.0.0-rc3",
     "axios": "^1.4.0",
     "bech32": "^2.0.0",
     "bip39": "^3.1.0",

diff --git a/packages/client/src/abi/GatewayEVM.sol/GatewayEVM.json b/packages/client/src/abi/GatewayEVM.sol/GatewayEVM.json
diff --git a/packages/client/src/abi/GatewayZEVM.sol/GatewayZEVM.json b/packages/client/src/abi/GatewayZEVM.sol/GatewayZEVM.json
diff --git a/packages/client/src/abi/ZRC20.sol/ZRC20.json b/packages/client/src/abi/ZRC20.sol/ZRC20.json
diff --git a/packages/client/src/abi/ZRC20.sol/ZRC20Errors.json b/packages/client/src/abi/ZRC20.sol/ZRC20Errors.json
diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts
@@ -3,7 +3,6 @@ import type { Signer, Wallet } from "ethers";
 import merge from "lodash/merge";
 
 import {
-  deposit,
   evmCall,
   evmDeposit,
   evmDepositAndCall,
@@ -22,7 +21,6 @@ import {
   sendZeta,
   solanaDeposit,
   trackCCTX,
-  withdraw,
   zetachainCall,
   zetachainWithdraw,
   zetachainWithdrawAndCall,
@@ -124,8 +122,6 @@ export class ZetaChainClient {
   getFees = getFees;
   getPools = getPools;
   trackCCTX = trackCCTX;
-  deposit = deposit;
-  withdraw = withdraw;
   sendZeta = sendZeta;
   getChainId = getChainId;
   getQuote = getQuote;

diff --git a/packages/client/src/deposit.ts b/packages/client/src/deposit.ts
diff --git a/packages/client/src/evmCall.ts b/packages/client/src/evmCall.ts
@@ -1,6 +1,6 @@
+import GatewayABI from "@zetachain/protocol-contracts/abi/GatewayEVM.sol/GatewayEVM.json";
 import { ethers } from "ethers";
 
-import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
 import { ZetaChainClient } from "./client";
 import type { revertOptions, txOptions } from "./types";
 

diff --git a/packages/client/src/evmDeposit.ts b/packages/client/src/evmDeposit.ts
@@ -1,7 +1,7 @@
 import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
+import GatewayABI from "@zetachain/protocol-contracts/abi/GatewayEVM.sol/GatewayEVM.json";
 import { ethers } from "ethers";
 
-import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
 import { ZetaChainClient } from "./client";
 import type { revertOptions, txOptions } from "./types";
 

diff --git a/packages/client/src/evmDepositAndCall.ts b/packages/client/src/evmDepositAndCall.ts
@@ -1,7 +1,7 @@
 import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
+import GatewayABI from "@zetachain/protocol-contracts/abi/GatewayEVM.sol/GatewayEVM.json";
 import { ethers } from "ethers";
 
-import GatewayABI from "./abi/GatewayEVM.sol/GatewayEVM.json";
 import { ZetaChainClient } from "./client";
 import type { revertOptions, txOptions } from "./types";
 

diff --git a/packages/client/src/getBalances.ts b/packages/client/src/getBalances.ts
@@ -1,6 +1,6 @@
 import ERC20_ABI from "@openzeppelin/contracts/build/contracts/ERC20.json";
 import { getAddress } from "@zetachain/protocol-contracts";
-import ZRC20 from "@zetachain/protocol-contracts/abi/zevm/ZRC20.sol/ZRC20.json";
+import ZRC20 from "@zetachain/protocol-contracts/abi/ZRC20.sol/ZRC20.json";
 import { ethers } from "ethers";
 import { formatUnits } from "ethers/lib/utils";
 import fetch from "isomorphic-fetch";

diff --git a/packages/client/src/getFees.ts b/packages/client/src/getFees.ts
@@ -1,5 +1,5 @@
 import { mainnet, testnet } from "@zetachain/protocol-contracts";
-import ZRC20 from "@zetachain/protocol-contracts/abi/zevm/ZRC20.sol/ZRC20.json";
+import ZRC20 from "@zetachain/protocol-contracts/abi/ZRC20.sol/ZRC20.json";
 import { ethers, utils } from "ethers";
 import fetch from "isomorphic-fetch";
 

diff --git a/packages/client/src/getPools.ts b/packages/client/src/getPools.ts
@@ -1,7 +1,7 @@
 import UniswapV2Factory from "@uniswap/v2-core/build/UniswapV2Factory.json";
 import UniswapV2Pair from "@uniswap/v2-core/build/UniswapV2Pair.json";
 import { getAddress, ParamChainName } from "@zetachain/protocol-contracts";
-import SystemContract from "@zetachain/protocol-contracts/abi/zevm/SystemContract.sol/SystemContract.json";
+import SystemContract from "@zetachain/protocol-contracts/abi/SystemContract.sol/SystemContract.json";
 import { ethers } from "ethers";
 
 import { ZetaChainClient } from "./client";

diff --git a/packages/client/src/getQuote.ts b/packages/client/src/getQuote.ts
@@ -1,7 +1,7 @@
 import { parseUnits } from "@ethersproject/units";
 import UniswapV2RouterABI from "@uniswap/v2-periphery/build/IUniswapV2Router02.json";
 import { getAddress } from "@zetachain/protocol-contracts";
-import ZRC20 from "@zetachain/protocol-contracts/abi/zevm/ZRC20.sol/ZRC20.json";
+import ZRC20 from "@zetachain/protocol-contracts/abi/ZRC20.sol/ZRC20.json";
 import { ethers } from "ethers";
 
 import { ZetaChainClient } from "./client";

diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
@@ -1,5 +1,4 @@
 export * from "./client";
-export * from "./deposit";
 export * from "./evmCall";
 export * from "./evmDeposit";
 export * from "./evmDepositAndCall";
@@ -16,7 +15,6 @@ export * from "./prepareData";
 export * from "./sendZeta";
 export * from "./solanaDeposit";
 export * from "./trackCCTX";
-export * from "./withdraw";
 export * from "./zetachainCall";
 export * from "./zetachainWithdraw";
 export * from "./zetachainWithdrawAndCall";