From 058a43cbe4851a211f1acb1ce3c6e6301d33fd13 Mon Sep 17 00:00:00 2001 From: lukema95 <867273263@qq.com> Date: Fri, 20 Dec 2024 15:15:49 +0800 Subject: [PATCH] read gateway address from networks file --- package.json | 2 +- packages/client/src/client.ts | 71 +++++++++++++++++++ packages/client/src/evmCall.ts | 9 ++- packages/client/src/evmDeposit.ts | 9 ++- packages/client/src/evmDepositAndCall.ts | 9 ++- packages/client/src/zetachainCall.ts | 7 +- packages/client/src/zetachainWithdraw.ts | 6 +- .../client/src/zetachainWithdrawAndCall.ts | 6 +- packages/tasks/src/evmCall.ts | 9 +-- packages/tasks/src/evmDeposit.ts | 9 +-- packages/tasks/src/evmDepositAndCall.ts | 9 +-- packages/tasks/src/zetachainCall.ts | 6 +- packages/tasks/src/zetachainWithdraw.ts | 6 +- .../tasks/src/zetachainWithdrawAndCall.ts | 6 +- .../contracts/SwapHelperLib__factory.ts | 2 +- yarn.lock | 40 +++-------- 16 files changed, 135 insertions(+), 71 deletions(-) diff --git a/package.json b/package.json index 22380cca..09a7f832 100644 --- a/package.json +++ b/package.json @@ -100,7 +100,7 @@ "@solana/web3.js": "^1.95.3", "@uniswap/v2-periphery": "^1.1.0-beta.0", "@zetachain/faucet-cli": "^4.1.1", - "@zetachain/networks": "v10.0.0", + "@zetachain/networks": "v10.0.0-rc1", "@zetachain/protocol-contracts": "11.0.0-rc3", "axios": "^1.4.0", "bech32": "^2.0.0", diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index 2e9102f1..59891dbb 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -2,6 +2,8 @@ import type { Wallet as SolanaWallet } from "@coral-xyz/anchor"; import type { WalletContextState } from "@solana/wallet-adapter-react"; import { PublicKey } from "@solana/web3.js"; import { networks } from "@zetachain/networks"; +import mainnetAddresses from "@zetachain/protocol-contracts/dist/data/addresses.mainnet.json"; +import testnetAddresses from "@zetachain/protocol-contracts/dist/data/addresses.testnet.json"; import type { Signer, Wallet } from "ethers"; import merge from "lodash/merge"; @@ -31,6 +33,7 @@ import { export interface ZetaChainClientParamsBase { chains?: { [key: string]: any }; + contracts?: LocalnetAddress[] | MainnetTestnetAddress[]; network?: string; } @@ -68,6 +71,20 @@ export type ZetaChainClientParams = ZetaChainClientParamsBase & } ); +interface MainnetTestnetAddress { + address: string; + category: string; + chain_id: number; + chain_name: string; + type: string; +} + +interface LocalnetAddress { + address: string; + chain: string; + type: string; +} + export class ZetaChainClient { public chains: { [key: string]: any }; public network: string; @@ -75,6 +92,7 @@ export class ZetaChainClient { public signer: any | undefined; public solanaWallet: SolanaWallet | undefined; public solanaAdapter: WalletContextState | undefined; + private contracts: LocalnetAddress[] | MainnetTestnetAddress[]; /** * Initializes ZetaChainClient instance. @@ -136,6 +154,16 @@ export class ZetaChainClient { this.chains = { ...networks }; this.network = params.network || ""; + if (params.contracts) { + this.contracts = params.contracts; + } else if (this.network === "localnet") { + throw new Error("Localnet contracts are required"); + } else { + this.contracts = this.network.includes("test") + ? testnetAddresses + : mainnetAddresses; + } + this.mergeChains(params.chains); } @@ -147,6 +175,49 @@ export class ZetaChainClient { }); } + public getGatewayAddress(): string { + if (this.network === "localnet") { + const gateway = (this.contracts as LocalnetAddress[]).find( + (item) => item.type === "gatewayZEVM" + ); + + if (!gateway) { + throw new Error("Gateway address not found in localnet configuration"); + } + + return gateway.address; + } else { + let gateway; + if (this.wallet) { + try { + gateway = (this.contracts as MainnetTestnetAddress[]).find( + async (item) => + (await this.wallet!.getChainId()) === item.chain_id && + item.type === "gateway" + ); + } catch (error) { + throw new Error("Failed to get gateway address: " + error); + } + } else { + try { + gateway = (this.contracts as MainnetTestnetAddress[]).find( + async (item) => + (await this.signer!.getChainId()) === item.chain_id && + item.type === "gateway" + ); + } catch (error) { + throw new Error("Failed to get gateway address: " + error); + } + } + + if (!gateway) { + throw new Error(`Gateway address not found in signer or wallet`); + } + + return gateway.address; + } + } + public getChains(): { [key: string]: any } { return this.chains; } diff --git a/packages/client/src/evmCall.ts b/packages/client/src/evmCall.ts index b2b5f4f4..d170e7a4 100644 --- a/packages/client/src/evmCall.ts +++ b/packages/client/src/evmCall.ts @@ -24,7 +24,7 @@ import type { revertOptions, txOptions } from "./types"; export const evmCall = async function ( this: ZetaChainClient, args: { - gatewayEvm: string; + gatewayEvm?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -34,7 +34,12 @@ export const evmCall = async function ( ) { const signer = this.signer; const { utils } = ethers; - const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer); + const gatewayEvmAddress = args.gatewayEvm || this.getGatewayAddress(); + const gateway = new ethers.Contract( + gatewayEvmAddress, + GatewayABI.abi, + signer + ); const valuesArray = args.values.map((value, index) => { const type = args.types[index]; diff --git a/packages/client/src/evmDeposit.ts b/packages/client/src/evmDeposit.ts index 75111d67..5ce74150 100644 --- a/packages/client/src/evmDeposit.ts +++ b/packages/client/src/evmDeposit.ts @@ -27,7 +27,7 @@ export const evmDeposit = async function ( args: { amount: string; erc20: string; - gatewayEvm: string; + gatewayEvm?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -35,7 +35,12 @@ export const evmDeposit = async function ( ) { const signer = this.signer; const { utils } = ethers; - const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer); + const gatewayEvmAddress = args.gatewayEvm || this.getGatewayAddress(); + const gateway = new ethers.Contract( + gatewayEvmAddress, + GatewayABI.abi, + signer + ); const revertOptions = { abortAddress: "0x0000000000000000000000000000000000000000", // not used diff --git a/packages/client/src/evmDepositAndCall.ts b/packages/client/src/evmDepositAndCall.ts index 301361d1..815a648b 100644 --- a/packages/client/src/evmDepositAndCall.ts +++ b/packages/client/src/evmDepositAndCall.ts @@ -29,7 +29,7 @@ export const evmDepositAndCall = async function ( args: { amount: string; erc20: string; - gatewayEvm: string; + gatewayEvm?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -39,7 +39,12 @@ export const evmDepositAndCall = async function ( ) { const signer = this.signer; const { utils } = ethers; - const gateway = new ethers.Contract(args.gatewayEvm, GatewayABI.abi, signer); + const gatewayEvmAddress = args.gatewayEvm || this.getGatewayAddress(); + const gateway = new ethers.Contract( + gatewayEvmAddress, + GatewayABI.abi, + signer + ); const revertOptions = { abortAddress: "0x0000000000000000000000000000000000000000", // not used diff --git a/packages/client/src/zetachainCall.ts b/packages/client/src/zetachainCall.ts index 6f4d43a6..46c01367 100644 --- a/packages/client/src/zetachainCall.ts +++ b/packages/client/src/zetachainCall.ts @@ -32,7 +32,7 @@ export const zetachainCall = async function ( args: { callOptions: any; function: string; - gatewayZetaChain: string; + gatewayZetaChain?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -43,9 +43,10 @@ export const zetachainCall = async function ( ) { const signer = this.signer; const { utils } = ethers; - + const gatewayZetaChainAddress = + args.gatewayZetaChain || this.getGatewayAddress(); const gateway = new ethers.Contract( - args.gatewayZetaChain, + gatewayZetaChainAddress, GatewayABI.abi, signer ); diff --git a/packages/client/src/zetachainWithdraw.ts b/packages/client/src/zetachainWithdraw.ts index 5fdb7993..e8ddea49 100644 --- a/packages/client/src/zetachainWithdraw.ts +++ b/packages/client/src/zetachainWithdraw.ts @@ -28,7 +28,7 @@ export const zetachainWithdraw = async function ( this: ZetaChainClient, args: { amount: string; - gatewayZetaChain: string; + gatewayZetaChain?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -38,8 +38,10 @@ export const zetachainWithdraw = async function ( const signer = this.signer; const { utils } = ethers; + const gatewayZetaChainAddress = + args.gatewayZetaChain || this.getGatewayAddress(); const gateway = new ethers.Contract( - args.gatewayZetaChain, + gatewayZetaChainAddress, GatewayABI.abi, signer ); diff --git a/packages/client/src/zetachainWithdrawAndCall.ts b/packages/client/src/zetachainWithdrawAndCall.ts index 63ecc46c..f79b46f7 100644 --- a/packages/client/src/zetachainWithdrawAndCall.ts +++ b/packages/client/src/zetachainWithdrawAndCall.ts @@ -34,7 +34,7 @@ export const zetachainWithdrawAndCall = async function ( amount: string; callOptions: any; function?: string; - gatewayZetaChain: string; + gatewayZetaChain?: string; receiver: string; revertOptions: revertOptions; txOptions: txOptions; @@ -46,8 +46,10 @@ export const zetachainWithdrawAndCall = async function ( const signer = this.signer; const { utils } = ethers; + const gatewayZetaChainAddress = + args.gatewayZetaChain || this.getGatewayAddress(); const gateway = new ethers.Contract( - args.gatewayZetaChain, + gatewayZetaChainAddress, GatewayABI.abi, signer ); diff --git a/packages/tasks/src/evmCall.ts b/packages/tasks/src/evmCall.ts index 6258c936..8c255fdf 100644 --- a/packages/tasks/src/evmCall.ts +++ b/packages/tasks/src/evmCall.ts @@ -6,7 +6,8 @@ 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 network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const tx = await client.evmCall({ gatewayEvm: args.gatewayEvm, receiver: args.receiver, @@ -32,11 +33,7 @@ export const evmCall = async (args: any, hre: HardhatRuntimeEnvironment) => { task("evm-call", "Call a universal app", evmCall) .addParam("receiver", "Receiver address on ZetaChain") - .addOptionalParam( - "gatewayEvm", - "contract address of gateway on EVM", - "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0" - ) + .addOptionalParam("gatewayEvm", "contract address of gateway on EVM") .addFlag("callOnRevert", "Whether to call on revert") .addOptionalParam( "revertAddress", diff --git a/packages/tasks/src/evmDeposit.ts b/packages/tasks/src/evmDeposit.ts index f2568af2..c078ef97 100644 --- a/packages/tasks/src/evmDeposit.ts +++ b/packages/tasks/src/evmDeposit.ts @@ -6,7 +6,8 @@ import { ZetaChainClient } from "../../client/src/"; export const evmDeposit = async (args: any, hre: HardhatRuntimeEnvironment) => { try { const [signer] = await hre.ethers.getSigners(); - const client = new ZetaChainClient({ network: "testnet", signer }); + const network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const tx = await client.evmDeposit({ amount: args.amount, erc20: args.erc20, @@ -34,11 +35,7 @@ export const evmDeposit = async (args: any, hre: HardhatRuntimeEnvironment) => { task("evm-deposit", "Deposit tokens", evmDeposit) .addParam("receiver", "Receiver address on ZetaChain") - .addOptionalParam( - "gatewayEvm", - "contract address of gateway on EVM", - "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0" - ) + .addOptionalParam("gatewayEvm", "contract address of gateway on EVM") .addFlag("callOnRevert", "Whether to call on revert") .addOptionalParam( "revertAddress", diff --git a/packages/tasks/src/evmDepositAndCall.ts b/packages/tasks/src/evmDepositAndCall.ts index 02ccead7..d439a47e 100644 --- a/packages/tasks/src/evmDepositAndCall.ts +++ b/packages/tasks/src/evmDepositAndCall.ts @@ -9,7 +9,8 @@ export const evmDepositAndCall = async ( ) => { try { const [signer] = await hre.ethers.getSigners(); - const client = new ZetaChainClient({ network: "testnet", signer }); + const network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const tx = await client.evmDepositAndCall({ amount: args.amount, erc20: args.erc20, @@ -39,11 +40,7 @@ export const evmDepositAndCall = async ( task("evm-deposit-and-call", "Deposit tokens", evmDepositAndCall) .addParam("receiver", "Receiver address on ZetaChain") - .addOptionalParam( - "gatewayEvm", - "contract address of gateway on EVM", - "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0" - ) + .addOptionalParam("gatewayEvm", "contract address of gateway on EVM") .addFlag("callOnRevert", "Whether to call on revert") .addOptionalParam( "revertAddress", diff --git a/packages/tasks/src/zetachainCall.ts b/packages/tasks/src/zetachainCall.ts index 0599e4e0..d40785c3 100644 --- a/packages/tasks/src/zetachainCall.ts +++ b/packages/tasks/src/zetachainCall.ts @@ -14,7 +14,8 @@ export const zetachainCall = async ( try { const [signer] = await hre.ethers.getSigners(); - const client = new ZetaChainClient({ network: "testnet", signer }); + const network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const response = await client.zetachainCall({ callOptions, function: args.function, @@ -44,8 +45,7 @@ export const zetachainCall = async ( task("zetachain-call", "Call a contract on a connected chain", zetachainCall) .addOptionalParam( "gatewayZetaChain", - "contract address of gateway on ZetaChain", - "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0" + "contract address of gateway on ZetaChain" ) .addParam("zrc20", "The address of ZRC-20 to pay fees") .addFlag("callOnRevert", "Whether to call on revert") diff --git a/packages/tasks/src/zetachainWithdraw.ts b/packages/tasks/src/zetachainWithdraw.ts index da26a60e..d46551a2 100644 --- a/packages/tasks/src/zetachainWithdraw.ts +++ b/packages/tasks/src/zetachainWithdraw.ts @@ -9,7 +9,8 @@ export const zetachainWithdraw = async ( ) => { try { const [signer] = await hre.ethers.getSigners(); - const client = new ZetaChainClient({ network: "testnet", signer }); + const network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const response = await client.zetachainWithdraw({ amount: args.amount, gatewayZetaChain: args.gatewayZetaChain, @@ -37,8 +38,7 @@ export const zetachainWithdraw = async ( task("zetachain-withdraw", "Withdraw tokens from ZetaChain", zetachainWithdraw) .addOptionalParam( "gatewayZetaChain", - "contract address of gateway on ZetaChain", - "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0" + "contract address of gateway on ZetaChain" ) .addOptionalParam("zrc20", "The address of the ZRC20 token") .addFlag("callOnRevert", "Whether to call on revert") diff --git a/packages/tasks/src/zetachainWithdrawAndCall.ts b/packages/tasks/src/zetachainWithdrawAndCall.ts index 5f8fef4c..18af8b10 100644 --- a/packages/tasks/src/zetachainWithdrawAndCall.ts +++ b/packages/tasks/src/zetachainWithdrawAndCall.ts @@ -14,7 +14,8 @@ export const zetachainWithdrawAndCall = async ( }; const [signer] = await hre.ethers.getSigners(); - const client = new ZetaChainClient({ network: "testnet", signer }); + const network = hre.network.name; + const client = new ZetaChainClient({ network, signer }); const response = await client.zetachainWithdrawAndCall({ amount: args.amount, callOptions, @@ -50,8 +51,7 @@ task( ) .addOptionalParam( "gatewayZetaChain", - "contract address of gateway on ZetaChain", - "0xA51c1fc2f0D1a1b8494Ed1FE312d7C3a78Ed91C0" + "contract address of gateway on ZetaChain" ) .addOptionalParam("zrc20", "The address of the ZRC20 token") .addFlag("callOnRevert", "Whether to call on revert") diff --git a/typechain-types/factories/contracts/SwapHelperLib__factory.ts b/typechain-types/factories/contracts/SwapHelperLib__factory.ts index 297f2e3f..19079f0c 100644 --- a/typechain-types/factories/contracts/SwapHelperLib__factory.ts +++ b/typechain-types/factories/contracts/SwapHelperLib__factory.ts @@ -136,7 +136,7 @@ const _abi = [ ] as const; const _bytecode = - "0x6111d5610052600b82828239805160001a6073146045577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100405760003560e01c806354ce67ae14610045578063c63585cc14610075575b600080fd5b61005f600480360381019061005a9190610c69565b6100a5565b60405161006c9190610cdf565b60405180910390f35b61008f600480360381019061008a9190610cfa565b610489565b60405161009c9190610d5c565b60405180910390f35b6000808573ffffffffffffffffffffffffffffffffffffffff1663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101179190610d8c565b905060008673ffffffffffffffffffffffffffffffffffffffff1663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a9190610d8c565b90506060600267ffffffffffffffff8111156101a9576101a8610db9565b5b6040519080825280602002602001820160405280156101d75781602001602082028036833780820191505090505b50905086816000815181106101ef576101ee610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050858160018151811061023e5761023d610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505060006102858487846104fb565b9050600367ffffffffffffffff8111156102a2576102a1610db9565b5b6040519080825280602002602001820160405280156102d05781602001602082028036833780820191505090505b50915087826000815181106102e8576102e7610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050828260018151811061033757610336610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050868260028151811061038657610385610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505060006103cd8588856104fb565b905080600182516103de9190610e46565b815181106103ef576103ee610de8565b5b602002602001015182600184516104069190610e46565b8151811061041757610416610de8565b5b6020026020010151116104515780600182516104339190610e46565b8151811061044457610443610de8565b5b602002602001015161047a565b81600183516104609190610e46565b8151811061047157610470610de8565b5b60200260200101515b95505050505050949350505050565b60008060006104988585610677565b915091508582826040516020016104b0929190610ec2565b604051602081830303815290604052805190602001206040516020016104d7929190610fbc565b6040516020818303038152906040528051906020012060001c925050509392505050565b6060600282511015610539576040517f20db826700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b815167ffffffffffffffff81111561055457610553610db9565b5b6040519080825280602002602001820160405280156105825781602001602082028036833780820191505090505b509050828160008151811061059a57610599610de8565b5b60200260200101818152505060005b600183516105b79190610e46565b81101561066f5760008061060c878685815181106105d8576105d7610de8565b5b6020026020010151876001876105ee9190610ffe565b815181106105ff576105fe610de8565b5b6020026020010151610791565b9150915061063584848151811061062657610625610de8565b5b60200260200101518383610894565b846001856106439190610ffe565b8151811061065457610653610de8565b5b602002602001018181525050505080806001019150506105a9565b509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036106df576040517fcb1e7cfe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161061071957828461071c565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361078a576040517f78b507da00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b60008060006107a08585610988565b5090506000806107b1888888610aa2565b73ffffffffffffffffffffffffffffffffffffffff16630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa1580156107fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061081f91906110b4565b506dffffffffffffffffffffffffffff1691506dffffffffffffffffffffffffffff1691508273ffffffffffffffffffffffffffffffffffffffff168773ffffffffffffffffffffffffffffffffffffffff161461087e578082610881565b81815b8095508196505050505050935093915050565b60008084036108cf576040517f098fb56100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008314806108de5750600082145b15610915576040517fbb55fd2700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061092c6103e586610b2990919063ffffffff16565b905060006109438483610b2990919063ffffffff16565b9050600061096e836109606103e889610b2990919063ffffffff16565b610b8990919063ffffffff16565b9050808261097c9190611136565b93505050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036109f0576040517fbd969eb000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1610610a2a578284610a2d565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a9b576040517fd92e233d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b60008373ffffffffffffffffffffffffffffffffffffffff1663e6a4390584846040518363ffffffff1660e01b8152600401610adf929190611176565b602060405180830381865afa158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b209190610d8c565b90509392505050565b600080831480610b4d5750818383850292508281610b4a57610b49611107565b5b04145b610b83576040517f5797276a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b92915050565b6000818301905082811015610bca576040517fa259879500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b92915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c0082610bd5565b9050919050565b610c1081610bf5565b8114610c1b57600080fd5b50565b600081359050610c2d81610c07565b92915050565b6000819050919050565b610c4681610c33565b8114610c5157600080fd5b50565b600081359050610c6381610c3d565b92915050565b60008060008060808587031215610c8357610c82610bd0565b5b6000610c9187828801610c1e565b9450506020610ca287828801610c1e565b9350506040610cb387828801610c1e565b9250506060610cc487828801610c54565b91505092959194509250565b610cd981610c33565b82525050565b6000602082019050610cf46000830184610cd0565b92915050565b600080600060608486031215610d1357610d12610bd0565b5b6000610d2186828701610c1e565b9350506020610d3286828701610c1e565b9250506040610d4386828701610c1e565b9150509250925092565b610d5681610bf5565b82525050565b6000602082019050610d716000830184610d4d565b92915050565b600081519050610d8681610c07565b92915050565b600060208284031215610da257610da1610bd0565b5b6000610db084828501610d77565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610e5182610c33565b9150610e5c83610c33565b9250828203905081811115610e7457610e73610e17565b5b92915050565b60008160601b9050919050565b6000610e9282610e7a565b9050919050565b6000610ea482610e87565b9050919050565b610ebc610eb782610bf5565b610e99565b82525050565b6000610ece8285610eab565b601482019150610ede8284610eab565b6014820191508190509392505050565b600081905092915050565b7fff00000000000000000000000000000000000000000000000000000000000000600082015250565b6000610f2f600183610eee565b9150610f3a82610ef9565b600182019050919050565b6000819050919050565b6000819050919050565b610f6a610f6582610f45565b610f4f565b82525050565b7f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f600082015250565b6000610fa6602083610eee565b9150610fb182610f70565b602082019050919050565b6000610fc782610f22565b9150610fd38285610eab565b601482019150610fe38284610f59565b602082019150610ff282610f99565b91508190509392505050565b600061100982610c33565b915061101483610c33565b925082820190508082111561102c5761102b610e17565b5b92915050565b60006dffffffffffffffffffffffffffff82169050919050565b61105581611032565b811461106057600080fd5b50565b6000815190506110728161104c565b92915050565b600063ffffffff82169050919050565b61109181611078565b811461109c57600080fd5b50565b6000815190506110ae81611088565b92915050565b6000806000606084860312156110cd576110cc610bd0565b5b60006110db86828701611063565b93505060206110ec86828701611063565b92505060406110fd8682870161109f565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061114182610c33565b915061114c83610c33565b92508261115c5761115b611107565b5b828204905092915050565b61117081610bf5565b82525050565b600060408201905061118b6000830185611167565b6111986020830184611167565b939250505056fea2646970667358221220dadd3e100ef04c85d5a02036fa4da1104bb792971aa4fa9f47b428d6687d283564736f6c634300081a0033"; + "0x6111d5610052600b82828239805160001a6073146045577f4e487b7100000000000000000000000000000000000000000000000000000000600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100405760003560e01c806354ce67ae14610045578063c63585cc14610075575b600080fd5b61005f600480360381019061005a9190610c69565b6100a5565b60405161006c9190610cdf565b60405180910390f35b61008f600480360381019061008a9190610cfa565b610489565b60405161009c9190610d5c565b60405180910390f35b6000808573ffffffffffffffffffffffffffffffffffffffff1663c45a01556040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100f3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101179190610d8c565b905060008673ffffffffffffffffffffffffffffffffffffffff1663ad5c46486040518163ffffffff1660e01b8152600401602060405180830381865afa158015610166573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061018a9190610d8c565b90506060600267ffffffffffffffff8111156101a9576101a8610db9565b5b6040519080825280602002602001820160405280156101d75781602001602082028036833780820191505090505b50905086816000815181106101ef576101ee610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050858160018151811061023e5761023d610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505060006102858487846104fb565b9050600367ffffffffffffffff8111156102a2576102a1610db9565b5b6040519080825280602002602001820160405280156102d05781602001602082028036833780820191505090505b50915087826000815181106102e8576102e7610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050828260018151811061033757610336610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff1681525050868260028151811061038657610385610de8565b5b602002602001019073ffffffffffffffffffffffffffffffffffffffff16908173ffffffffffffffffffffffffffffffffffffffff168152505060006103cd8588856104fb565b905080600182516103de9190610e46565b815181106103ef576103ee610de8565b5b602002602001015182600184516104069190610e46565b8151811061041757610416610de8565b5b6020026020010151116104515780600182516104339190610e46565b8151811061044457610443610de8565b5b602002602001015161047a565b81600183516104609190610e46565b8151811061047157610470610de8565b5b60200260200101515b95505050505050949350505050565b60008060006104988585610677565b915091508582826040516020016104b0929190610ec2565b604051602081830303815290604052805190602001206040516020016104d7929190610fbc565b6040516020818303038152906040528051906020012060001c925050509392505050565b6060600282511015610539576040517f20db826700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b815167ffffffffffffffff81111561055457610553610db9565b5b6040519080825280602002602001820160405280156105825781602001602082028036833780820191505090505b509050828160008151811061059a57610599610de8565b5b60200260200101818152505060005b600183516105b79190610e46565b81101561066f5760008061060c878685815181106105d8576105d7610de8565b5b6020026020010151876001876105ee9190610ffe565b815181106105ff576105fe610de8565b5b6020026020010151610791565b9150915061063584848151811061062657610625610de8565b5b60200260200101518383610894565b846001856106439190610ffe565b8151811061065457610653610de8565b5b602002602001018181525050505080806001019150506105a9565b509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036106df576040517fcb1e7cfe00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff161061071957828461071c565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361078a576040517f78b507da00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b60008060006107a08585610988565b5090506000806107b1888888610aa2565b73ffffffffffffffffffffffffffffffffffffffff16630902f1ac6040518163ffffffff1660e01b8152600401606060405180830381865afa1580156107fb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061081f91906110b4565b506dffffffffffffffffffffffffffff1691506dffffffffffffffffffffffffffff1691508273ffffffffffffffffffffffffffffffffffffffff168773ffffffffffffffffffffffffffffffffffffffff161461087e578082610881565b81815b8095508196505050505050935093915050565b60008084036108cf576040517f098fb56100000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b60008314806108de5750600082145b15610915576040517fbb55fd2700000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b600061092c6103e586610b2990919063ffffffff16565b905060006109438483610b2990919063ffffffff16565b9050600061096e836109606103e889610b2990919063ffffffff16565b610b8990919063ffffffff16565b9050808261097c9190611136565b93505050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036109f0576040517fbd969eb000000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b8273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1610610a2a578284610a2d565b83835b8092508193505050600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a9b576040517fd92e233d00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b9250929050565b60008373ffffffffffffffffffffffffffffffffffffffff1663e6a4390584846040518363ffffffff1660e01b8152600401610adf929190611176565b602060405180830381865afa158015610afc573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b209190610d8c565b90509392505050565b600080831480610b4d5750818383850292508281610b4a57610b49611107565b5b04145b610b83576040517f5797276a00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b92915050565b6000818301905082811015610bca576040517fa259879500000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b92915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c0082610bd5565b9050919050565b610c1081610bf5565b8114610c1b57600080fd5b50565b600081359050610c2d81610c07565b92915050565b6000819050919050565b610c4681610c33565b8114610c5157600080fd5b50565b600081359050610c6381610c3d565b92915050565b60008060008060808587031215610c8357610c82610bd0565b5b6000610c9187828801610c1e565b9450506020610ca287828801610c1e565b9350506040610cb387828801610c1e565b9250506060610cc487828801610c54565b91505092959194509250565b610cd981610c33565b82525050565b6000602082019050610cf46000830184610cd0565b92915050565b600080600060608486031215610d1357610d12610bd0565b5b6000610d2186828701610c1e565b9350506020610d3286828701610c1e565b9250506040610d4386828701610c1e565b9150509250925092565b610d5681610bf5565b82525050565b6000602082019050610d716000830184610d4d565b92915050565b600081519050610d8681610c07565b92915050565b600060208284031215610da257610da1610bd0565b5b6000610db084828501610d77565b91505092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610e5182610c33565b9150610e5c83610c33565b9250828203905081811115610e7457610e73610e17565b5b92915050565b60008160601b9050919050565b6000610e9282610e7a565b9050919050565b6000610ea482610e87565b9050919050565b610ebc610eb782610bf5565b610e99565b82525050565b6000610ece8285610eab565b601482019150610ede8284610eab565b6014820191508190509392505050565b600081905092915050565b7fff00000000000000000000000000000000000000000000000000000000000000600082015250565b6000610f2f600183610eee565b9150610f3a82610ef9565b600182019050919050565b6000819050919050565b6000819050919050565b610f6a610f6582610f45565b610f4f565b82525050565b7f96e8ac4277198ff8b6f785478aa9a39f403cb768dd02cbee326c3e7da348845f600082015250565b6000610fa6602083610eee565b9150610fb182610f70565b602082019050919050565b6000610fc782610f22565b9150610fd38285610eab565b601482019150610fe38284610f59565b602082019150610ff282610f99565b91508190509392505050565b600061100982610c33565b915061101483610c33565b925082820190508082111561102c5761102b610e17565b5b92915050565b60006dffffffffffffffffffffffffffff82169050919050565b61105581611032565b811461106057600080fd5b50565b6000815190506110728161104c565b92915050565b600063ffffffff82169050919050565b61109181611078565b811461109c57600080fd5b50565b6000815190506110ae81611088565b92915050565b6000806000606084860312156110cd576110cc610bd0565b5b60006110db86828701611063565b93505060206110ec86828701611063565b92505060406110fd8682870161109f565b9150509250925092565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b600061114182610c33565b915061114c83610c33565b92508261115c5761115b611107565b5b828204905092915050565b61117081610bf5565b82525050565b600060408201905061118b6000830185611167565b6111986020830184611167565b939250505056fea2646970667358221220f8a7cdfbaca1847a7b2c275e0e78c76b49768d9d7d65b0a93b0510b44467fa2864736f6c634300081a0033"; type SwapHelperLibConstructorParams = | [signer?: Signer] diff --git a/yarn.lock b/yarn.lock index e85df870..a4de8652 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2655,13 +2655,20 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/networks@^10.0.0", "@zetachain/networks@v10.0.0": +"@zetachain/networks@^10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-10.0.0.tgz#dd5d14a0870f6b658644aded8c96859f15531089" integrity sha512-FPolaO19oVkSLSPDUA/Hu+8AhG3lDEslRDpLnMzbMbnNSC669Fkah0/TEf+6egrQbAifBRfFLzwWidAGs8oxtA== dependencies: dotenv "^16.1.4" +"@zetachain/networks@v10.0.0-rc1": + version "10.0.0-rc1" + resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-10.0.0-rc1.tgz#ef869694dffb7f73e2212dc656480b9fe1066e33" + integrity sha512-ggHrrvwGajLau86S1Q8yK42PDvLCGM++U601/Nq7LP4WWyhvMtexAAeAnI/A62ZHQ+IRJK25xD1zWuxU1ZL4Sg== + dependencies: + dotenv "^16.1.4" + "@zetachain/protocol-contracts@11.0.0-rc3": version "11.0.0-rc3" resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc3.tgz#9b719391d0728fd1b4e046c5f496180a45ecf0d5" @@ -8807,7 +8814,7 @@ string-length@^4.0.1: char-regex "^1.0.2" strip-ansi "^6.0.0" -"string-width-cjs@npm:string-width@^4.2.0": +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -8824,15 +8831,6 @@ string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string-width@^5.0.1, string-width@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" @@ -8884,7 +8882,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8905,13 +8903,6 @@ strip-ansi@^5.2.0: dependencies: ansi-regex "^4.1.0" -strip-ansi@^6.0.0, strip-ansi@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - strip-ansi@^7.0.1: version "7.1.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" @@ -9921,7 +9912,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -9939,15 +9930,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"