From 126bed5f670cc638c18057147a8b970daf3db107 Mon Sep 17 00:00:00 2001 From: lukema95 <867273263@qq.com> Date: Fri, 22 Nov 2024 23:14:52 +0800 Subject: [PATCH] add solana wallet to zetachain client, update deposit-solana --- package.json | 1 + packages/client/src/client.ts | 52 ++- packages/client/src/solanaDeposit.ts | 114 +++--- packages/tasks/src/solanaDeposit.ts | 42 ++- .../@openzeppelin/contracts/index.ts | 2 + .../draft-IERC6093.sol/IERC1155Errors.ts | 55 +++ .../draft-IERC6093.sol/IERC20Errors.ts | 55 +++ .../draft-IERC6093.sol/IERC721Errors.ts | 55 +++ .../interfaces/draft-IERC6093.sol/index.ts | 6 + .../contracts/interfaces/index.ts | 5 + .../contracts/token/ERC20/ERC20.ts | 110 +----- .../contracts/token/ERC20/IERC20.ts | 30 +- .../token/ERC20/extensions/IERC20Metadata.ts | 30 +- .../contracts/EthZetaMock.sol/ZetaEthMock.ts | 110 +----- typechain-types/contracts/TestZRC20.ts | 110 +----- typechain-types/contracts/shared/MockZRC20.ts | 110 +----- .../@openzeppelin/contracts/index.ts | 1 + .../IERC1155Errors__factory.ts | 128 +++++++ .../IERC20Errors__factory.ts | 112 ++++++ .../IERC721Errors__factory.ts | 129 +++++++ .../interfaces/draft-IERC6093.sol/index.ts | 6 + .../contracts/interfaces/index.ts | 4 + .../contracts/token/ERC20/ERC20__factory.ts | 189 +++++----- .../contracts/token/ERC20/IERC20__factory.ts | 6 +- .../extensions/IERC20Metadata__factory.ts | 6 +- .../EthZetaMock.sol/ZetaEthMock__factory.ts | 142 ++++--- .../factories/contracts/TestZRC20__factory.ts | 142 ++++--- .../contracts/shared/MockZRC20__factory.ts | 142 ++++--- typechain-types/hardhat.d.ts | 27 ++ typechain-types/index.ts | 6 + yarn.lock | 349 ++++++++++++++++-- 31 files changed, 1519 insertions(+), 757 deletions(-) create mode 100644 typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts create mode 100644 typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts create mode 100644 typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts create mode 100644 typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts create mode 100644 typechain-types/@openzeppelin/contracts/interfaces/index.ts create mode 100644 typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors__factory.ts create mode 100644 typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors__factory.ts create mode 100644 typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors__factory.ts create mode 100644 typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts create mode 100644 typechain-types/factories/@openzeppelin/contracts/interfaces/index.ts diff --git a/package.json b/package.json index 22cc6730..1f979dd7 100644 --- a/package.json +++ b/package.json @@ -92,6 +92,7 @@ "@nomiclabs/hardhat-ethers": "^2.2.3", "@openzeppelin/contracts": "^5.0.2", "@openzeppelin/contracts-upgradeable": "^5.0.2", + "@solana/wallet-adapter-react": "^0.15.35", "@solana/web3.js": "^1.95.3", "@uniswap/v2-periphery": "^1.1.0-beta.0", "@zetachain/faucet-cli": "^4.1.1", diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts index 3098191e..ef17605f 100644 --- a/packages/client/src/client.ts +++ b/packages/client/src/client.ts @@ -1,3 +1,6 @@ +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 type { Signer, Wallet } from "ethers"; import merge from "lodash/merge"; @@ -35,9 +38,36 @@ export interface ZetaChainClientParamsBase { export type ZetaChainClientParams = ZetaChainClientParamsBase & ( - | { signer: Signer; wallet?: never } - | { signer?: never; wallet: Wallet } - | { signer?: undefined; wallet?: undefined } + | { + signer: Signer; + solanaAdapter?: never; + solanaWallet?: never; + wallet?: never; + } + | { + signer?: never; + solanaAdapter: WalletContextState; + solanaWallet?: never; + wallet?: never; + } + | { + signer?: never; + solanaAdapter?: never; + solanaWallet: SolanaWallet; + wallet?: never; + } + | { + signer?: never; + solanaAdapter?: never; + solanaWallet?: never; + wallet: Wallet; + } + | { + signer?: undefined; + solanaAdapter?: undefined; + solanaWallet?: undefined; + wallet?: undefined; + } ); export class ZetaChainClient { @@ -45,6 +75,8 @@ export class ZetaChainClient { public network: string; public wallet: Wallet | undefined; public signer: any | undefined; + public solanaWallet: SolanaWallet | undefined; + public solanaAdapter: WalletContextState | undefined; /** * Initializes ZetaChainClient instance. @@ -98,6 +130,10 @@ export class ZetaChainClient { this.wallet = params.wallet; } else if (params.signer) { this.signer = params.signer; + } else if (params.solanaWallet) { + this.solanaWallet = params.solanaWallet; + } else if (params.solanaAdapter) { + this.solanaAdapter = params.solanaAdapter; } this.chains = { ...networks }; this.network = params.network || ""; @@ -117,6 +153,16 @@ export class ZetaChainClient { return this.chains; } + public isSolanaWalletConnected(): boolean { + return this.solanaAdapter?.connected || this.solanaWallet !== undefined; + } + + public getSolanaPublicKey(): PublicKey | null { + return ( + this.solanaAdapter?.publicKey || this.solanaWallet?.publicKey || null + ); + } + getEndpoint = getEndpoint; getBalances = getBalances; getForeignCoins = getForeignCoins; diff --git a/packages/client/src/solanaDeposit.ts b/packages/client/src/solanaDeposit.ts index c2df7d4e..d63ff2c5 100644 --- a/packages/client/src/solanaDeposit.ts +++ b/packages/client/src/solanaDeposit.ts @@ -1,5 +1,6 @@ import * as anchor from "@coral-xyz/anchor"; -import { Keypair } from "@solana/web3.js"; +import { TransactionMessage, VersionedTransaction } from "@solana/web3.js"; +import { Transaction } from "@solana/web3.js"; import { ethers } from "ethers"; import { ZetaChainClient } from "./client"; @@ -12,20 +13,50 @@ export const solanaDeposit = async function ( args: { amount: number; api: string; - idPath: string; params: any[]; recipient: string; } ) { - const keypair = await getKeypairFromFile(args.idPath); - const wallet = new anchor.Wallet(keypair); + if (!this.isSolanaWalletConnected()) { + throw new Error("Solana wallet not connected"); + } const connection = new anchor.web3.Connection(args.api); - const provider = new anchor.AnchorProvider( - connection, - wallet, - anchor.AnchorProvider.defaultOptions() - ); + + let provider; + if (this.solanaAdapter) { + const walletAdapter = { + publicKey: this.solanaAdapter.publicKey!, + signAllTransactions: async (txs: Transaction[]) => { + if (!this.solanaAdapter?.signAllTransactions) { + throw new Error( + "Wallet does not support signing multiple transactions" + ); + } + return await this.solanaAdapter.signAllTransactions(txs); + }, + signTransaction: async (tx: Transaction) => { + if (!this.solanaAdapter?.signTransaction) { + throw new Error("Wallet does not support transaction signing"); + } + return await this.solanaAdapter.signTransaction(tx); + }, + }; + + provider = new anchor.AnchorProvider( + connection, + walletAdapter as any, + anchor.AnchorProvider.defaultOptions() + ); + } else if (this.solanaWallet) { + provider = new anchor.AnchorProvider( + connection, + this.solanaWallet, + anchor.AnchorProvider.defaultOptions() + ); + } else { + throw new Error("No valid Solana wallet found"); + } anchor.setProvider(provider); const programId = new anchor.web3.PublicKey(Gateway_IDL.address); @@ -58,7 +89,9 @@ export const solanaDeposit = async function ( .deposit(depositAmount, m) .accounts({ pda: pdaAccount, - signer: wallet.publicKey, + signer: this.solanaAdapter + ? this.solanaAdapter.publicKey! + : this.solanaWallet!.publicKey, systemProgram: anchor.web3.SystemProgram.programId, }) .instruction(); @@ -66,45 +99,34 @@ export const solanaDeposit = async function ( tx.add(depositInstruction); // Send the transaction - const txSignature = await anchor.web3.sendAndConfirmTransaction( - connection, - tx, - [keypair] - ); + let txSignature; + if (this.solanaAdapter) { + const { blockhash, lastValidBlockHeight } = + await connection.getLatestBlockhash(); + const messageLegacy = new TransactionMessage({ + instructions: tx.instructions, + payerKey: this.solanaAdapter.publicKey!, + recentBlockhash: blockhash, + }).compileToV0Message(); - console.log("Transaction signature:", txSignature); - } catch (error) { - console.error("Transaction failed:", error); - } -}; + const versionedTransaction = new VersionedTransaction(messageLegacy); -const getKeypairFromFile = async (filepath: string) => { - const path = await import("path"); - if (filepath[0] === "~") { - const home = process.env.HOME || null; - if (home) { - filepath = path.join(home, filepath.slice(1)); + txSignature = await this.solanaAdapter.sendTransaction( + versionedTransaction, + connection + ); + } else { + txSignature = await anchor.web3.sendAndConfirmTransaction( + connection, + tx, + [this.solanaWallet!.payer] + ); } - } - // Get contents of file - let fileContents; - try { - const { readFile } = await import("fs/promises"); - const fileContentsBuffer = await readFile(filepath); - fileContents = fileContentsBuffer.toString(); + + console.log("Transaction signature:", txSignature); + + return txSignature; } catch (error) { - throw new Error(`Could not read keypair from file at '${filepath}'`); - } - // Parse contents of file - let parsedFileContents; - try { - parsedFileContents = Uint8Array.from(JSON.parse(fileContents)); - } catch (thrownObject) { - const error: any = thrownObject; - if (!error.message.includes("Unexpected token")) { - throw error; - } - throw new Error(`Invalid secret key file at '${filepath}'!`); + console.error("Transaction failed:", error); } - return Keypair.fromSecretKey(parsedFileContents); }; diff --git a/packages/tasks/src/solanaDeposit.ts b/packages/tasks/src/solanaDeposit.ts index 8c99b529..240028e2 100644 --- a/packages/tasks/src/solanaDeposit.ts +++ b/packages/tasks/src/solanaDeposit.ts @@ -1,3 +1,5 @@ +import { Wallet } from "@coral-xyz/anchor"; +import { Keypair } from "@solana/web3.js"; import bech32 from "bech32"; import { utils } from "ethers"; import { task } from "hardhat/config"; @@ -9,7 +11,12 @@ export const solanaDeposit = async ( args: any, hre: HardhatRuntimeEnvironment ) => { - const client = new ZetaChainClient({ network: "testnet" }); + const keypair = await getKeypairFromFile(args.idPath); + const wallet = new Wallet(keypair); + + const client = new ZetaChainClient({ + solanaWallet: wallet, + }); let recipient; try { if ((bech32 as any).decode(args.recipient)) { @@ -23,7 +30,7 @@ export const solanaDeposit = async ( } const { amount, api, idPath } = args; const params = [JSON.parse(args.types), args.values]; - await client.solanaDeposit({ amount, api, idPath, params, recipient }); + await client.solanaDeposit({ amount, api, params, recipient }); }; task("solana-deposit", "Solana deposit", solanaDeposit) @@ -33,3 +40,34 @@ task("solana-deposit", "Solana deposit", solanaDeposit) .addOptionalParam("idPath", "Path to id.json", "~/.config/solana/id.json") .addParam("types", "The types of the parameters (example: ['string'])") .addVariadicPositionalParam("values", "The values of the parameters"); + +export const getKeypairFromFile = async (filepath: string) => { + const path = await import("path"); + if (filepath[0] === "~") { + const home = process.env.HOME || null; + if (home) { + filepath = path.join(home, filepath.slice(1)); + } + } + // Get contents of file + let fileContents; + try { + const { readFile } = await import("fs/promises"); + const fileContentsBuffer = await readFile(filepath); + fileContents = fileContentsBuffer.toString(); + } catch (error) { + throw new Error(`Could not read keypair from file at '${filepath}'`); + } + // Parse contents of file + let parsedFileContents; + try { + parsedFileContents = Uint8Array.from(JSON.parse(fileContents)); + } catch (thrownObject) { + const error: any = thrownObject; + if (!error.message.includes("Unexpected token")) { + throw error; + } + throw new Error(`Invalid secret key file at '${filepath}'!`); + } + return Keypair.fromSecretKey(parsedFileContents); +}; diff --git a/typechain-types/@openzeppelin/contracts/index.ts b/typechain-types/@openzeppelin/contracts/index.ts index c2d4e462..b248dd25 100644 --- a/typechain-types/@openzeppelin/contracts/index.ts +++ b/typechain-types/@openzeppelin/contracts/index.ts @@ -1,5 +1,7 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ +import type * as interfaces from "./interfaces"; +export type { interfaces }; import type * as token from "./token"; export type { token }; diff --git a/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts new file mode 100644 index 00000000..2bd94bb0 --- /dev/null +++ b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors.ts @@ -0,0 +1,55 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +import type { BaseContract, Signer, utils } from "ethers"; + +import type { Listener, Provider } from "@ethersproject/providers"; +import type { + TypedEventFilter, + TypedEvent, + TypedListener, + OnEvent, +} from "../../../../common"; + +export interface IERC1155ErrorsInterface extends utils.Interface { + functions: {}; + + events: {}; +} + +export interface IERC1155Errors extends BaseContract { + connect(signerOrProvider: Signer | Provider | string): this; + attach(addressOrName: string): this; + deployed(): Promise; + + interface: IERC1155ErrorsInterface; + + queryFilter( + event: TypedEventFilter, + fromBlockOrBlockhash?: string | number | undefined, + toBlock?: string | number | undefined + ): Promise>; + + listeners( + eventFilter?: TypedEventFilter + ): Array>; + listeners(eventName?: string): Array; + removeAllListeners( + eventFilter: TypedEventFilter + ): this; + removeAllListeners(eventName?: string): this; + off: OnEvent; + on: OnEvent; + once: OnEvent; + removeListener: OnEvent; + + functions: {}; + + callStatic: {}; + + filters: {}; + + estimateGas: {}; + + populateTransaction: {}; +} diff --git a/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts new file mode 100644 index 00000000..3314d6e9 --- /dev/null +++ b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors.ts @@ -0,0 +1,55 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +import type { BaseContract, Signer, utils } from "ethers"; + +import type { Listener, Provider } from "@ethersproject/providers"; +import type { + TypedEventFilter, + TypedEvent, + TypedListener, + OnEvent, +} from "../../../../common"; + +export interface IERC20ErrorsInterface extends utils.Interface { + functions: {}; + + events: {}; +} + +export interface IERC20Errors extends BaseContract { + connect(signerOrProvider: Signer | Provider | string): this; + attach(addressOrName: string): this; + deployed(): Promise; + + interface: IERC20ErrorsInterface; + + queryFilter( + event: TypedEventFilter, + fromBlockOrBlockhash?: string | number | undefined, + toBlock?: string | number | undefined + ): Promise>; + + listeners( + eventFilter?: TypedEventFilter + ): Array>; + listeners(eventName?: string): Array; + removeAllListeners( + eventFilter: TypedEventFilter + ): this; + removeAllListeners(eventName?: string): this; + off: OnEvent; + on: OnEvent; + once: OnEvent; + removeListener: OnEvent; + + functions: {}; + + callStatic: {}; + + filters: {}; + + estimateGas: {}; + + populateTransaction: {}; +} diff --git a/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts new file mode 100644 index 00000000..e5e734ef --- /dev/null +++ b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors.ts @@ -0,0 +1,55 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +import type { BaseContract, Signer, utils } from "ethers"; + +import type { Listener, Provider } from "@ethersproject/providers"; +import type { + TypedEventFilter, + TypedEvent, + TypedListener, + OnEvent, +} from "../../../../common"; + +export interface IERC721ErrorsInterface extends utils.Interface { + functions: {}; + + events: {}; +} + +export interface IERC721Errors extends BaseContract { + connect(signerOrProvider: Signer | Provider | string): this; + attach(addressOrName: string): this; + deployed(): Promise; + + interface: IERC721ErrorsInterface; + + queryFilter( + event: TypedEventFilter, + fromBlockOrBlockhash?: string | number | undefined, + toBlock?: string | number | undefined + ): Promise>; + + listeners( + eventFilter?: TypedEventFilter + ): Array>; + listeners(eventName?: string): Array; + removeAllListeners( + eventFilter: TypedEventFilter + ): this; + removeAllListeners(eventName?: string): this; + off: OnEvent; + on: OnEvent; + once: OnEvent; + removeListener: OnEvent; + + functions: {}; + + callStatic: {}; + + filters: {}; + + estimateGas: {}; + + populateTransaction: {}; +} diff --git a/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts new file mode 100644 index 00000000..9415fdf5 --- /dev/null +++ b/typechain-types/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts @@ -0,0 +1,6 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +export type { IERC1155Errors } from "./IERC1155Errors"; +export type { IERC20Errors } from "./IERC20Errors"; +export type { IERC721Errors } from "./IERC721Errors"; diff --git a/typechain-types/@openzeppelin/contracts/interfaces/index.ts b/typechain-types/@openzeppelin/contracts/interfaces/index.ts new file mode 100644 index 00000000..d70b374b --- /dev/null +++ b/typechain-types/@openzeppelin/contracts/interfaces/index.ts @@ -0,0 +1,5 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +import type * as draftIerc6093Sol from "./draft-IERC6093.sol"; +export type { draftIerc6093Sol }; diff --git a/typechain-types/@openzeppelin/contracts/token/ERC20/ERC20.ts b/typechain-types/@openzeppelin/contracts/token/ERC20/ERC20.ts index 682e3cfd..74ffff9b 100644 --- a/typechain-types/@openzeppelin/contracts/token/ERC20/ERC20.ts +++ b/typechain-types/@openzeppelin/contracts/token/ERC20/ERC20.ts @@ -33,8 +33,6 @@ export interface ERC20Interface extends utils.Interface { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; "decimals()": FunctionFragment; - "decreaseAllowance(address,uint256)": FunctionFragment; - "increaseAllowance(address,uint256)": FunctionFragment; "name()": FunctionFragment; "symbol()": FunctionFragment; "totalSupply()": FunctionFragment; @@ -48,8 +46,6 @@ export interface ERC20Interface extends utils.Interface { | "approve" | "balanceOf" | "decimals" - | "decreaseAllowance" - | "increaseAllowance" | "name" | "symbol" | "totalSupply" @@ -70,14 +66,6 @@ export interface ERC20Interface extends utils.Interface { values: [PromiseOrValue] ): string; encodeFunctionData(functionFragment: "decimals", values?: undefined): string; - encodeFunctionData( - functionFragment: "decreaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; - encodeFunctionData( - functionFragment: "increaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData(functionFragment: "name", values?: undefined): string; encodeFunctionData(functionFragment: "symbol", values?: undefined): string; encodeFunctionData( @@ -101,14 +89,6 @@ export interface ERC20Interface extends utils.Interface { decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result; decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "decreaseAllowance", - data: BytesLike - ): Result; - decodeFunctionResult( - functionFragment: "increaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "name", data: BytesLike): Result; decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result; decodeFunctionResult( @@ -189,7 +169,7 @@ export interface ERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -200,18 +180,6 @@ export interface ERC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise<[number]>; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise<[string]>; symbol(overrides?: CallOverrides): Promise<[string]>; @@ -220,14 +188,14 @@ export interface ERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -240,7 +208,7 @@ export interface ERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -251,18 +219,6 @@ export interface ERC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -271,14 +227,14 @@ export interface ERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -291,7 +247,7 @@ export interface ERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -302,18 +258,6 @@ export interface ERC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -322,14 +266,14 @@ export interface ERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; }; @@ -367,7 +311,7 @@ export interface ERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -378,18 +322,6 @@ export interface ERC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -398,14 +330,14 @@ export interface ERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -419,7 +351,7 @@ export interface ERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -430,18 +362,6 @@ export interface ERC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -450,14 +370,14 @@ export interface ERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; diff --git a/typechain-types/@openzeppelin/contracts/token/ERC20/IERC20.ts b/typechain-types/@openzeppelin/contracts/token/ERC20/IERC20.ts index e99e80b8..2057fc6a 100644 --- a/typechain-types/@openzeppelin/contracts/token/ERC20/IERC20.ts +++ b/typechain-types/@openzeppelin/contracts/token/ERC20/IERC20.ts @@ -157,7 +157,7 @@ export interface IERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -170,14 +170,14 @@ export interface IERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -190,7 +190,7 @@ export interface IERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -203,14 +203,14 @@ export interface IERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -223,7 +223,7 @@ export interface IERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -236,14 +236,14 @@ export interface IERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; }; @@ -281,7 +281,7 @@ export interface IERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -294,14 +294,14 @@ export interface IERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -315,7 +315,7 @@ export interface IERC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -328,14 +328,14 @@ export interface IERC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; diff --git a/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.ts b/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.ts index 7a94b724..5dfaa60a 100644 --- a/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.ts +++ b/typechain-types/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.ts @@ -169,7 +169,7 @@ export interface IERC20Metadata extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -188,14 +188,14 @@ export interface IERC20Metadata extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -208,7 +208,7 @@ export interface IERC20Metadata extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -227,14 +227,14 @@ export interface IERC20Metadata extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -247,7 +247,7 @@ export interface IERC20Metadata extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -266,14 +266,14 @@ export interface IERC20Metadata extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; }; @@ -311,7 +311,7 @@ export interface IERC20Metadata extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -330,14 +330,14 @@ export interface IERC20Metadata extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -351,7 +351,7 @@ export interface IERC20Metadata extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -370,14 +370,14 @@ export interface IERC20Metadata extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; diff --git a/typechain-types/contracts/EthZetaMock.sol/ZetaEthMock.ts b/typechain-types/contracts/EthZetaMock.sol/ZetaEthMock.ts index 0fcf505d..30c78b96 100644 --- a/typechain-types/contracts/EthZetaMock.sol/ZetaEthMock.ts +++ b/typechain-types/contracts/EthZetaMock.sol/ZetaEthMock.ts @@ -33,8 +33,6 @@ export interface ZetaEthMockInterface extends utils.Interface { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; "decimals()": FunctionFragment; - "decreaseAllowance(address,uint256)": FunctionFragment; - "increaseAllowance(address,uint256)": FunctionFragment; "name()": FunctionFragment; "symbol()": FunctionFragment; "totalSupply()": FunctionFragment; @@ -48,8 +46,6 @@ export interface ZetaEthMockInterface extends utils.Interface { | "approve" | "balanceOf" | "decimals" - | "decreaseAllowance" - | "increaseAllowance" | "name" | "symbol" | "totalSupply" @@ -70,14 +66,6 @@ export interface ZetaEthMockInterface extends utils.Interface { values: [PromiseOrValue] ): string; encodeFunctionData(functionFragment: "decimals", values?: undefined): string; - encodeFunctionData( - functionFragment: "decreaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; - encodeFunctionData( - functionFragment: "increaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData(functionFragment: "name", values?: undefined): string; encodeFunctionData(functionFragment: "symbol", values?: undefined): string; encodeFunctionData( @@ -101,14 +89,6 @@ export interface ZetaEthMockInterface extends utils.Interface { decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result; decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "decreaseAllowance", - data: BytesLike - ): Result; - decodeFunctionResult( - functionFragment: "increaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "name", data: BytesLike): Result; decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result; decodeFunctionResult( @@ -189,7 +169,7 @@ export interface ZetaEthMock extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -200,18 +180,6 @@ export interface ZetaEthMock extends BaseContract { decimals(overrides?: CallOverrides): Promise<[number]>; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise<[string]>; symbol(overrides?: CallOverrides): Promise<[string]>; @@ -220,14 +188,14 @@ export interface ZetaEthMock extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -240,7 +208,7 @@ export interface ZetaEthMock extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -251,18 +219,6 @@ export interface ZetaEthMock extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -271,14 +227,14 @@ export interface ZetaEthMock extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -291,7 +247,7 @@ export interface ZetaEthMock extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -302,18 +258,6 @@ export interface ZetaEthMock extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -322,14 +266,14 @@ export interface ZetaEthMock extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; }; @@ -367,7 +311,7 @@ export interface ZetaEthMock extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -378,18 +322,6 @@ export interface ZetaEthMock extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -398,14 +330,14 @@ export interface ZetaEthMock extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; @@ -419,7 +351,7 @@ export interface ZetaEthMock extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -430,18 +362,6 @@ export interface ZetaEthMock extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -450,14 +370,14 @@ export interface ZetaEthMock extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; }; diff --git a/typechain-types/contracts/TestZRC20.ts b/typechain-types/contracts/TestZRC20.ts index 59949bac..0431e979 100644 --- a/typechain-types/contracts/TestZRC20.ts +++ b/typechain-types/contracts/TestZRC20.ts @@ -34,9 +34,7 @@ export interface TestZRC20Interface extends utils.Interface { "balanceOf(address)": FunctionFragment; "bytesToAddress(bytes,uint256,uint256)": FunctionFragment; "decimals()": FunctionFragment; - "decreaseAllowance(address,uint256)": FunctionFragment; "deposit(address,uint256)": FunctionFragment; - "increaseAllowance(address,uint256)": FunctionFragment; "name()": FunctionFragment; "symbol()": FunctionFragment; "totalSupply()": FunctionFragment; @@ -53,9 +51,7 @@ export interface TestZRC20Interface extends utils.Interface { | "balanceOf" | "bytesToAddress" | "decimals" - | "decreaseAllowance" | "deposit" - | "increaseAllowance" | "name" | "symbol" | "totalSupply" @@ -86,18 +82,10 @@ export interface TestZRC20Interface extends utils.Interface { ] ): string; encodeFunctionData(functionFragment: "decimals", values?: undefined): string; - encodeFunctionData( - functionFragment: "decreaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData( functionFragment: "deposit", values: [PromiseOrValue, PromiseOrValue] ): string; - encodeFunctionData( - functionFragment: "increaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData(functionFragment: "name", values?: undefined): string; encodeFunctionData(functionFragment: "symbol", values?: undefined): string; encodeFunctionData( @@ -133,15 +121,7 @@ export interface TestZRC20Interface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "decreaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "increaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "name", data: BytesLike): Result; decodeFunctionResult(functionFragment: "symbol", data: BytesLike): Result; decodeFunctionResult( @@ -227,7 +207,7 @@ export interface TestZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -245,24 +225,12 @@ export interface TestZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise<[number]>; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise<[string]>; symbol(overrides?: CallOverrides): Promise<[string]>; @@ -271,14 +239,14 @@ export interface TestZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -299,7 +267,7 @@ export interface TestZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -317,24 +285,12 @@ export interface TestZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -343,14 +299,14 @@ export interface TestZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -371,7 +327,7 @@ export interface TestZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -389,24 +345,12 @@ export interface TestZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, overrides?: CallOverrides ): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -415,14 +359,14 @@ export interface TestZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -468,7 +412,7 @@ export interface TestZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -486,24 +430,12 @@ export interface TestZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -512,14 +444,14 @@ export interface TestZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -541,7 +473,7 @@ export interface TestZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -559,24 +491,12 @@ export interface TestZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; symbol(overrides?: CallOverrides): Promise; @@ -585,14 +505,14 @@ export interface TestZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; diff --git a/typechain-types/contracts/shared/MockZRC20.ts b/typechain-types/contracts/shared/MockZRC20.ts index b1392243..4272829d 100644 --- a/typechain-types/contracts/shared/MockZRC20.ts +++ b/typechain-types/contracts/shared/MockZRC20.ts @@ -34,11 +34,9 @@ export interface MockZRC20Interface extends utils.Interface { "balanceOf(address)": FunctionFragment; "bytesToAddress(bytes,uint256,uint256)": FunctionFragment; "decimals()": FunctionFragment; - "decreaseAllowance(address,uint256)": FunctionFragment; "deposit(address,uint256)": FunctionFragment; "gasFee()": FunctionFragment; "gasFeeAddress()": FunctionFragment; - "increaseAllowance(address,uint256)": FunctionFragment; "name()": FunctionFragment; "setGasFee(uint256)": FunctionFragment; "setGasFeeAddress(address)": FunctionFragment; @@ -57,11 +55,9 @@ export interface MockZRC20Interface extends utils.Interface { | "balanceOf" | "bytesToAddress" | "decimals" - | "decreaseAllowance" | "deposit" | "gasFee" | "gasFeeAddress" - | "increaseAllowance" | "name" | "setGasFee" | "setGasFeeAddress" @@ -94,10 +90,6 @@ export interface MockZRC20Interface extends utils.Interface { ] ): string; encodeFunctionData(functionFragment: "decimals", values?: undefined): string; - encodeFunctionData( - functionFragment: "decreaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData( functionFragment: "deposit", values: [PromiseOrValue, PromiseOrValue] @@ -107,10 +99,6 @@ export interface MockZRC20Interface extends utils.Interface { functionFragment: "gasFeeAddress", values?: undefined ): string; - encodeFunctionData( - functionFragment: "increaseAllowance", - values: [PromiseOrValue, PromiseOrValue] - ): string; encodeFunctionData(functionFragment: "name", values?: undefined): string; encodeFunctionData( functionFragment: "setGasFee", @@ -154,20 +142,12 @@ export interface MockZRC20Interface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "decreaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result; decodeFunctionResult(functionFragment: "gasFee", data: BytesLike): Result; decodeFunctionResult( functionFragment: "gasFeeAddress", data: BytesLike ): Result; - decodeFunctionResult( - functionFragment: "increaseAllowance", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "name", data: BytesLike): Result; decodeFunctionResult(functionFragment: "setGasFee", data: BytesLike): Result; decodeFunctionResult( @@ -274,7 +254,7 @@ export interface MockZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -292,12 +272,6 @@ export interface MockZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise<[number]>; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, @@ -308,12 +282,6 @@ export interface MockZRC20 extends BaseContract { gasFeeAddress(overrides?: CallOverrides): Promise<[string]>; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise<[string]>; setGasFee( @@ -332,14 +300,14 @@ export interface MockZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -360,7 +328,7 @@ export interface MockZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -378,12 +346,6 @@ export interface MockZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, @@ -394,12 +356,6 @@ export interface MockZRC20 extends BaseContract { gasFeeAddress(overrides?: CallOverrides): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; setGasFee( @@ -418,14 +374,14 @@ export interface MockZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -446,7 +402,7 @@ export interface MockZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -464,12 +420,6 @@ export interface MockZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, @@ -480,12 +430,6 @@ export interface MockZRC20 extends BaseContract { gasFeeAddress(overrides?: CallOverrides): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: CallOverrides - ): Promise; - name(overrides?: CallOverrides): Promise; setGasFee( @@ -504,14 +448,14 @@ export interface MockZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -572,7 +516,7 @@ export interface MockZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -590,12 +534,6 @@ export interface MockZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, @@ -606,12 +544,6 @@ export interface MockZRC20 extends BaseContract { gasFeeAddress(overrides?: CallOverrides): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; setGasFee( @@ -630,14 +562,14 @@ export interface MockZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -659,7 +591,7 @@ export interface MockZRC20 extends BaseContract { approve( spender: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -677,12 +609,6 @@ export interface MockZRC20 extends BaseContract { decimals(overrides?: CallOverrides): Promise; - decreaseAllowance( - spender: PromiseOrValue, - subtractedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - deposit( to: PromiseOrValue, amount: PromiseOrValue, @@ -693,12 +619,6 @@ export interface MockZRC20 extends BaseContract { gasFeeAddress(overrides?: CallOverrides): Promise; - increaseAllowance( - spender: PromiseOrValue, - addedValue: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - name(overrides?: CallOverrides): Promise; setGasFee( @@ -717,14 +637,14 @@ export interface MockZRC20 extends BaseContract { transfer( to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; transferFrom( from: PromiseOrValue, to: PromiseOrValue, - amount: PromiseOrValue, + value: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; diff --git a/typechain-types/factories/@openzeppelin/contracts/index.ts b/typechain-types/factories/@openzeppelin/contracts/index.ts index a9780efc..074241cc 100644 --- a/typechain-types/factories/@openzeppelin/contracts/index.ts +++ b/typechain-types/factories/@openzeppelin/contracts/index.ts @@ -1,4 +1,5 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ +export * as interfaces from "./interfaces"; export * as token from "./token"; diff --git a/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors__factory.ts b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors__factory.ts new file mode 100644 index 00000000..ed45b0f3 --- /dev/null +++ b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors__factory.ts @@ -0,0 +1,128 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { Contract, Signer, utils } from "ethers"; +import type { Provider } from "@ethersproject/providers"; +import type { + IERC1155Errors, + IERC1155ErrorsInterface, +} from "../../../../../@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors"; + +const _abi = [ + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + { + internalType: "uint256", + name: "tokenId", + type: "uint256", + }, + ], + name: "ERC1155InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC1155InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "uint256", + name: "idsLength", + type: "uint256", + }, + { + internalType: "uint256", + name: "valuesLength", + type: "uint256", + }, + ], + name: "ERC1155InvalidArrayLength", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "operator", + type: "address", + }, + ], + name: "ERC1155InvalidOperator", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC1155InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC1155InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "operator", + type: "address", + }, + { + internalType: "address", + name: "owner", + type: "address", + }, + ], + name: "ERC1155MissingApprovalForAll", + type: "error", + }, +] as const; + +export class IERC1155Errors__factory { + static readonly abi = _abi; + static createInterface(): IERC1155ErrorsInterface { + return new utils.Interface(_abi) as IERC1155ErrorsInterface; + } + static connect( + address: string, + signerOrProvider: Signer | Provider + ): IERC1155Errors { + return new Contract(address, _abi, signerOrProvider) as IERC1155Errors; + } +} diff --git a/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors__factory.ts b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors__factory.ts new file mode 100644 index 00000000..8daa8d82 --- /dev/null +++ b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors__factory.ts @@ -0,0 +1,112 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { Contract, Signer, utils } from "ethers"; +import type { Provider } from "@ethersproject/providers"; +import type { + IERC20Errors, + IERC20ErrorsInterface, +} from "../../../../../@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors"; + +const _abi = [ + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + { + internalType: "uint256", + name: "allowance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientAllowance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC20InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC20InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC20InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + ], + name: "ERC20InvalidSpender", + type: "error", + }, +] as const; + +export class IERC20Errors__factory { + static readonly abi = _abi; + static createInterface(): IERC20ErrorsInterface { + return new utils.Interface(_abi) as IERC20ErrorsInterface; + } + static connect( + address: string, + signerOrProvider: Signer | Provider + ): IERC20Errors { + return new Contract(address, _abi, signerOrProvider) as IERC20Errors; + } +} diff --git a/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors__factory.ts b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors__factory.ts new file mode 100644 index 00000000..ae4681c2 --- /dev/null +++ b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors__factory.ts @@ -0,0 +1,129 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { Contract, Signer, utils } from "ethers"; +import type { Provider } from "@ethersproject/providers"; +import type { + IERC721Errors, + IERC721ErrorsInterface, +} from "../../../../../@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors"; + +const _abi = [ + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "tokenId", + type: "uint256", + }, + { + internalType: "address", + name: "owner", + type: "address", + }, + ], + name: "ERC721IncorrectOwner", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "operator", + type: "address", + }, + { + internalType: "uint256", + name: "tokenId", + type: "uint256", + }, + ], + name: "ERC721InsufficientApproval", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC721InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "operator", + type: "address", + }, + ], + name: "ERC721InvalidOperator", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "owner", + type: "address", + }, + ], + name: "ERC721InvalidOwner", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC721InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC721InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "uint256", + name: "tokenId", + type: "uint256", + }, + ], + name: "ERC721NonexistentToken", + type: "error", + }, +] as const; + +export class IERC721Errors__factory { + static readonly abi = _abi; + static createInterface(): IERC721ErrorsInterface { + return new utils.Interface(_abi) as IERC721ErrorsInterface; + } + static connect( + address: string, + signerOrProvider: Signer | Provider + ): IERC721Errors { + return new Contract(address, _abi, signerOrProvider) as IERC721Errors; + } +} diff --git a/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts new file mode 100644 index 00000000..571330ea --- /dev/null +++ b/typechain-types/factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/index.ts @@ -0,0 +1,6 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +export { IERC1155Errors__factory } from "./IERC1155Errors__factory"; +export { IERC20Errors__factory } from "./IERC20Errors__factory"; +export { IERC721Errors__factory } from "./IERC721Errors__factory"; diff --git a/typechain-types/factories/@openzeppelin/contracts/interfaces/index.ts b/typechain-types/factories/@openzeppelin/contracts/interfaces/index.ts new file mode 100644 index 00000000..82d047e8 --- /dev/null +++ b/typechain-types/factories/@openzeppelin/contracts/interfaces/index.ts @@ -0,0 +1,4 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +export * as draftIerc6093Sol from "./draft-IERC6093.sol"; diff --git a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory.ts b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory.ts index 5b02ab32..a7ef16c0 100644 --- a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory.ts +++ b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/ERC20__factory.ts @@ -1,9 +1,9 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; -import type { Provider, TransactionRequest } from "@ethersproject/providers"; -import type { PromiseOrValue } from "../../../../../common"; + +import { Contract, Signer, utils } from "ethers"; +import type { Provider } from "@ethersproject/providers"; import type { ERC20, ERC20Interface, @@ -13,18 +13,88 @@ const _abi = [ { inputs: [ { - internalType: "string", - name: "name_", - type: "string", + internalType: "address", + name: "spender", + type: "address", }, { - internalType: "string", - name: "symbol_", - type: "string", + internalType: "uint256", + name: "allowance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", }, ], - stateMutability: "nonpayable", - type: "constructor", + name: "ERC20InsufficientAllowance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC20InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC20InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC20InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + ], + name: "ERC20InvalidSpender", + type: "error", }, { anonymous: false, @@ -109,7 +179,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -156,54 +226,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "subtractedValue", - type: "uint256", - }, - ], - name: "decreaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "addedValue", - type: "uint256", - }, - ], - name: "increaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [], name: "name", @@ -252,7 +274,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -281,7 +303,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -298,48 +320,7 @@ const _abi = [ }, ] as const; -const _bytecode = - "0x608060405234801561001057600080fd5b50604051611777380380611777833981810160405281019061003291906101ce565b81600390816100419190610467565b5080600490816100519190610467565b505050610539565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6100c082610077565b810181811067ffffffffffffffff821117156100df576100de610088565b5b80604052505050565b60006100f2610059565b90506100fe82826100b7565b919050565b600067ffffffffffffffff82111561011e5761011d610088565b5b61012782610077565b9050602081019050919050565b60005b83811015610152578082015181840152602081019050610137565b60008484015250505050565b600061017161016c84610103565b6100e8565b90508281526020810184848401111561018d5761018c610072565b5b610198848285610134565b509392505050565b600082601f8301126101b5576101b461006d565b5b81516101c584826020860161015e565b91505092915050565b600080604083850312156101e5576101e4610063565b5b600083015167ffffffffffffffff81111561020357610202610068565b5b61020f858286016101a0565b925050602083015167ffffffffffffffff8111156102305761022f610068565b5b61023c858286016101a0565b9150509250929050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061029857607f821691505b6020821081036102ab576102aa610251565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026103137fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826102d6565b61031d86836102d6565b95508019841693508086168417925050509392505050565b6000819050919050565b6000819050919050565b600061036461035f61035a84610335565b61033f565b610335565b9050919050565b6000819050919050565b61037e83610349565b61039261038a8261036b565b8484546102e3565b825550505050565b600090565b6103a761039a565b6103b2818484610375565b505050565b5b818110156103d6576103cb60008261039f565b6001810190506103b8565b5050565b601f82111561041b576103ec816102b1565b6103f5846102c6565b81016020851015610404578190505b610418610410856102c6565b8301826103b7565b50505b505050565b600082821c905092915050565b600061043e60001984600802610420565b1980831691505092915050565b6000610457838361042d565b9150826002028217905092915050565b61047082610246565b67ffffffffffffffff81111561048957610488610088565b5b6104938254610280565b61049e8282856103da565b600060209050601f8311600181146104d157600084156104bf578287015190505b6104c9858261044b565b865550610531565b601f1984166104df866102b1565b60005b82811015610507578489015182556001820191506020850194506020810190506104e2565b868310156105245784890151610520601f89168261042d565b8355505b6001600288020188555050505b505050505050565b61122f806105486000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c80633950935111610071578063395093511461016857806370a082311461019857806395d89b41146101c8578063a457c2d7146101e6578063a9059cbb14610216578063dd62ed3e14610246576100a9565b806306fdde03146100ae578063095ea7b3146100cc57806318160ddd146100fc57806323b872dd1461011a578063313ce5671461014a575b600080fd5b6100b6610276565b6040516100c39190610b0c565b60405180910390f35b6100e660048036038101906100e19190610bc7565b610308565b6040516100f39190610c22565b60405180910390f35b61010461032b565b6040516101119190610c4c565b60405180910390f35b610134600480360381019061012f9190610c67565b610335565b6040516101419190610c22565b60405180910390f35b610152610364565b60405161015f9190610cd6565b60405180910390f35b610182600480360381019061017d9190610bc7565b61036d565b60405161018f9190610c22565b60405180910390f35b6101b260048036038101906101ad9190610cf1565b6103a4565b6040516101bf9190610c4c565b60405180910390f35b6101d06103ec565b6040516101dd9190610b0c565b60405180910390f35b61020060048036038101906101fb9190610bc7565b61047e565b60405161020d9190610c22565b60405180910390f35b610230600480360381019061022b9190610bc7565b6104f5565b60405161023d9190610c22565b60405180910390f35b610260600480360381019061025b9190610d1e565b610518565b60405161026d9190610c4c565b60405180910390f35b60606003805461028590610d8d565b80601f01602080910402602001604051908101604052809291908181526020018280546102b190610d8d565b80156102fe5780601f106102d3576101008083540402835291602001916102fe565b820191906000526020600020905b8154815290600101906020018083116102e157829003601f168201915b5050505050905090565b60008061031361059f565b90506103208185856105a7565b600191505092915050565b6000600254905090565b60008061034061059f565b905061034d858285610770565b6103588585856107fc565b60019150509392505050565b60006012905090565b60008061037861059f565b905061039981858561038a8589610518565b6103949190610ded565b6105a7565b600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546103fb90610d8d565b80601f016020809104026020016040519081016040528092919081815260200182805461042790610d8d565b80156104745780601f1061044957610100808354040283529160200191610474565b820191906000526020600020905b81548152906001019060200180831161045757829003601f168201915b5050505050905090565b60008061048961059f565b905060006104978286610518565b9050838110156104dc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104d390610e93565b60405180910390fd5b6104e982868684036105a7565b60019250505092915050565b60008061050061059f565b905061050d8185856107fc565b600191505092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610616576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161060d90610f25565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610685576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067c90610fb7565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040516107639190610c4c565b60405180910390a3505050565b600061077c8484610518565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146107f657818110156107e8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107df90611023565b60405180910390fd5b6107f584848484036105a7565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361086b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610862906110b5565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036108da576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108d190611147565b60405180910390fd5b6108e5838383610a72565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508181101561096b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610962906111d9565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610a599190610c4c565b60405180910390a3610a6c848484610a77565b50505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610ab6578082015181840152602081019050610a9b565b60008484015250505050565b6000601f19601f8301169050919050565b6000610ade82610a7c565b610ae88185610a87565b9350610af8818560208601610a98565b610b0181610ac2565b840191505092915050565b60006020820190508181036000830152610b268184610ad3565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610b5e82610b33565b9050919050565b610b6e81610b53565b8114610b7957600080fd5b50565b600081359050610b8b81610b65565b92915050565b6000819050919050565b610ba481610b91565b8114610baf57600080fd5b50565b600081359050610bc181610b9b565b92915050565b60008060408385031215610bde57610bdd610b2e565b5b6000610bec85828601610b7c565b9250506020610bfd85828601610bb2565b9150509250929050565b60008115159050919050565b610c1c81610c07565b82525050565b6000602082019050610c376000830184610c13565b92915050565b610c4681610b91565b82525050565b6000602082019050610c616000830184610c3d565b92915050565b600080600060608486031215610c8057610c7f610b2e565b5b6000610c8e86828701610b7c565b9350506020610c9f86828701610b7c565b9250506040610cb086828701610bb2565b9150509250925092565b600060ff82169050919050565b610cd081610cba565b82525050565b6000602082019050610ceb6000830184610cc7565b92915050565b600060208284031215610d0757610d06610b2e565b5b6000610d1584828501610b7c565b91505092915050565b60008060408385031215610d3557610d34610b2e565b5b6000610d4385828601610b7c565b9250506020610d5485828601610b7c565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680610da557607f821691505b602082108103610db857610db7610d5e565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610df882610b91565b9150610e0383610b91565b9250828201905080821115610e1b57610e1a610dbe565b5b92915050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b6000610e7d602583610a87565b9150610e8882610e21565b604082019050919050565b60006020820190508181036000830152610eac81610e70565b9050919050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b6000610f0f602483610a87565b9150610f1a82610eb3565b604082019050919050565b60006020820190508181036000830152610f3e81610f02565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b6000610fa1602283610a87565b9150610fac82610f45565b604082019050919050565b60006020820190508181036000830152610fd081610f94565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b600061100d601d83610a87565b915061101882610fd7565b602082019050919050565b6000602082019050818103600083015261103c81611000565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061109f602583610a87565b91506110aa82611043565b604082019050919050565b600060208201905081810360008301526110ce81611092565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b6000611131602383610a87565b915061113c826110d5565b604082019050919050565b6000602082019050818103600083015261116081611124565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b60006111c3602683610a87565b91506111ce82611167565b604082019050919050565b600060208201905081810360008301526111f2816111b6565b905091905056fea2646970667358221220c02b2a39acab76859bade0cecf97bf76856a692f704aac354de5a91a556a12b864736f6c634300081a0033"; - -type ERC20ConstructorParams = - | [signer?: Signer] - | ConstructorParameters; - -const isSuperArgs = ( - xs: ERC20ConstructorParams -): xs is ConstructorParameters => xs.length > 1; - -export class ERC20__factory extends ContractFactory { - constructor(...args: ERC20ConstructorParams) { - if (isSuperArgs(args)) { - super(...args); - } else { - super(_abi, _bytecode, args[0]); - } - } - - override deploy( - name_: PromiseOrValue, - symbol_: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise { - return super.deploy(name_, symbol_, overrides || {}) as Promise; - } - override getDeployTransaction( - name_: PromiseOrValue, - symbol_: PromiseOrValue, - overrides?: Overrides & { from?: PromiseOrValue } - ): TransactionRequest { - return super.getDeployTransaction(name_, symbol_, overrides || {}); - } - override attach(address: string): ERC20 { - return super.attach(address) as ERC20; - } - override connect(signer: Signer): ERC20__factory { - return super.connect(signer) as ERC20__factory; - } - - static readonly bytecode = _bytecode; +export class ERC20__factory { static readonly abi = _abi; static createInterface(): ERC20Interface { return new utils.Interface(_abi) as ERC20Interface; diff --git a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/IERC20__factory.ts b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/IERC20__factory.ts index cd7fa8f3..2852323a 100644 --- a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/IERC20__factory.ts +++ b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/IERC20__factory.ts @@ -93,7 +93,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -149,7 +149,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -178,7 +178,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], diff --git a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata__factory.ts b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata__factory.ts index 47c292bf..12eebd22 100644 --- a/typechain-types/factories/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata__factory.ts +++ b/typechain-types/factories/@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata__factory.ts @@ -93,7 +93,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -188,7 +188,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -217,7 +217,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], diff --git a/typechain-types/factories/contracts/EthZetaMock.sol/ZetaEthMock__factory.ts b/typechain-types/factories/contracts/EthZetaMock.sol/ZetaEthMock__factory.ts index 9dccd136..c014cfc4 100644 --- a/typechain-types/factories/contracts/EthZetaMock.sol/ZetaEthMock__factory.ts +++ b/typechain-types/factories/contracts/EthZetaMock.sol/ZetaEthMock__factory.ts @@ -33,6 +33,92 @@ const _abi = [ stateMutability: "nonpayable", type: "constructor", }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + { + internalType: "uint256", + name: "allowance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientAllowance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC20InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC20InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC20InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + ], + name: "ERC20InvalidSpender", + type: "error", + }, { anonymous: false, inputs: [ @@ -116,7 +202,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -163,54 +249,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "subtractedValue", - type: "uint256", - }, - ], - name: "decreaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "addedValue", - type: "uint256", - }, - ], - name: "increaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [], name: "name", @@ -259,7 +297,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -288,7 +326,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -306,7 +344,7 @@ const _abi = [ ] as const; const _bytecode = - "0x608060405234801561001057600080fd5b50604051611b6c380380611b6c8339818101604052810190610032919061030c565b6040518060400160405280600481526020017f5a657461000000000000000000000000000000000000000000000000000000008152506040518060400160405280600481526020017f5a4554410000000000000000000000000000000000000000000000000000000081525081600390816100ad9190610592565b5080600490816100bd9190610592565b5050506100f7826100d26100fe60201b60201c565b60ff16600a6100e191906107c6565b836100ec9190610811565b61010760201b60201c565b505061092e565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610176576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161016d906108b0565b60405180910390fd5b6101886000838361026960201b60201c565b806002600082825461019a91906108d0565b92505081905550806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161024b9190610913565b60405180910390a36102656000838361026e60201b60201c565b5050565b505050565b505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006102a382610278565b9050919050565b6102b381610298565b81146102be57600080fd5b50565b6000815190506102d0816102aa565b92915050565b6000819050919050565b6102e9816102d6565b81146102f457600080fd5b50565b600081519050610306816102e0565b92915050565b6000806040838503121561032357610322610273565b5b6000610331858286016102c1565b9250506020610342858286016102f7565b9150509250929050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806103cd57607f821691505b6020821081036103e0576103df610386565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026104487fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8261040b565b610452868361040b565b95508019841693508086168417925050509392505050565b6000819050919050565b600061048f61048a610485846102d6565b61046a565b6102d6565b9050919050565b6000819050919050565b6104a983610474565b6104bd6104b582610496565b848454610418565b825550505050565b600090565b6104d26104c5565b6104dd8184846104a0565b505050565b5b81811015610501576104f66000826104ca565b6001810190506104e3565b5050565b601f82111561054657610517816103e6565b610520846103fb565b8101602085101561052f578190505b61054361053b856103fb565b8301826104e2565b50505b505050565b600082821c905092915050565b60006105696000198460080261054b565b1980831691505092915050565b60006105828383610558565b9150826002028217905092915050565b61059b8261034c565b67ffffffffffffffff8111156105b4576105b3610357565b5b6105be82546103b5565b6105c9828285610505565b600060209050601f8311600181146105fc57600084156105ea578287015190505b6105f48582610576565b86555061065c565b601f19841661060a866103e6565b60005b828110156106325784890151825560018201915060208501945060208101905061060d565b8683101561064f578489015161064b601f891682610558565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156106ea578086048111156106c6576106c5610664565b5b60018516156106d55780820291505b80810290506106e385610693565b94506106aa565b94509492505050565b60008261070357600190506107bf565b8161071157600090506107bf565b8160018114610727576002811461073157610760565b60019150506107bf565b60ff84111561074357610742610664565b5b8360020a91508482111561075a57610759610664565b5b506107bf565b5060208310610133831016604e8410600b84101617156107955782820a9050838111156107905761078f610664565b5b6107bf565b6107a284848460016106a0565b925090508184048111156107b9576107b8610664565b5b81810290505b9392505050565b60006107d1826102d6565b91506107dc836102d6565b92506108097fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846106f3565b905092915050565b600061081c826102d6565b9150610827836102d6565b9250828202610835816102d6565b9150828204841483151761084c5761084b610664565b5b5092915050565b600082825260208201905092915050565b7f45524332303a206d696e7420746f20746865207a65726f206164647265737300600082015250565b600061089a601f83610853565b91506108a582610864565b602082019050919050565b600060208201905081810360008301526108c98161088d565b9050919050565b60006108db826102d6565b91506108e6836102d6565b92508282019050808211156108fe576108fd610664565b5b92915050565b61090d816102d6565b82525050565b60006020820190506109286000830184610904565b92915050565b61122f8061093d6000396000f3fe608060405234801561001057600080fd5b50600436106100a95760003560e01c80633950935111610071578063395093511461016857806370a082311461019857806395d89b41146101c8578063a457c2d7146101e6578063a9059cbb14610216578063dd62ed3e14610246576100a9565b806306fdde03146100ae578063095ea7b3146100cc57806318160ddd146100fc57806323b872dd1461011a578063313ce5671461014a575b600080fd5b6100b6610276565b6040516100c39190610b0c565b60405180910390f35b6100e660048036038101906100e19190610bc7565b610308565b6040516100f39190610c22565b60405180910390f35b61010461032b565b6040516101119190610c4c565b60405180910390f35b610134600480360381019061012f9190610c67565b610335565b6040516101419190610c22565b60405180910390f35b610152610364565b60405161015f9190610cd6565b60405180910390f35b610182600480360381019061017d9190610bc7565b61036d565b60405161018f9190610c22565b60405180910390f35b6101b260048036038101906101ad9190610cf1565b6103a4565b6040516101bf9190610c4c565b60405180910390f35b6101d06103ec565b6040516101dd9190610b0c565b60405180910390f35b61020060048036038101906101fb9190610bc7565b61047e565b60405161020d9190610c22565b60405180910390f35b610230600480360381019061022b9190610bc7565b6104f5565b60405161023d9190610c22565b60405180910390f35b610260600480360381019061025b9190610d1e565b610518565b60405161026d9190610c4c565b60405180910390f35b60606003805461028590610d8d565b80601f01602080910402602001604051908101604052809291908181526020018280546102b190610d8d565b80156102fe5780601f106102d3576101008083540402835291602001916102fe565b820191906000526020600020905b8154815290600101906020018083116102e157829003601f168201915b5050505050905090565b60008061031361059f565b90506103208185856105a7565b600191505092915050565b6000600254905090565b60008061034061059f565b905061034d858285610770565b6103588585856107fc565b60019150509392505050565b60006012905090565b60008061037861059f565b905061039981858561038a8589610518565b6103949190610ded565b6105a7565b600191505092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546103fb90610d8d565b80601f016020809104026020016040519081016040528092919081815260200182805461042790610d8d565b80156104745780601f1061044957610100808354040283529160200191610474565b820191906000526020600020905b81548152906001019060200180831161045757829003601f168201915b5050505050905090565b60008061048961059f565b905060006104978286610518565b9050838110156104dc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104d390610e93565b60405180910390fd5b6104e982868684036105a7565b60019250505092915050565b60008061050061059f565b905061050d8185856107fc565b600191505092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610616576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161060d90610f25565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610685576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067c90610fb7565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040516107639190610c4c565b60405180910390a3505050565b600061077c8484610518565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146107f657818110156107e8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107df90611023565b60405180910390fd5b6107f584848484036105a7565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361086b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610862906110b5565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036108da576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108d190611147565b60405180910390fd5b6108e5838383610a72565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508181101561096b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610962906111d9565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610a599190610c4c565b60405180910390a3610a6c848484610a77565b50505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610ab6578082015181840152602081019050610a9b565b60008484015250505050565b6000601f19601f8301169050919050565b6000610ade82610a7c565b610ae88185610a87565b9350610af8818560208601610a98565b610b0181610ac2565b840191505092915050565b60006020820190508181036000830152610b268184610ad3565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610b5e82610b33565b9050919050565b610b6e81610b53565b8114610b7957600080fd5b50565b600081359050610b8b81610b65565b92915050565b6000819050919050565b610ba481610b91565b8114610baf57600080fd5b50565b600081359050610bc181610b9b565b92915050565b60008060408385031215610bde57610bdd610b2e565b5b6000610bec85828601610b7c565b9250506020610bfd85828601610bb2565b9150509250929050565b60008115159050919050565b610c1c81610c07565b82525050565b6000602082019050610c376000830184610c13565b92915050565b610c4681610b91565b82525050565b6000602082019050610c616000830184610c3d565b92915050565b600080600060608486031215610c8057610c7f610b2e565b5b6000610c8e86828701610b7c565b9350506020610c9f86828701610b7c565b9250506040610cb086828701610bb2565b9150509250925092565b600060ff82169050919050565b610cd081610cba565b82525050565b6000602082019050610ceb6000830184610cc7565b92915050565b600060208284031215610d0757610d06610b2e565b5b6000610d1584828501610b7c565b91505092915050565b60008060408385031215610d3557610d34610b2e565b5b6000610d4385828601610b7c565b9250506020610d5485828601610b7c565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680610da557607f821691505b602082108103610db857610db7610d5e565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610df882610b91565b9150610e0383610b91565b9250828201905080821115610e1b57610e1a610dbe565b5b92915050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b6000610e7d602583610a87565b9150610e8882610e21565b604082019050919050565b60006020820190508181036000830152610eac81610e70565b9050919050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b6000610f0f602483610a87565b9150610f1a82610eb3565b604082019050919050565b60006020820190508181036000830152610f3e81610f02565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b6000610fa1602283610a87565b9150610fac82610f45565b604082019050919050565b60006020820190508181036000830152610fd081610f94565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b600061100d601d83610a87565b915061101882610fd7565b602082019050919050565b6000602082019050818103600083015261103c81611000565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061109f602583610a87565b91506110aa82611043565b604082019050919050565b600060208201905081810360008301526110ce81611092565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b6000611131602383610a87565b915061113c826110d5565b604082019050919050565b6000602082019050818103600083015261116081611124565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b60006111c3602683610a87565b91506111ce82611167565b604082019050919050565b600060208201905081810360008301526111f2816111b6565b905091905056fea26469706673582212206729f9c3d54744a258138456bea4c7e30a88115f37e813ec7627ab380156d73364736f6c634300081a0033"; + "0x608060405234801561001057600080fd5b506040516118b73803806118b78339818101604052810190610032919061044d565b6040518060400160405280600481526020017f5a657461000000000000000000000000000000000000000000000000000000008152506040518060400160405280600481526020017f5a4554410000000000000000000000000000000000000000000000000000000081525081600390816100ad91906106d3565b5080600490816100bd91906106d3565b5050506100f7826100d26100fe60201b60201c565b60ff16600a6100e19190610907565b836100ec9190610952565b61010760201b60201c565b5050610a53565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036101795760006040517fec442f0500000000000000000000000000000000000000000000000000000000815260040161017091906109a3565b60405180910390fd5b61018b6000838361018f60201b60201c565b5050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036101e15780600260008282546101d591906109be565b925050819055506102b4565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205490508181101561026d578381836040517fe450d38c00000000000000000000000000000000000000000000000000000000815260040161026493929190610a01565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036102fd578060026000828254039250508190555061034a565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516103a79190610a38565b60405180910390a3505050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006103e4826103b9565b9050919050565b6103f4816103d9565b81146103ff57600080fd5b50565b600081519050610411816103eb565b92915050565b6000819050919050565b61042a81610417565b811461043557600080fd5b50565b60008151905061044781610421565b92915050565b60008060408385031215610464576104636103b4565b5b600061047285828601610402565b925050602061048385828601610438565b9150509250929050565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061050e57607f821691505b602082108103610521576105206104c7565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026105897fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8261054c565b610593868361054c565b95508019841693508086168417925050509392505050565b6000819050919050565b60006105d06105cb6105c684610417565b6105ab565b610417565b9050919050565b6000819050919050565b6105ea836105b5565b6105fe6105f6826105d7565b848454610559565b825550505050565b600090565b610613610606565b61061e8184846105e1565b505050565b5b818110156106425761063760008261060b565b600181019050610624565b5050565b601f8211156106875761065881610527565b6106618461053c565b81016020851015610670578190505b61068461067c8561053c565b830182610623565b50505b505050565b600082821c905092915050565b60006106aa6000198460080261068c565b1980831691505092915050565b60006106c38383610699565b9150826002028217905092915050565b6106dc8261048d565b67ffffffffffffffff8111156106f5576106f4610498565b5b6106ff82546104f6565b61070a828285610646565b600060209050601f83116001811461073d576000841561072b578287015190505b61073585826106b7565b86555061079d565b601f19841661074b86610527565b60005b828110156107735784890151825560018201915060208501945060208101905061074e565b86831015610790578489015161078c601f891682610699565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b600185111561082b57808604811115610807576108066107a5565b5b60018516156108165780820291505b8081029050610824856107d4565b94506107eb565b94509492505050565b6000826108445760019050610900565b816108525760009050610900565b81600181146108685760028114610872576108a1565b6001915050610900565b60ff841115610884576108836107a5565b5b8360020a91508482111561089b5761089a6107a5565b5b50610900565b5060208310610133831016604e8410600b84101617156108d65782820a9050838111156108d1576108d06107a5565b5b610900565b6108e384848460016107e1565b925090508184048111156108fa576108f96107a5565b5b81810290505b9392505050565b600061091282610417565b915061091d83610417565b925061094a7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8484610834565b905092915050565b600061095d82610417565b915061096883610417565b925082820261097681610417565b9150828204841483151761098d5761098c6107a5565b5b5092915050565b61099d816103d9565b82525050565b60006020820190506109b86000830184610994565b92915050565b60006109c982610417565b91506109d483610417565b92508282019050808211156109ec576109eb6107a5565b5b92915050565b6109fb81610417565b82525050565b6000606082019050610a166000830186610994565b610a2360208301856109f2565b610a3060408301846109f2565b949350505050565b6000602082019050610a4d60008301846109f2565b92915050565b610e5580610a626000396000f3fe608060405234801561001057600080fd5b50600436106100935760003560e01c8063313ce56711610066578063313ce5671461013457806370a082311461015257806395d89b4114610182578063a9059cbb146101a0578063dd62ed3e146101d057610093565b806306fdde0314610098578063095ea7b3146100b657806318160ddd146100e657806323b872dd14610104575b600080fd5b6100a0610200565b6040516100ad9190610aa9565b60405180910390f35b6100d060048036038101906100cb9190610b64565b610292565b6040516100dd9190610bbf565b60405180910390f35b6100ee6102b5565b6040516100fb9190610be9565b60405180910390f35b61011e60048036038101906101199190610c04565b6102bf565b60405161012b9190610bbf565b60405180910390f35b61013c6102ee565b6040516101499190610c73565b60405180910390f35b61016c60048036038101906101679190610c8e565b6102f7565b6040516101799190610be9565b60405180910390f35b61018a61033f565b6040516101979190610aa9565b60405180910390f35b6101ba60048036038101906101b59190610b64565b6103d1565b6040516101c79190610bbf565b60405180910390f35b6101ea60048036038101906101e59190610cbb565b6103f4565b6040516101f79190610be9565b60405180910390f35b60606003805461020f90610d2a565b80601f016020809104026020016040519081016040528092919081815260200182805461023b90610d2a565b80156102885780601f1061025d57610100808354040283529160200191610288565b820191906000526020600020905b81548152906001019060200180831161026b57829003601f168201915b5050505050905090565b60008061029d61047b565b90506102aa818585610483565b600191505092915050565b6000600254905090565b6000806102ca61047b565b90506102d7858285610495565b6102e2858585610529565b60019150509392505050565b60006012905090565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60606004805461034e90610d2a565b80601f016020809104026020016040519081016040528092919081815260200182805461037a90610d2a565b80156103c75780601f1061039c576101008083540402835291602001916103c7565b820191906000526020600020905b8154815290600101906020018083116103aa57829003601f168201915b5050505050905090565b6000806103dc61047b565b90506103e9818585610529565b600191505092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b610490838383600161061d565b505050565b60006104a184846103f4565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146105235781811015610513578281836040517ffb8f41b200000000000000000000000000000000000000000000000000000000815260040161050a93929190610d6a565b60405180910390fd5b6105228484848403600061061d565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361059b5760006040517f96c6fd1e0000000000000000000000000000000000000000000000000000000081526004016105929190610da1565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361060d5760006040517fec442f050000000000000000000000000000000000000000000000000000000081526004016106049190610da1565b60405180910390fd5b6106188383836107f4565b505050565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff160361068f5760006040517fe602df050000000000000000000000000000000000000000000000000000000081526004016106869190610da1565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036107015760006040517f94280d620000000000000000000000000000000000000000000000000000000081526004016106f89190610da1565b60405180910390fd5b81600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555080156107ee578273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516107e59190610be9565b60405180910390a35b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361084657806002600082825461083a9190610deb565b92505081905550610919565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050818110156108d2578381836040517fe450d38c0000000000000000000000000000000000000000000000000000000081526004016108c993929190610d6a565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361096257806002600082825403925050819055506109af565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef83604051610a0c9190610be9565b60405180910390a3505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610a53578082015181840152602081019050610a38565b60008484015250505050565b6000601f19601f8301169050919050565b6000610a7b82610a19565b610a858185610a24565b9350610a95818560208601610a35565b610a9e81610a5f565b840191505092915050565b60006020820190508181036000830152610ac38184610a70565b905092915050565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610afb82610ad0565b9050919050565b610b0b81610af0565b8114610b1657600080fd5b50565b600081359050610b2881610b02565b92915050565b6000819050919050565b610b4181610b2e565b8114610b4c57600080fd5b50565b600081359050610b5e81610b38565b92915050565b60008060408385031215610b7b57610b7a610acb565b5b6000610b8985828601610b19565b9250506020610b9a85828601610b4f565b9150509250929050565b60008115159050919050565b610bb981610ba4565b82525050565b6000602082019050610bd46000830184610bb0565b92915050565b610be381610b2e565b82525050565b6000602082019050610bfe6000830184610bda565b92915050565b600080600060608486031215610c1d57610c1c610acb565b5b6000610c2b86828701610b19565b9350506020610c3c86828701610b19565b9250506040610c4d86828701610b4f565b9150509250925092565b600060ff82169050919050565b610c6d81610c57565b82525050565b6000602082019050610c886000830184610c64565b92915050565b600060208284031215610ca457610ca3610acb565b5b6000610cb284828501610b19565b91505092915050565b60008060408385031215610cd257610cd1610acb565b5b6000610ce085828601610b19565b9250506020610cf185828601610b19565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680610d4257607f821691505b602082108103610d5557610d54610cfb565b5b50919050565b610d6481610af0565b82525050565b6000606082019050610d7f6000830186610d5b565b610d8c6020830185610bda565b610d996040830184610bda565b949350505050565b6000602082019050610db66000830184610d5b565b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000610df682610b2e565b9150610e0183610b2e565b9250828201905080821115610e1957610e18610dbc565b5b9291505056fea264697066735822122008695f557841ddad327472e0c2386bec8cf424c511e2eae6e9e8b208860ea1c264736f6c634300081a0033"; type ZetaEthMockConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/contracts/TestZRC20__factory.ts b/typechain-types/factories/contracts/TestZRC20__factory.ts index f624a4d8..e2f9f8f4 100644 --- a/typechain-types/factories/contracts/TestZRC20__factory.ts +++ b/typechain-types/factories/contracts/TestZRC20__factory.ts @@ -35,6 +35,92 @@ const _abi = [ stateMutability: "nonpayable", type: "constructor", }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + { + internalType: "uint256", + name: "allowance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientAllowance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC20InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC20InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC20InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + ], + name: "ERC20InvalidSpender", + type: "error", + }, { anonymous: false, inputs: [ @@ -118,7 +204,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -194,30 +280,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "subtractedValue", - type: "uint256", - }, - ], - name: "decreaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { @@ -242,30 +304,6 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "addedValue", - type: "uint256", - }, - ], - name: "increaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [], name: "name", @@ -314,7 +352,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -343,7 +381,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -403,7 +441,7 @@ const _abi = [ ] as const; const _bytecode = - "0x608060405234801561001057600080fd5b5060405161202a38038061202a833981810160405281019061003291906103b5565b818181600390816100439190610657565b5080600490816100539190610657565b50505061008d3361006861009560201b60201c565b60ff16600a610077919061088b565b8561008291906108d6565b61009e60201b60201c565b5050506109f3565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361010d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161010490610975565b60405180910390fd5b61011f6000838361020060201b60201c565b80600260008282546101319190610995565b92505081905550806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516101e291906109d8565b60405180910390a36101fc6000838361020560201b60201c565b5050565b505050565b505050565b6000604051905090565b600080fd5b600080fd5b6000819050919050565b6102318161021e565b811461023c57600080fd5b50565b60008151905061024e81610228565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6102a78261025e565b810181811067ffffffffffffffff821117156102c6576102c561026f565b5b80604052505050565b60006102d961020a565b90506102e5828261029e565b919050565b600067ffffffffffffffff8211156103055761030461026f565b5b61030e8261025e565b9050602081019050919050565b60005b8381101561033957808201518184015260208101905061031e565b60008484015250505050565b6000610358610353846102ea565b6102cf565b90508281526020810184848401111561037457610373610259565b5b61037f84828561031b565b509392505050565b600082601f83011261039c5761039b610254565b5b81516103ac848260208601610345565b91505092915050565b6000806000606084860312156103ce576103cd610214565b5b60006103dc8682870161023f565b935050602084015167ffffffffffffffff8111156103fd576103fc610219565b5b61040986828701610387565b925050604084015167ffffffffffffffff81111561042a57610429610219565b5b61043686828701610387565b9150509250925092565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061049257607f821691505b6020821081036104a5576104a461044b565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261050d7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826104d0565b61051786836104d0565b95508019841693508086168417925050509392505050565b6000819050919050565b600061055461054f61054a8461021e565b61052f565b61021e565b9050919050565b6000819050919050565b61056e83610539565b61058261057a8261055b565b8484546104dd565b825550505050565b600090565b61059761058a565b6105a2818484610565565b505050565b5b818110156105c6576105bb60008261058f565b6001810190506105a8565b5050565b601f82111561060b576105dc816104ab565b6105e5846104c0565b810160208510156105f4578190505b610608610600856104c0565b8301826105a7565b50505b505050565b600082821c905092915050565b600061062e60001984600802610610565b1980831691505092915050565b6000610647838361061d565b9150826002028217905092915050565b61066082610440565b67ffffffffffffffff8111156106795761067861026f565b5b610683825461047a565b61068e8282856105ca565b600060209050601f8311600181146106c157600084156106af578287015190505b6106b9858261063b565b865550610721565b601f1984166106cf866104ab565b60005b828110156106f7578489015182556001820191506020850194506020810190506106d2565b868310156107145784890151610710601f89168261061d565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156107af5780860481111561078b5761078a610729565b5b600185161561079a5780820291505b80810290506107a885610758565b945061076f565b94509492505050565b6000826107c85760019050610884565b816107d65760009050610884565b81600181146107ec57600281146107f657610825565b6001915050610884565b60ff84111561080857610807610729565b5b8360020a91508482111561081f5761081e610729565b5b50610884565b5060208310610133831016604e8410600b841016171561085a5782820a90508381111561085557610854610729565b5b610884565b6108678484846001610765565b9250905081840481111561087e5761087d610729565b5b81810290505b9392505050565b60006108968261021e565b91506108a18361021e565b92506108ce7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846107b8565b905092915050565b60006108e18261021e565b91506108ec8361021e565b92508282026108fa8161021e565b9150828204841483151761091157610910610729565b5b5092915050565b600082825260208201905092915050565b7f45524332303a206d696e7420746f20746865207a65726f206164647265737300600082015250565b600061095f601f83610918565b915061096a82610929565b602082019050919050565b6000602082019050818103600083015261098e81610952565b9050919050565b60006109a08261021e565b91506109ab8361021e565b92508282019050808211156109c3576109c2610729565b5b92915050565b6109d28161021e565b82525050565b60006020820190506109ed60008301846109c9565b92915050565b61162880610a026000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c806347e7ef2411610097578063a9059cbb11610066578063a9059cbb146102c2578063c7012626146102f2578063d9eeebed14610322578063dd62ed3e14610341576100f5565b806347e7ef241461021457806370a082311461024457806395d89b4114610274578063a457c2d714610292576100f5565b806323b872dd116100d357806323b872dd146101665780632c27d3ab14610196578063313ce567146101c657806339509351146101e4576100f5565b806306fdde03146100fa578063095ea7b31461011857806318160ddd14610148575b600080fd5b610102610371565b60405161010f9190610d2f565b60405180910390f35b610132600480360381019061012d9190610def565b610403565b60405161013f9190610e4a565b60405180910390f35b610150610426565b60405161015d9190610e74565b60405180910390f35b610180600480360381019061017b9190610e8f565b610430565b60405161018d9190610e4a565b60405180910390f35b6101b060048036038101906101ab9190610f47565b61045f565b6040516101bd9190610fca565b60405180910390f35b6101ce6104d3565b6040516101db9190611001565b60405180910390f35b6101fe60048036038101906101f99190610def565b6104dc565b60405161020b9190610e4a565b60405180910390f35b61022e60048036038101906102299190610def565b610513565b60405161023b9190610e4a565b60405180910390f35b61025e6004803603810190610259919061101c565b61051f565b60405161026b9190610e74565b60405180910390f35b61027c610567565b6040516102899190610d2f565b60405180910390f35b6102ac60048036038101906102a79190610def565b6105f9565b6040516102b99190610e4a565b60405180910390f35b6102dc60048036038101906102d79190610def565b610670565b6040516102e99190610e4a565b60405180910390f35b61030c60048036038101906103079190611049565b610693565b6040516103199190610e4a565b60405180910390f35b61032a6106b8565b6040516103389291906110a9565b60405180910390f35b61035b600480360381019061035691906110d2565b6106c6565b6040516103689190610e74565b60405180910390f35b60606003805461038090611141565b80601f01602080910402602001604051908101604052809291908181526020018280546103ac90611141565b80156103f95780601f106103ce576101008083540402835291602001916103f9565b820191906000526020600020905b8154815290600101906020018083116103dc57829003601f168201915b5050505050905090565b60008061040e61074d565b905061041b818585610755565b600191505092915050565b6000600254905090565b60008061043b61074d565b905061044885828561091e565b6104538585856109aa565b60019150509392505050565b60008085858590858761047291906111a1565b9261047f939291906111df565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905082810151915050949350505050565b60006012905090565b6000806104e761074d565b90506105088185856104f985896106c6565b61050391906111a1565b610755565b600191505092915050565b60006001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60606004805461057690611141565b80601f01602080910402602001604051908101604052809291908181526020018280546105a290611141565b80156105ef5780601f106105c4576101008083540402835291602001916105ef565b820191906000526020600020905b8154815290600101906020018083116105d257829003601f168201915b5050505050905090565b60008061060461074d565b9050600061061282866106c6565b905083811015610657576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161064e9061128c565b60405180910390fd5b6106648286868403610755565b60019250505092915050565b60008061067b61074d565b90506106888185856109aa565b600191505092915050565b6000806106a28585600c610c20565b90506106ae8184610670565b9150509392505050565b600080306000915091509091565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036107c4576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107bb9061131e565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610833576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161082a906113b0565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040516109119190610e74565b60405180910390a3505050565b600061092a84846106c6565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146109a45781811015610996576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161098d9061141c565b60405180910390fd5b6109a38484848403610755565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610a19576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a10906114ae565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610a88576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610a7f90611540565b60405180910390fd5b610a93838383610c95565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610b19576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b10906115d2565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610c079190610e74565b60405180910390a3610c1a848484610c9a565b50505050565b60008084848490601486610c3491906111a1565b92610c41939291906111df565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610cd9578082015181840152602081019050610cbe565b60008484015250505050565b6000601f19601f8301169050919050565b6000610d0182610c9f565b610d0b8185610caa565b9350610d1b818560208601610cbb565b610d2481610ce5565b840191505092915050565b60006020820190508181036000830152610d498184610cf6565b905092915050565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610d8682610d5b565b9050919050565b610d9681610d7b565b8114610da157600080fd5b50565b600081359050610db381610d8d565b92915050565b6000819050919050565b610dcc81610db9565b8114610dd757600080fd5b50565b600081359050610de981610dc3565b92915050565b60008060408385031215610e0657610e05610d51565b5b6000610e1485828601610da4565b9250506020610e2585828601610dda565b9150509250929050565b60008115159050919050565b610e4481610e2f565b82525050565b6000602082019050610e5f6000830184610e3b565b92915050565b610e6e81610db9565b82525050565b6000602082019050610e896000830184610e65565b92915050565b600080600060608486031215610ea857610ea7610d51565b5b6000610eb686828701610da4565b9350506020610ec786828701610da4565b9250506040610ed886828701610dda565b9150509250925092565b600080fd5b600080fd5b600080fd5b60008083601f840112610f0757610f06610ee2565b5b8235905067ffffffffffffffff811115610f2457610f23610ee7565b5b602083019150836001820283011115610f4057610f3f610eec565b5b9250929050565b60008060008060608587031215610f6157610f60610d51565b5b600085013567ffffffffffffffff811115610f7f57610f7e610d56565b5b610f8b87828801610ef1565b94509450506020610f9e87828801610dda565b9250506040610faf87828801610dda565b91505092959194509250565b610fc481610d7b565b82525050565b6000602082019050610fdf6000830184610fbb565b92915050565b600060ff82169050919050565b610ffb81610fe5565b82525050565b60006020820190506110166000830184610ff2565b92915050565b60006020828403121561103257611031610d51565b5b600061104084828501610da4565b91505092915050565b60008060006040848603121561106257611061610d51565b5b600084013567ffffffffffffffff8111156110805761107f610d56565b5b61108c86828701610ef1565b9350935050602061109f86828701610dda565b9150509250925092565b60006040820190506110be6000830185610fbb565b6110cb6020830184610e65565b9392505050565b600080604083850312156110e9576110e8610d51565b5b60006110f785828601610da4565b925050602061110885828601610da4565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061115957607f821691505b60208210810361116c5761116b611112565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60006111ac82610db9565b91506111b783610db9565b92508282019050808211156111cf576111ce611172565b5b92915050565b600080fd5b600080fd5b600080858511156111f3576111f26111d5565b5b83861115611204576112036111da565b5b6001850283019150848603905094509492505050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b6000611276602583610caa565b91506112818261121a565b604082019050919050565b600060208201905081810360008301526112a581611269565b9050919050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b6000611308602483610caa565b9150611313826112ac565b604082019050919050565b60006020820190508181036000830152611337816112fb565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b600061139a602283610caa565b91506113a58261133e565b604082019050919050565b600060208201905081810360008301526113c98161138d565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b6000611406601d83610caa565b9150611411826113d0565b602082019050919050565b60006020820190508181036000830152611435816113f9565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b6000611498602583610caa565b91506114a38261143c565b604082019050919050565b600060208201905081810360008301526114c78161148b565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b600061152a602383610caa565b9150611535826114ce565b604082019050919050565b600060208201905081810360008301526115598161151d565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b60006115bc602683610caa565b91506115c782611560565b604082019050919050565b600060208201905081810360008301526115eb816115af565b905091905056fea26469706673582212203ba3e0eadcbf3df23612df3719aa28c933428a38a60e6090ad646d9d8cd23d0264736f6c634300081a0033"; + "0x608060405234801561001057600080fd5b50604051611d6d380380611d6d833981810160405281019061003291906104f6565b818181600390816100439190610798565b5080600490816100539190610798565b50505061008d3361006861009560201b60201c565b60ff16600a61007791906109cc565b856100829190610a17565b61009e60201b60201c565b505050610b4a565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036101105760006040517fec442f050000000000000000000000000000000000000000000000000000000081526004016101079190610a9a565b60405180910390fd5b6101226000838361012660201b60201c565b5050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361017857806002600082825461016c9190610ab5565b9250508190555061024b565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610204578381836040517fe450d38c0000000000000000000000000000000000000000000000000000000081526004016101fb93929190610af8565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361029457806002600082825403925050819055506102e1565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161033e9190610b2f565b60405180910390a3505050565b6000604051905090565b600080fd5b600080fd5b6000819050919050565b6103728161035f565b811461037d57600080fd5b50565b60008151905061038f81610369565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6103e88261039f565b810181811067ffffffffffffffff82111715610407576104066103b0565b5b80604052505050565b600061041a61034b565b905061042682826103df565b919050565b600067ffffffffffffffff821115610446576104456103b0565b5b61044f8261039f565b9050602081019050919050565b60005b8381101561047a57808201518184015260208101905061045f565b60008484015250505050565b60006104996104948461042b565b610410565b9050828152602081018484840111156104b5576104b461039a565b5b6104c084828561045c565b509392505050565b600082601f8301126104dd576104dc610395565b5b81516104ed848260208601610486565b91505092915050565b60008060006060848603121561050f5761050e610355565b5b600061051d86828701610380565b935050602084015167ffffffffffffffff81111561053e5761053d61035a565b5b61054a868287016104c8565b925050604084015167ffffffffffffffff81111561056b5761056a61035a565b5b610577868287016104c8565b9150509250925092565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806105d357607f821691505b6020821081036105e6576105e561058c565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261064e7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610611565b6106588683610611565b95508019841693508086168417925050509392505050565b6000819050919050565b600061069561069061068b8461035f565b610670565b61035f565b9050919050565b6000819050919050565b6106af8361067a565b6106c36106bb8261069c565b84845461061e565b825550505050565b600090565b6106d86106cb565b6106e38184846106a6565b505050565b5b81811015610707576106fc6000826106d0565b6001810190506106e9565b5050565b601f82111561074c5761071d816105ec565b61072684610601565b81016020851015610735578190505b61074961074185610601565b8301826106e8565b50505b505050565b600082821c905092915050565b600061076f60001984600802610751565b1980831691505092915050565b6000610788838361075e565b9150826002028217905092915050565b6107a182610581565b67ffffffffffffffff8111156107ba576107b96103b0565b5b6107c482546105bb565b6107cf82828561070b565b600060209050601f83116001811461080257600084156107f0578287015190505b6107fa858261077c565b865550610862565b601f198416610810866105ec565b60005b8281101561083857848901518255600182019150602085019450602081019050610813565b868310156108555784890151610851601f89168261075e565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156108f0578086048111156108cc576108cb61086a565b5b60018516156108db5780820291505b80810290506108e985610899565b94506108b0565b94509492505050565b60008261090957600190506109c5565b8161091757600090506109c5565b816001811461092d576002811461093757610966565b60019150506109c5565b60ff8411156109495761094861086a565b5b8360020a9150848211156109605761095f61086a565b5b506109c5565b5060208310610133831016604e8410600b841016171561099b5782820a9050838111156109965761099561086a565b5b6109c5565b6109a884848460016108a6565b925090508184048111156109bf576109be61086a565b5b81810290505b9392505050565b60006109d78261035f565b91506109e28361035f565b9250610a0f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846108f9565b905092915050565b6000610a228261035f565b9150610a2d8361035f565b9250828202610a3b8161035f565b91508282048414831517610a5257610a5161086a565b5b5092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610a8482610a59565b9050919050565b610a9481610a79565b82525050565b6000602082019050610aaf6000830184610a8b565b92915050565b6000610ac08261035f565b9150610acb8361035f565b9250828201905080821115610ae357610ae261086a565b5b92915050565b610af28161035f565b82525050565b6000606082019050610b0d6000830186610a8b565b610b1a6020830185610ae9565b610b276040830184610ae9565b949350505050565b6000602082019050610b446000830184610ae9565b92915050565b61121480610b596000396000f3fe608060405234801561001057600080fd5b50600436106100cf5760003560e01c806347e7ef241161008c578063a9059cbb11610066578063a9059cbb1461023c578063c70126261461026c578063d9eeebed1461029c578063dd62ed3e146102bb576100cf565b806347e7ef24146101be57806370a08231146101ee57806395d89b411461021e576100cf565b806306fdde03146100d4578063095ea7b3146100f257806318160ddd1461012257806323b872dd146101405780632c27d3ab14610170578063313ce567146101a0575b600080fd5b6100dc6102eb565b6040516100e99190610cbc565b60405180910390f35b61010c60048036038101906101079190610d7c565b61037d565b6040516101199190610dd7565b60405180910390f35b61012a6103a0565b6040516101379190610e01565b60405180910390f35b61015a60048036038101906101559190610e1c565b6103aa565b6040516101679190610dd7565b60405180910390f35b61018a60048036038101906101859190610ed4565b6103d9565b6040516101979190610f57565b60405180910390f35b6101a861044d565b6040516101b59190610f8e565b60405180910390f35b6101d860048036038101906101d39190610d7c565b610456565b6040516101e59190610dd7565b60405180910390f35b61020860048036038101906102039190610fa9565b610462565b6040516102159190610e01565b60405180910390f35b6102266104aa565b6040516102339190610cbc565b60405180910390f35b61025660048036038101906102519190610d7c565b61053c565b6040516102639190610dd7565b60405180910390f35b61028660048036038101906102819190610fd6565b61055f565b6040516102939190610dd7565b60405180910390f35b6102a4610584565b6040516102b2929190611036565b60405180910390f35b6102d560048036038101906102d0919061105f565b610592565b6040516102e29190610e01565b60405180910390f35b6060600380546102fa906110ce565b80601f0160208091040260200160405190810160405280929190818152602001828054610326906110ce565b80156103735780601f1061034857610100808354040283529160200191610373565b820191906000526020600020905b81548152906001019060200180831161035657829003601f168201915b5050505050905090565b600080610388610619565b9050610395818585610621565b600191505092915050565b6000600254905090565b6000806103b5610619565b90506103c2858285610633565b6103cd8585856106c7565b60019150509392505050565b6000808585859085876103ec919061112e565b926103f99392919061116c565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905082810151915050949350505050565b60006012905090565b60006001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546104b9906110ce565b80601f01602080910402602001604051908101604052809291908181526020018280546104e5906110ce565b80156105325780601f1061050757610100808354040283529160200191610532565b820191906000526020600020905b81548152906001019060200180831161051557829003601f168201915b5050505050905090565b600080610547610619565b90506105548185856106c7565b600191505092915050565b60008061056e8585600c6107bb565b905061057a818461053c565b9150509392505050565b600080306000915091509091565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b61062e8383836001610830565b505050565b600061063f8484610592565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146106c157818110156106b1578281836040517ffb8f41b20000000000000000000000000000000000000000000000000000000081526004016106a8939291906111a7565b60405180910390fd5b6106c084848484036000610830565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036107395760006040517f96c6fd1e0000000000000000000000000000000000000000000000000000000081526004016107309190610f57565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036107ab5760006040517fec442f050000000000000000000000000000000000000000000000000000000081526004016107a29190610f57565b60405180910390fd5b6107b6838383610a07565b505050565b600080848484906014866107cf919061112e565b926107dc9392919061116c565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036108a25760006040517fe602df050000000000000000000000000000000000000000000000000000000081526004016108999190610f57565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036109145760006040517f94280d6200000000000000000000000000000000000000000000000000000000815260040161090b9190610f57565b60405180910390fd5b81600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508015610a01578273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925846040516109f89190610e01565b60405180910390a35b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610a59578060026000828254610a4d919061112e565b92505081905550610b2c565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610ae5578381836040517fe450d38c000000000000000000000000000000000000000000000000000000008152600401610adc939291906111a7565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610b755780600260008282540392505081905550610bc2565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef83604051610c1f9190610e01565b60405180910390a3505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610c66578082015181840152602081019050610c4b565b60008484015250505050565b6000601f19601f8301169050919050565b6000610c8e82610c2c565b610c988185610c37565b9350610ca8818560208601610c48565b610cb181610c72565b840191505092915050565b60006020820190508181036000830152610cd68184610c83565b905092915050565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610d1382610ce8565b9050919050565b610d2381610d08565b8114610d2e57600080fd5b50565b600081359050610d4081610d1a565b92915050565b6000819050919050565b610d5981610d46565b8114610d6457600080fd5b50565b600081359050610d7681610d50565b92915050565b60008060408385031215610d9357610d92610cde565b5b6000610da185828601610d31565b9250506020610db285828601610d67565b9150509250929050565b60008115159050919050565b610dd181610dbc565b82525050565b6000602082019050610dec6000830184610dc8565b92915050565b610dfb81610d46565b82525050565b6000602082019050610e166000830184610df2565b92915050565b600080600060608486031215610e3557610e34610cde565b5b6000610e4386828701610d31565b9350506020610e5486828701610d31565b9250506040610e6586828701610d67565b9150509250925092565b600080fd5b600080fd5b600080fd5b60008083601f840112610e9457610e93610e6f565b5b8235905067ffffffffffffffff811115610eb157610eb0610e74565b5b602083019150836001820283011115610ecd57610ecc610e79565b5b9250929050565b60008060008060608587031215610eee57610eed610cde565b5b600085013567ffffffffffffffff811115610f0c57610f0b610ce3565b5b610f1887828801610e7e565b94509450506020610f2b87828801610d67565b9250506040610f3c87828801610d67565b91505092959194509250565b610f5181610d08565b82525050565b6000602082019050610f6c6000830184610f48565b92915050565b600060ff82169050919050565b610f8881610f72565b82525050565b6000602082019050610fa36000830184610f7f565b92915050565b600060208284031215610fbf57610fbe610cde565b5b6000610fcd84828501610d31565b91505092915050565b600080600060408486031215610fef57610fee610cde565b5b600084013567ffffffffffffffff81111561100d5761100c610ce3565b5b61101986828701610e7e565b9350935050602061102c86828701610d67565b9150509250925092565b600060408201905061104b6000830185610f48565b6110586020830184610df2565b9392505050565b6000806040838503121561107657611075610cde565b5b600061108485828601610d31565b925050602061109585828601610d31565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806110e657607f821691505b6020821081036110f9576110f861109f565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061113982610d46565b915061114483610d46565b925082820190508082111561115c5761115b6110ff565b5b92915050565b600080fd5b600080fd5b600080858511156111805761117f611162565b5b8386111561119157611190611167565b5b6001850283019150848603905094509492505050565b60006060820190506111bc6000830186610f48565b6111c96020830185610df2565b6111d66040830184610df2565b94935050505056fea264697066735822122062074f98320c38019bbeac1ec71cc040d7c4f7de4005577d6c256753db62984964736f6c634300081a0033"; type TestZRC20ConstructorParams = | [signer?: Signer] diff --git a/typechain-types/factories/contracts/shared/MockZRC20__factory.ts b/typechain-types/factories/contracts/shared/MockZRC20__factory.ts index 8d625b48..daeb318c 100644 --- a/typechain-types/factories/contracts/shared/MockZRC20__factory.ts +++ b/typechain-types/factories/contracts/shared/MockZRC20__factory.ts @@ -38,6 +38,92 @@ const _abi = [ stateMutability: "nonpayable", type: "constructor", }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + { + internalType: "uint256", + name: "allowance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientAllowance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + { + internalType: "uint256", + name: "balance", + type: "uint256", + }, + { + internalType: "uint256", + name: "needed", + type: "uint256", + }, + ], + name: "ERC20InsufficientBalance", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "approver", + type: "address", + }, + ], + name: "ERC20InvalidApprover", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "receiver", + type: "address", + }, + ], + name: "ERC20InvalidReceiver", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "sender", + type: "address", + }, + ], + name: "ERC20InvalidSender", + type: "error", + }, + { + inputs: [ + { + internalType: "address", + name: "spender", + type: "address", + }, + ], + name: "ERC20InvalidSpender", + type: "error", + }, { anonymous: false, inputs: [ @@ -158,7 +244,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -234,30 +320,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "subtractedValue", - type: "uint256", - }, - ], - name: "decreaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { @@ -308,30 +370,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "spender", - type: "address", - }, - { - internalType: "uint256", - name: "addedValue", - type: "uint256", - }, - ], - name: "increaseAllowance", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [], name: "name", @@ -406,7 +444,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -435,7 +473,7 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", + name: "value", type: "uint256", }, ], @@ -495,7 +533,7 @@ const _abi = [ ] as const; const _bytecode = - "0x608060405234801561001057600080fd5b5060405161232e38038061232e833981810160405281019061003291906103f6565b818181600390816100439190610698565b5080600490816100539190610698565b50505061008d336100686100d660201b60201c565b60ff16600a61007791906108cc565b856100829190610917565b6100df60201b60201c565b30600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050610a34565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160361014e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610145906109b6565b60405180910390fd5b6101606000838361024160201b60201c565b806002600082825461017291906109d6565b92505081905550806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040516102239190610a19565b60405180910390a361023d6000838361024660201b60201c565b5050565b505050565b505050565b6000604051905090565b600080fd5b600080fd5b6000819050919050565b6102728161025f565b811461027d57600080fd5b50565b60008151905061028f81610269565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6102e88261029f565b810181811067ffffffffffffffff82111715610307576103066102b0565b5b80604052505050565b600061031a61024b565b905061032682826102df565b919050565b600067ffffffffffffffff821115610346576103456102b0565b5b61034f8261029f565b9050602081019050919050565b60005b8381101561037a57808201518184015260208101905061035f565b60008484015250505050565b60006103996103948461032b565b610310565b9050828152602081018484840111156103b5576103b461029a565b5b6103c084828561035c565b509392505050565b600082601f8301126103dd576103dc610295565b5b81516103ed848260208601610386565b91505092915050565b60008060006060848603121561040f5761040e610255565b5b600061041d86828701610280565b935050602084015167ffffffffffffffff81111561043e5761043d61025a565b5b61044a868287016103c8565b925050604084015167ffffffffffffffff81111561046b5761046a61025a565b5b610477868287016103c8565b9150509250925092565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806104d357607f821691505b6020821081036104e6576104e561048c565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261054e7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610511565b6105588683610511565b95508019841693508086168417925050509392505050565b6000819050919050565b600061059561059061058b8461025f565b610570565b61025f565b9050919050565b6000819050919050565b6105af8361057a565b6105c36105bb8261059c565b84845461051e565b825550505050565b600090565b6105d86105cb565b6105e38184846105a6565b505050565b5b81811015610607576105fc6000826105d0565b6001810190506105e9565b5050565b601f82111561064c5761061d816104ec565b61062684610501565b81016020851015610635578190505b61064961064185610501565b8301826105e8565b50505b505050565b600082821c905092915050565b600061066f60001984600802610651565b1980831691505092915050565b6000610688838361065e565b9150826002028217905092915050565b6106a182610481565b67ffffffffffffffff8111156106ba576106b96102b0565b5b6106c482546104bb565b6106cf82828561060b565b600060209050601f83116001811461070257600084156106f0578287015190505b6106fa858261067c565b865550610762565b601f198416610710866104ec565b60005b8281101561073857848901518255600182019150602085019450602081019050610713565b868310156107555784890151610751601f89168261065e565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156107f0578086048111156107cc576107cb61076a565b5b60018516156107db5780820291505b80810290506107e985610799565b94506107b0565b94509492505050565b60008261080957600190506108c5565b8161081757600090506108c5565b816001811461082d576002811461083757610866565b60019150506108c5565b60ff8411156108495761084861076a565b5b8360020a9150848211156108605761085f61076a565b5b506108c5565b5060208310610133831016604e8410600b841016171561089b5782820a9050838111156108965761089561076a565b5b6108c5565b6108a884848460016107a6565b925090508184048111156108bf576108be61076a565b5b81810290505b9392505050565b60006108d78261025f565b91506108e28361025f565b925061090f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff84846107f9565b905092915050565b60006109228261025f565b915061092d8361025f565b925082820261093b8161025f565b915082820484148315176109525761095161076a565b5b5092915050565b600082825260208201905092915050565b7f45524332303a206d696e7420746f20746865207a65726f206164647265737300600082015250565b60006109a0601f83610959565b91506109ab8261096a565b602082019050919050565b600060208201905081810360008301526109cf81610993565b9050919050565b60006109e18261025f565b91506109ec8361025f565b9250828201905080821115610a0457610a0361076a565b5b92915050565b610a138161025f565b82525050565b6000602082019050610a2e6000830184610a0a565b92915050565b6118eb80610a436000396000f3fe608060405234801561001057600080fd5b50600436106101215760003560e01c8063658612e9116100ad578063a9059cbb11610071578063a9059cbb14610344578063c701262614610374578063d9eeebed146103a4578063dd62ed3e146103c3578063f7d8f616146103f357610121565b8063658612e91461028c578063678edca3146102aa57806370a08231146102c657806395d89b41146102f6578063a457c2d71461031457610121565b80632c27d3ab116100f45780632c27d3ab146101c2578063313ce567146101f257806339509351146102105780633e8a4ee11461024057806347e7ef241461025c57610121565b806306fdde0314610126578063095ea7b31461014457806318160ddd1461017457806323b872dd14610192575b600080fd5b61012e610411565b60405161013b9190610ee5565b60405180910390f35b61015e60048036038101906101599190610fa5565b6104a3565b60405161016b9190611000565b60405180910390f35b61017c6104c6565b604051610189919061102a565b60405180910390f35b6101ac60048036038101906101a79190611045565b6104d0565b6040516101b99190611000565b60405180910390f35b6101dc60048036038101906101d791906110fd565b6104ff565b6040516101e99190611180565b60405180910390f35b6101fa610573565b60405161020791906111b7565b60405180910390f35b61022a60048036038101906102259190610fa5565b61057c565b6040516102379190611000565b60405180910390f35b61025a600480360381019061025591906111d2565b6105b3565b005b61027660048036038101906102719190610fa5565b6105f7565b6040516102839190611000565b60405180910390f35b610294610603565b6040516102a1919061102a565b60405180910390f35b6102c460048036038101906102bf91906111ff565b610609565b005b6102e060048036038101906102db91906111d2565b610613565b6040516102ed919061102a565b60405180910390f35b6102fe61065b565b60405161030b9190610ee5565b60405180910390f35b61032e60048036038101906103299190610fa5565b6106ed565b60405161033b9190611000565b60405180910390f35b61035e60048036038101906103599190610fa5565b610764565b60405161036b9190611000565b60405180910390f35b61038e6004803603810190610389919061122c565b610787565b60405161039b9190611000565b60405180910390f35b6103ac610825565b6040516103ba92919061128c565b60405180910390f35b6103dd60048036038101906103d891906112b5565b610856565b6040516103ea919061102a565b60405180910390f35b6103fb6108dd565b6040516104089190611180565b60405180910390f35b60606003805461042090611324565b80601f016020809104026020016040519081016040528092919081815260200182805461044c90611324565b80156104995780601f1061046e57610100808354040283529160200191610499565b820191906000526020600020905b81548152906001019060200180831161047c57829003601f168201915b5050505050905090565b6000806104ae610903565b90506104bb81858561090b565b600191505092915050565b6000600254905090565b6000806104db610903565b90506104e8858285610ad4565b6104f3858585610b60565b60019150509392505050565b6000808585859085876105129190611384565b9261051f939291906113c2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905082810151915050949350505050565b60006012905090565b600080610587610903565b90506105a88185856105998589610856565b6105a39190611384565b61090b565b600191505092915050565b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006001905092915050565b60065481565b8060068190555050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60606004805461066a90611324565b80601f016020809104026020016040519081016040528092919081815260200182805461069690611324565b80156106e35780601f106106b8576101008083540402835291602001916106e3565b820191906000526020600020905b8154815290600101906020018083116106c657829003601f168201915b5050505050905090565b6000806106f8610903565b905060006107068286610856565b90508381101561074b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016107429061146f565b60405180910390fd5b610758828686840361090b565b60019250505092915050565b60008061076f610903565b905061077c818585610b60565b600191505092915050565b60008060208585905010156107a9576107a285856000610dd6565b90506107b8565b6107b58585600c610dd6565b90505b3373ffffffffffffffffffffffffffffffffffffffff167f9ffbffc04a397460ee1dbe8c9503e098090567d6b7f4b3c02a8617d800b6d9558686866006546000604051610809959493929190611521565b60405180910390a261081b8184610764565b9150509392505050565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600654915091509091565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160361097a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610971906115e1565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036109e9576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016109e090611673565b60405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92583604051610ac7919061102a565b60405180910390a3505050565b6000610ae08484610856565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8114610b5a5781811015610b4c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610b43906116df565b60405180910390fd5b610b59848484840361090b565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610bcf576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610bc690611771565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610c3e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c3590611803565b60405180910390fd5b610c49838383610e4b565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610ccf576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610cc690611895565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055508273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef84604051610dbd919061102a565b60405180910390a3610dd0848484610e50565b50505050565b60008084848490601486610dea9190611384565b92610df7939291906113c2565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b505050565b505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610e8f578082015181840152602081019050610e74565b60008484015250505050565b6000601f19601f8301169050919050565b6000610eb782610e55565b610ec18185610e60565b9350610ed1818560208601610e71565b610eda81610e9b565b840191505092915050565b60006020820190508181036000830152610eff8184610eac565b905092915050565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610f3c82610f11565b9050919050565b610f4c81610f31565b8114610f5757600080fd5b50565b600081359050610f6981610f43565b92915050565b6000819050919050565b610f8281610f6f565b8114610f8d57600080fd5b50565b600081359050610f9f81610f79565b92915050565b60008060408385031215610fbc57610fbb610f07565b5b6000610fca85828601610f5a565b9250506020610fdb85828601610f90565b9150509250929050565b60008115159050919050565b610ffa81610fe5565b82525050565b60006020820190506110156000830184610ff1565b92915050565b61102481610f6f565b82525050565b600060208201905061103f600083018461101b565b92915050565b60008060006060848603121561105e5761105d610f07565b5b600061106c86828701610f5a565b935050602061107d86828701610f5a565b925050604061108e86828701610f90565b9150509250925092565b600080fd5b600080fd5b600080fd5b60008083601f8401126110bd576110bc611098565b5b8235905067ffffffffffffffff8111156110da576110d961109d565b5b6020830191508360018202830111156110f6576110f56110a2565b5b9250929050565b6000806000806060858703121561111757611116610f07565b5b600085013567ffffffffffffffff81111561113557611134610f0c565b5b611141878288016110a7565b9450945050602061115487828801610f90565b925050604061116587828801610f90565b91505092959194509250565b61117a81610f31565b82525050565b60006020820190506111956000830184611171565b92915050565b600060ff82169050919050565b6111b18161119b565b82525050565b60006020820190506111cc60008301846111a8565b92915050565b6000602082840312156111e8576111e7610f07565b5b60006111f684828501610f5a565b91505092915050565b60006020828403121561121557611214610f07565b5b600061122384828501610f90565b91505092915050565b60008060006040848603121561124557611244610f07565b5b600084013567ffffffffffffffff81111561126357611262610f0c565b5b61126f868287016110a7565b9350935050602061128286828701610f90565b9150509250925092565b60006040820190506112a16000830185611171565b6112ae602083018461101b565b9392505050565b600080604083850312156112cc576112cb610f07565b5b60006112da85828601610f5a565b92505060206112eb85828601610f5a565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061133c57607f821691505b60208210810361134f5761134e6112f5565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061138f82610f6f565b915061139a83610f6f565b92508282019050808211156113b2576113b1611355565b5b92915050565b600080fd5b600080fd5b600080858511156113d6576113d56113b8565b5b838611156113e7576113e66113bd565b5b6001850283019150848603905094509492505050565b7f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f7760008201527f207a65726f000000000000000000000000000000000000000000000000000000602082015250565b6000611459602583610e60565b9150611464826113fd565b604082019050919050565b600060208201905081810360008301526114888161144c565b9050919050565b600082825260208201905092915050565b82818337600083830152505050565b60006114bb838561148f565b93506114c88385846114a0565b6114d183610e9b565b840190509392505050565b6000819050919050565b6000819050919050565b600061150b611506611501846114dc565b6114e6565b610f6f565b9050919050565b61151b816114f0565b82525050565b6000608082019050818103600083015261153c8187896114af565b905061154b602083018661101b565b611558604083018561101b565b6115656060830184611512565b9695505050505050565b7f45524332303a20617070726f76652066726f6d20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b60006115cb602483610e60565b91506115d68261156f565b604082019050919050565b600060208201905081810360008301526115fa816115be565b9050919050565b7f45524332303a20617070726f766520746f20746865207a65726f20616464726560008201527f7373000000000000000000000000000000000000000000000000000000000000602082015250565b600061165d602283610e60565b915061166882611601565b604082019050919050565b6000602082019050818103600083015261168c81611650565b9050919050565b7f45524332303a20696e73756666696369656e7420616c6c6f77616e6365000000600082015250565b60006116c9601d83610e60565b91506116d482611693565b602082019050919050565b600060208201905081810360008301526116f8816116bc565b9050919050565b7f45524332303a207472616e736665722066726f6d20746865207a65726f20616460008201527f6472657373000000000000000000000000000000000000000000000000000000602082015250565b600061175b602583610e60565b9150611766826116ff565b604082019050919050565b6000602082019050818103600083015261178a8161174e565b9050919050565b7f45524332303a207472616e7366657220746f20746865207a65726f206164647260008201527f6573730000000000000000000000000000000000000000000000000000000000602082015250565b60006117ed602383610e60565b91506117f882611791565b604082019050919050565b6000602082019050818103600083015261181c816117e0565b9050919050565b7f45524332303a207472616e7366657220616d6f756e742065786365656473206260008201527f616c616e63650000000000000000000000000000000000000000000000000000602082015250565b600061187f602683610e60565b915061188a82611823565b604082019050919050565b600060208201905081810360008301526118ae81611872565b905091905056fea2646970667358221220c86adff1e41c65306dd69ccdaa8bb5d5bfaa0708fc0084b93b9871b1e0ac601464736f6c634300081a0033"; + "0x608060405234801561001057600080fd5b5060405161208138038061208183398181016040528101906100329190610537565b8181816003908161004391906107d9565b50806004908161005391906107d9565b50505061008d336100686100d660201b60201c565b60ff16600a6100779190610a0d565b856100829190610a58565b6100df60201b60201c565b30600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550505050610b8b565b60006012905090565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036101515760006040517fec442f050000000000000000000000000000000000000000000000000000000081526004016101489190610adb565b60405180910390fd5b6101636000838361016760201b60201c565b5050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036101b95780600260008282546101ad9190610af6565b9250508190555061028c565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610245578381836040517fe450d38c00000000000000000000000000000000000000000000000000000000815260040161023c93929190610b39565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036102d55780600260008282540392505081905550610322565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef8360405161037f9190610b70565b60405180910390a3505050565b6000604051905090565b600080fd5b600080fd5b6000819050919050565b6103b3816103a0565b81146103be57600080fd5b50565b6000815190506103d0816103aa565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610429826103e0565b810181811067ffffffffffffffff82111715610448576104476103f1565b5b80604052505050565b600061045b61038c565b90506104678282610420565b919050565b600067ffffffffffffffff821115610487576104866103f1565b5b610490826103e0565b9050602081019050919050565b60005b838110156104bb5780820151818401526020810190506104a0565b60008484015250505050565b60006104da6104d58461046c565b610451565b9050828152602081018484840111156104f6576104f56103db565b5b61050184828561049d565b509392505050565b600082601f83011261051e5761051d6103d6565b5b815161052e8482602086016104c7565b91505092915050565b6000806000606084860312156105505761054f610396565b5b600061055e868287016103c1565b935050602084015167ffffffffffffffff81111561057f5761057e61039b565b5b61058b86828701610509565b925050604084015167ffffffffffffffff8111156105ac576105ab61039b565b5b6105b886828701610509565b9150509250925092565b600081519050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b6000600282049050600182168061061457607f821691505b602082108103610627576106266105cd565b5b50919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261068f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82610652565b6106998683610652565b95508019841693508086168417925050509392505050565b6000819050919050565b60006106d66106d16106cc846103a0565b6106b1565b6103a0565b9050919050565b6000819050919050565b6106f0836106bb565b6107046106fc826106dd565b84845461065f565b825550505050565b600090565b61071961070c565b6107248184846106e7565b505050565b5b818110156107485761073d600082610711565b60018101905061072a565b5050565b601f82111561078d5761075e8161062d565b61076784610642565b81016020851015610776578190505b61078a61078285610642565b830182610729565b50505b505050565b600082821c905092915050565b60006107b060001984600802610792565b1980831691505092915050565b60006107c9838361079f565b9150826002028217905092915050565b6107e2826105c2565b67ffffffffffffffff8111156107fb576107fa6103f1565b5b61080582546105fc565b61081082828561074c565b600060209050601f8311600181146108435760008415610831578287015190505b61083b85826107bd565b8655506108a3565b601f1984166108518661062d565b60005b8281101561087957848901518255600182019150602085019450602081019050610854565b868310156108965784890151610892601f89168261079f565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b60008160011c9050919050565b6000808291508390505b60018511156109315780860481111561090d5761090c6108ab565b5b600185161561091c5780820291505b808102905061092a856108da565b94506108f1565b94509492505050565b60008261094a5760019050610a06565b816109585760009050610a06565b816001811461096e5760028114610978576109a7565b6001915050610a06565b60ff84111561098a576109896108ab565b5b8360020a9150848211156109a1576109a06108ab565b5b50610a06565b5060208310610133831016604e8410600b84101617156109dc5782820a9050838111156109d7576109d66108ab565b5b610a06565b6109e984848460016108e7565b92509050818404811115610a00576109ff6108ab565b5b81810290505b9392505050565b6000610a18826103a0565b9150610a23836103a0565b9250610a507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff848461093a565b905092915050565b6000610a63826103a0565b9150610a6e836103a0565b9250828202610a7c816103a0565b91508282048414831517610a9357610a926108ab565b5b5092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610ac582610a9a565b9050919050565b610ad581610aba565b82525050565b6000602082019050610af06000830184610acc565b92915050565b6000610b01826103a0565b9150610b0c836103a0565b9250828201905080821115610b2457610b236108ab565b5b92915050565b610b33816103a0565b82525050565b6000606082019050610b4e6000830186610acc565b610b5b6020830185610b2a565b610b686040830184610b2a565b949350505050565b6000602082019050610b856000830184610b2a565b92915050565b6114e780610b9a6000396000f3fe608060405234801561001057600080fd5b506004361061010b5760003560e01c8063658612e9116100a2578063a9059cbb11610071578063a9059cbb146102ce578063c7012626146102fe578063d9eeebed1461032e578063dd62ed3e1461034d578063f7d8f6161461037d5761010b565b8063658612e914610246578063678edca31461026457806370a082311461028057806395d89b41146102b05761010b565b80632c27d3ab116100de5780632c27d3ab146101ac578063313ce567146101dc5780633e8a4ee1146101fa57806347e7ef24146102165761010b565b806306fdde0314610110578063095ea7b31461012e57806318160ddd1461015e57806323b872dd1461017c575b600080fd5b61011861039b565b6040516101259190610e82565b60405180910390f35b61014860048036038101906101439190610f42565b61042d565b6040516101559190610f9d565b60405180910390f35b610166610450565b6040516101739190610fc7565b60405180910390f35b61019660048036038101906101919190610fe2565b61045a565b6040516101a39190610f9d565b60405180910390f35b6101c660048036038101906101c1919061109a565b610489565b6040516101d3919061111d565b60405180910390f35b6101e46104fd565b6040516101f19190611154565b60405180910390f35b610214600480360381019061020f919061116f565b610506565b005b610230600480360381019061022b9190610f42565b61054a565b60405161023d9190610f9d565b60405180910390f35b61024e610556565b60405161025b9190610fc7565b60405180910390f35b61027e6004803603810190610279919061119c565b61055c565b005b61029a6004803603810190610295919061116f565b610566565b6040516102a79190610fc7565b60405180910390f35b6102b86105ae565b6040516102c59190610e82565b60405180910390f35b6102e860048036038101906102e39190610f42565b610640565b6040516102f59190610f9d565b60405180910390f35b610318600480360381019061031391906111c9565b610663565b6040516103259190610f9d565b60405180910390f35b610336610701565b604051610344929190611229565b60405180910390f35b61036760048036038101906103629190611252565b610732565b6040516103749190610fc7565b60405180910390f35b6103856107b9565b604051610392919061111d565b60405180910390f35b6060600380546103aa906112c1565b80601f01602080910402602001604051908101604052809291908181526020018280546103d6906112c1565b80156104235780601f106103f857610100808354040283529160200191610423565b820191906000526020600020905b81548152906001019060200180831161040657829003601f168201915b5050505050905090565b6000806104386107df565b90506104458185856107e7565b600191505092915050565b6000600254905090565b6000806104656107df565b90506104728582856107f9565b61047d85858561088d565b60019150509392505050565b60008085858590858761049c9190611321565b926104a99392919061135f565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905082810151915050949350505050565b60006012905090565b80600560006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60006001905092915050565b60065481565b8060068190555050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b6060600480546105bd906112c1565b80601f01602080910402602001604051908101604052809291908181526020018280546105e9906112c1565b80156106365780601f1061060b57610100808354040283529160200191610636565b820191906000526020600020905b81548152906001019060200180831161061957829003601f168201915b5050505050905090565b60008061064b6107df565b905061065881858561088d565b600191505092915050565b60008060208585905010156106855761067e85856000610981565b9050610694565b6106918585600c610981565b90505b3373ffffffffffffffffffffffffffffffffffffffff167f9ffbffc04a397460ee1dbe8c9503e098090567d6b7f4b3c02a8617d800b6d95586868660065460006040516106e595949392919061142c565b60405180910390a26106f78184610640565b9150509392505050565b600080600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600654915091509091565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600560009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600033905090565b6107f483838360016109f6565b505050565b60006108058484610732565b90507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81146108875781811015610877578281836040517ffb8f41b200000000000000000000000000000000000000000000000000000000815260040161086e9392919061147a565b60405180910390fd5b610886848484840360006109f6565b5b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036108ff5760006040517f96c6fd1e0000000000000000000000000000000000000000000000000000000081526004016108f6919061111d565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036109715760006040517fec442f05000000000000000000000000000000000000000000000000000000008152600401610968919061111d565b60405180910390fd5b61097c838383610bcd565b505050565b600080848484906014866109959190611321565b926109a29392919061135f565b8080601f016020809104026020016040519081016040528093929190818152602001838380828437600081840152601f19601f82011690508083019250505050505050905060148101519150509392505050565b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff1603610a685760006040517fe602df05000000000000000000000000000000000000000000000000000000008152600401610a5f919061111d565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610ada5760006040517f94280d62000000000000000000000000000000000000000000000000000000008152600401610ad1919061111d565b60405180910390fd5b81600160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508015610bc7578273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92584604051610bbe9190610fc7565b60405180910390a35b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610c1f578060026000828254610c139190611321565b92505081905550610cf2565b60008060008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905081811015610cab578381836040517fe450d38c000000000000000000000000000000000000000000000000000000008152600401610ca29392919061147a565b60405180910390fd5b8181036000808673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610d3b5780600260008282540392505081905550610d88565b806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825401925050819055505b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef83604051610de59190610fc7565b60405180910390a3505050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610e2c578082015181840152602081019050610e11565b60008484015250505050565b6000601f19601f8301169050919050565b6000610e5482610df2565b610e5e8185610dfd565b9350610e6e818560208601610e0e565b610e7781610e38565b840191505092915050565b60006020820190508181036000830152610e9c8184610e49565b905092915050565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610ed982610eae565b9050919050565b610ee981610ece565b8114610ef457600080fd5b50565b600081359050610f0681610ee0565b92915050565b6000819050919050565b610f1f81610f0c565b8114610f2a57600080fd5b50565b600081359050610f3c81610f16565b92915050565b60008060408385031215610f5957610f58610ea4565b5b6000610f6785828601610ef7565b9250506020610f7885828601610f2d565b9150509250929050565b60008115159050919050565b610f9781610f82565b82525050565b6000602082019050610fb26000830184610f8e565b92915050565b610fc181610f0c565b82525050565b6000602082019050610fdc6000830184610fb8565b92915050565b600080600060608486031215610ffb57610ffa610ea4565b5b600061100986828701610ef7565b935050602061101a86828701610ef7565b925050604061102b86828701610f2d565b9150509250925092565b600080fd5b600080fd5b600080fd5b60008083601f84011261105a57611059611035565b5b8235905067ffffffffffffffff8111156110775761107661103a565b5b6020830191508360018202830111156110935761109261103f565b5b9250929050565b600080600080606085870312156110b4576110b3610ea4565b5b600085013567ffffffffffffffff8111156110d2576110d1610ea9565b5b6110de87828801611044565b945094505060206110f187828801610f2d565b925050604061110287828801610f2d565b91505092959194509250565b61111781610ece565b82525050565b6000602082019050611132600083018461110e565b92915050565b600060ff82169050919050565b61114e81611138565b82525050565b60006020820190506111696000830184611145565b92915050565b60006020828403121561118557611184610ea4565b5b600061119384828501610ef7565b91505092915050565b6000602082840312156111b2576111b1610ea4565b5b60006111c084828501610f2d565b91505092915050565b6000806000604084860312156111e2576111e1610ea4565b5b600084013567ffffffffffffffff811115611200576111ff610ea9565b5b61120c86828701611044565b9350935050602061121f86828701610f2d565b9150509250925092565b600060408201905061123e600083018561110e565b61124b6020830184610fb8565b9392505050565b6000806040838503121561126957611268610ea4565b5b600061127785828601610ef7565b925050602061128885828601610ef7565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806112d957607f821691505b6020821081036112ec576112eb611292565b5b50919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061132c82610f0c565b915061133783610f0c565b925082820190508082111561134f5761134e6112f2565b5b92915050565b600080fd5b600080fd5b6000808585111561137357611372611355565b5b838611156113845761138361135a565b5b6001850283019150848603905094509492505050565b600082825260208201905092915050565b82818337600083830152505050565b60006113c6838561139a565b93506113d38385846113ab565b6113dc83610e38565b840190509392505050565b6000819050919050565b6000819050919050565b600061141661141161140c846113e7565b6113f1565b610f0c565b9050919050565b611426816113fb565b82525050565b600060808201905081810360008301526114478187896113ba565b90506114566020830186610fb8565b6114636040830185610fb8565b611470606083018461141d565b9695505050505050565b600060608201905061148f600083018661110e565b61149c6020830185610fb8565b6114a96040830184610fb8565b94935050505056fea2646970667358221220b30e975ea29aa7b9b48f86636a08e59e029f8753a0ca6d341b9ceaf8c0f0061464736f6c634300081a0033"; type MockZRC20ConstructorParams = | [signer?: Signer] diff --git a/typechain-types/hardhat.d.ts b/typechain-types/hardhat.d.ts index 1e9cbde2..807d457d 100644 --- a/typechain-types/hardhat.d.ts +++ b/typechain-types/hardhat.d.ts @@ -12,6 +12,18 @@ import * as Contracts from "."; declare module "hardhat/types/runtime" { interface HardhatEthersHelpers extends HardhatEthersHelpersBase { + getContractFactory( + name: "IERC1155Errors", + signerOrOptions?: ethers.Signer | FactoryOptions + ): Promise; + getContractFactory( + name: "IERC20Errors", + signerOrOptions?: ethers.Signer | FactoryOptions + ): Promise; + getContractFactory( + name: "IERC721Errors", + signerOrOptions?: ethers.Signer | FactoryOptions + ): Promise; getContractFactory( name: "ERC20", signerOrOptions?: ethers.Signer | FactoryOptions @@ -217,6 +229,21 @@ declare module "hardhat/types/runtime" { signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; + getContractAt( + name: "IERC1155Errors", + address: string, + signer?: ethers.Signer + ): Promise; + getContractAt( + name: "IERC20Errors", + address: string, + signer?: ethers.Signer + ): Promise; + getContractAt( + name: "IERC721Errors", + address: string, + signer?: ethers.Signer + ): Promise; getContractAt( name: "ERC20", address: string, diff --git a/typechain-types/index.ts b/typechain-types/index.ts index 88a5b554..04e4d24c 100644 --- a/typechain-types/index.ts +++ b/typechain-types/index.ts @@ -10,6 +10,12 @@ export type { zetachain }; import type * as contracts from "./contracts"; export type { contracts }; export * as factories from "./factories"; +export type { IERC1155Errors } from "./@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors"; +export { IERC1155Errors__factory } from "./factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC1155Errors__factory"; +export type { IERC20Errors } from "./@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors"; +export { IERC20Errors__factory } from "./factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC20Errors__factory"; +export type { IERC721Errors } from "./@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors"; +export { IERC721Errors__factory } from "./factories/@openzeppelin/contracts/interfaces/draft-IERC6093.sol/IERC721Errors__factory"; export type { ERC20 } from "./@openzeppelin/contracts/token/ERC20/ERC20"; export { ERC20__factory } from "./factories/@openzeppelin/contracts/token/ERC20/ERC20__factory"; export type { IERC20Metadata } from "./@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata"; diff --git a/yarn.lock b/yarn.lock index 03c157ae..35e7ca49 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1041,7 +1041,7 @@ dependencies: "@noble/hashes" "1.4.0" -"@noble/curves@^1.4.2": +"@noble/curves@^1.1.0", "@noble/curves@^1.4.2": version "1.6.0" resolved "https://registry.yarnpkg.com/@noble/curves/-/curves-1.6.0.tgz#be5296ebcd5a1730fccea4786d420f87abfeb40b" integrity sha512-TlaHRXDehJuRNR9TfZDNQ45mMEd5dwUwmicsafcIX4SsNiqnCHKjE/1alYPd/lDRVhxdhUAlv8uEhMCI5zjIJQ== @@ -1279,6 +1279,13 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== +"@react-native-async-storage/async-storage@^1.17.7": + version "1.24.0" + resolved "https://registry.yarnpkg.com/@react-native-async-storage/async-storage/-/async-storage-1.24.0.tgz#888efbc62a26f7d9464b32f4d3027b7f2771999b" + integrity sha512-W4/vbwUOYOjco0x3toB8QCr7EjIP6nE9G7o8PMguvvjYT5Awg09lyV4enACRx4s++PPulBiBSjL0KTFx2u0Z/g== + dependencies: + merge-options "^3.0.4" + "@rtsao/scc@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8" @@ -1446,6 +1453,38 @@ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz#282046f03e886e352b2d5f5da5eb755e01457f3f" integrity sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA== +"@solana-mobile/mobile-wallet-adapter-protocol-web3js@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@solana-mobile/mobile-wallet-adapter-protocol-web3js/-/mobile-wallet-adapter-protocol-web3js-2.1.4.tgz#70b55f2dc62740f0a0fb445103f414ec63ef387d" + integrity sha512-eE0NfQ450TrjD20/gN9hDYLhm6ggYtA5Vrrp3kuzj2antC0t6UtCCHe3/ivHLU14ir6kPoQTsTJHQaKGIqcheQ== + dependencies: + "@solana-mobile/mobile-wallet-adapter-protocol" "^2.1.4" + bs58 "^5.0.0" + js-base64 "^3.7.5" + +"@solana-mobile/mobile-wallet-adapter-protocol@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@solana-mobile/mobile-wallet-adapter-protocol/-/mobile-wallet-adapter-protocol-2.1.4.tgz#47f31e230aca8500b8715fe68ce0be59e5401851" + integrity sha512-o5C61cZbtvkuAyn5YxRxsl8jeTVpGO40xT7VjtgFSE9elxvLOZAlqxxrtxpqT4hiwFzQFDzjUGsp97cabij06A== + dependencies: + "@solana/wallet-standard" "^1.1.2" + "@solana/wallet-standard-util" "^1.1.1" + "@wallet-standard/core" "^1.0.3" + js-base64 "^3.7.5" + +"@solana-mobile/wallet-adapter-mobile@^2.0.0": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@solana-mobile/wallet-adapter-mobile/-/wallet-adapter-mobile-2.1.4.tgz#d9b5c3d0480dadc344a6019182eb756cfb014cb8" + integrity sha512-uOG7Jqrjlcf52OyNfguv1CD29zQrUB5YbPhBOv6n/BcS0Zd9jHvcB0J9iMt5EZ6P8MYdJ898L6X1+4mnqFFixg== + dependencies: + "@solana-mobile/mobile-wallet-adapter-protocol-web3js" "^2.1.4" + "@solana/wallet-adapter-base" "^0.9.23" + "@solana/wallet-standard-features" "^1.2.0" + js-base64 "^3.7.5" + qrcode "^1.5.4" + optionalDependencies: + "@react-native-async-storage/async-storage" "^1.17.7" + "@solana/buffer-layout@^4.0.1": version "4.0.1" resolved "https://registry.yarnpkg.com/@solana/buffer-layout/-/buffer-layout-4.0.1.tgz#b996235eaec15b1e0b5092a8ed6028df77fa6c15" @@ -1453,6 +1492,97 @@ dependencies: buffer "~6.0.3" +"@solana/wallet-adapter-base@^0.9.23": + version "0.9.23" + resolved "https://registry.yarnpkg.com/@solana/wallet-adapter-base/-/wallet-adapter-base-0.9.23.tgz#3b17c28afd44e173f44f658bf9700fd637e12a11" + integrity sha512-apqMuYwFp1jFi55NxDfvXUX2x1T0Zh07MxhZ/nCCTGys5raSfYUh82zen2BLv8BSDj/JxZ2P/s7jrQZGrX8uAw== + dependencies: + "@solana/wallet-standard-features" "^1.1.0" + "@wallet-standard/base" "^1.0.1" + "@wallet-standard/features" "^1.0.3" + eventemitter3 "^4.0.7" + +"@solana/wallet-adapter-react@^0.15.35": + version "0.15.35" + resolved "https://registry.yarnpkg.com/@solana/wallet-adapter-react/-/wallet-adapter-react-0.15.35.tgz#0d42e6774c0d55f3782d3eb5edb6ac9888858b08" + integrity sha512-i4hc/gNLTYNLMEt2LS+4lrrc0QAwa5SU2PtYMnZ2A3rsoKF5m1bv1h6cjLj2KBry4/zRGEBoqkiMOC5zHkLnRQ== + dependencies: + "@solana-mobile/wallet-adapter-mobile" "^2.0.0" + "@solana/wallet-adapter-base" "^0.9.23" + "@solana/wallet-standard-wallet-adapter-react" "^1.1.0" + +"@solana/wallet-standard-chains@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-chains/-/wallet-standard-chains-1.1.0.tgz#459b297e71b0d9c1196c11a0578b38c85998be7d" + integrity sha512-IRJHf94UZM8AaRRmY18d34xCJiVPJej1XVwXiTjihHnmwD0cxdQbc/CKjrawyqFyQAKJx7raE5g9mnJsAdspTg== + dependencies: + "@wallet-standard/base" "^1.0.1" + +"@solana/wallet-standard-core@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-core/-/wallet-standard-core-1.1.1.tgz#7187c085dcee38719902217a7ecdd1bf3f27afa3" + integrity sha512-DoQ5Ryly4GAZtxRUmW2rIWrgNvTYVCWrFCFFjZI5s4zu2QNsP7sHZUax3kc1GbmFLXNL1FWRZlPOXRs6e0ZEng== + dependencies: + "@solana/wallet-standard-chains" "^1.1.0" + "@solana/wallet-standard-features" "^1.2.0" + "@solana/wallet-standard-util" "^1.1.1" + +"@solana/wallet-standard-features@^1.1.0", "@solana/wallet-standard-features@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-features/-/wallet-standard-features-1.2.0.tgz#be8b3824abf5ebcfeaa7298445bf53f76a27c935" + integrity sha512-tUd9srDLkRpe1BYg7we+c4UhRQkq+XQWswsr/L1xfGmoRDF47BPSXf4zE7ZU2GRBGvxtGt7lwJVAufQyQYhxTQ== + dependencies: + "@wallet-standard/base" "^1.0.1" + "@wallet-standard/features" "^1.0.3" + +"@solana/wallet-standard-util@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-util/-/wallet-standard-util-1.1.1.tgz#f645fdd8b7d3c553a3b59aa19c25c51a1badce66" + integrity sha512-dPObl4ntmfOc0VAGGyyFvrqhL8UkHXmVsgbj0K9RcznKV4KB3MgjGwzo8CTSX5El5lkb0rDeEzFqvToJXRz3dw== + dependencies: + "@noble/curves" "^1.1.0" + "@solana/wallet-standard-chains" "^1.1.0" + "@solana/wallet-standard-features" "^1.2.0" + +"@solana/wallet-standard-wallet-adapter-base@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-wallet-adapter-base/-/wallet-standard-wallet-adapter-base-1.1.2.tgz#f030f412cd16b06e95c6da5548a03113319d3620" + integrity sha512-DqhzYbgh3disHMgcz6Du7fmpG29BYVapNEEiL+JoVMa+bU9d4P1wfwXUNyJyRpGGNXtwhyZjIk2umWbe5ZBNaQ== + dependencies: + "@solana/wallet-adapter-base" "^0.9.23" + "@solana/wallet-standard-chains" "^1.1.0" + "@solana/wallet-standard-features" "^1.2.0" + "@solana/wallet-standard-util" "^1.1.1" + "@wallet-standard/app" "^1.0.1" + "@wallet-standard/base" "^1.0.1" + "@wallet-standard/features" "^1.0.3" + "@wallet-standard/wallet" "^1.0.1" + +"@solana/wallet-standard-wallet-adapter-react@^1.1.0", "@solana/wallet-standard-wallet-adapter-react@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-wallet-adapter-react/-/wallet-standard-wallet-adapter-react-1.1.2.tgz#a7bc71786e8f891d2dd83f7de30db4708767a56a" + integrity sha512-bN6W4QkzenyjUoUz3sC5PAed+z29icGtPh9VSmLl1ZrRO7NbFB49a8uwUUVXNxhL/ZbMsyVKhb9bNj47/p8uhQ== + dependencies: + "@solana/wallet-standard-wallet-adapter-base" "^1.1.2" + "@wallet-standard/app" "^1.0.1" + "@wallet-standard/base" "^1.0.1" + +"@solana/wallet-standard-wallet-adapter@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard-wallet-adapter/-/wallet-standard-wallet-adapter-1.1.2.tgz#a9ff9e4d5c379e4f38c03a2b69c9a221904181b6" + integrity sha512-lCwoA+vhPfmvjcmJOhSRV94wouVWTfJv1Z7eeULAe+GodCeKA/0T9/uBYgXHUxQjLHd7o8LpLYIkfm+xjA5sMA== + dependencies: + "@solana/wallet-standard-wallet-adapter-base" "^1.1.2" + "@solana/wallet-standard-wallet-adapter-react" "^1.1.2" + +"@solana/wallet-standard@^1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@solana/wallet-standard/-/wallet-standard-1.1.2.tgz#b68e38db863f6945979fe278f2cecc2e21f84c2d" + integrity sha512-o7wk+zr5/QgyE393cGRC04K1hacR4EkBu3MB925ddaLvCVaXjwr2asgdviGzN9PEm3FiEJp3sMmMKYHFnwOITQ== + dependencies: + "@solana/wallet-standard-core" "^1.1.1" + "@solana/wallet-standard-wallet-adapter" "^1.1.2" + "@solana/web3.js@^1.68.0", "@solana/web3.js@^1.95.3": version "1.95.3" resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.95.3.tgz#70b5f4d76823f56b5af6403da51125fffeb65ff3" @@ -1857,6 +1987,51 @@ "@uniswap/lib" "1.1.1" "@uniswap/v2-core" "1.0.0" +"@wallet-standard/app@^1.0.1", "@wallet-standard/app@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/app/-/app-1.1.0.tgz#2ca32e4675536224ebe55a00ad533b7923d7380a" + integrity sha512-3CijvrO9utx598kjr45hTbbeeykQrQfKmSnxeWOgU25TOEpvcipD/bYDQWIqUv1Oc6KK4YStokSMu/FBNecGUQ== + dependencies: + "@wallet-standard/base" "^1.1.0" + +"@wallet-standard/base@^1.0.1", "@wallet-standard/base@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/base/-/base-1.1.0.tgz#214093c0597a1e724ee6dbacd84191dfec62bb33" + integrity sha512-DJDQhjKmSNVLKWItoKThJS+CsJQjR9AOBOirBVT1F9YpRyC9oYHE+ZnSf8y8bxUphtKqdQMPVQ2mHohYdRvDVQ== + +"@wallet-standard/core@^1.0.3": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/core/-/core-1.1.0.tgz#06a2193afe9cda41e626a8e990996e568138da91" + integrity sha512-v2W5q/NlX1qkn2q/JOXQT//pOAdrhz7+nOcO2uiH9+a0uvreL+sdWWqkhFmMcX+HEBjaibdOQMUoIfDhOGX4XA== + dependencies: + "@wallet-standard/app" "^1.1.0" + "@wallet-standard/base" "^1.1.0" + "@wallet-standard/errors" "^0.1.0" + "@wallet-standard/features" "^1.1.0" + "@wallet-standard/wallet" "^1.1.0" + +"@wallet-standard/errors@^0.1.0": + version "0.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/errors/-/errors-0.1.0.tgz#fb8ae75b365eb5d3c167ec6b88d3c9cb3039b928" + integrity sha512-ag0eq5ixy7rz8M5YUWGi/EoIJ69KJ+KILFNunoufgmXVkiISC7+NIZXJYTJrapni4f9twE1hfT+8+IV2CYCvmg== + dependencies: + chalk "^5.3.0" + commander "^12.1.0" + +"@wallet-standard/features@^1.0.3", "@wallet-standard/features@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/features/-/features-1.1.0.tgz#f256d7b18940c8d134f66164330db358a8f5200e" + integrity sha512-hiEivWNztx73s+7iLxsuD1sOJ28xtRix58W7Xnz4XzzA/pF0+aicnWgjOdA10doVDEDZdUuZCIIqG96SFNlDUg== + dependencies: + "@wallet-standard/base" "^1.1.0" + +"@wallet-standard/wallet@^1.0.1", "@wallet-standard/wallet@^1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@wallet-standard/wallet/-/wallet-1.1.0.tgz#a1e46a3f1b2d06a0206058562169b1f0e9652d0f" + integrity sha512-Gt8TnSlDZpAl+RWOOAB/kuvC7RpcdWAlFbHNoi4gsXsfaWa1QCT6LBcfIYTPdOZC9OVZUDwqGuGAcqZejDmHjg== + dependencies: + "@wallet-standard/base" "^1.1.0" + "@zetachain/faucet-cli@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@zetachain/faucet-cli/-/faucet-cli-4.1.1.tgz#57645e9b7f7bb8483d25605053383c531ab04961" @@ -2627,6 +2802,11 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== +camelcase@^5.0.0: + version "5.3.1" + resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" + integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== + camelcase@^6.0.0, camelcase@^6.2.0, camelcase@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" @@ -2681,6 +2861,11 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-5.3.0.tgz#67c20a7ebef70e7f3970a01f90fa210cb6860385" + integrity sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w== + chardet@^0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" @@ -2789,6 +2974,15 @@ cli-width@^4.0.0, cli-width@^4.1.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5" integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ== +cliui@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" + integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.0" + wrap-ansi "^6.2.0" + cliui@^7.0.2: version "7.0.4" resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" @@ -2877,6 +3071,11 @@ commander@10.0.1, commander@^10.0.0: resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06" integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug== +commander@^12.1.0: + version "12.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3" + integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA== + commander@^2.20.3: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" @@ -3071,6 +3270,11 @@ debug@^3.2.7: dependencies: ms "^2.1.1" +decamelize@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== + decamelize@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837" @@ -3177,6 +3381,11 @@ difflib@^0.2.4: dependencies: heap ">= 0.2.0" +dijkstrajs@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.3.tgz#4c8dbdea1f0f6478bff94d9c49c784d623e4fc23" + integrity sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA== + dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -4082,6 +4291,14 @@ find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-up@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" + integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== + dependencies: + locate-path "^5.0.0" + path-exists "^4.0.0" + find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -4247,7 +4464,7 @@ functions-have-names@^1.2.3: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -get-caller-file@^2.0.5: +get-caller-file@^2.0.1, get-caller-file@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== @@ -5207,6 +5424,11 @@ jayson@^4.1.1: uuid "^8.3.2" ws "^7.5.10" +js-base64@^3.7.5: + version "3.7.7" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79" + integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw== + js-sha3@0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" @@ -5406,6 +5628,13 @@ locate-path@^2.0.0: p-locate "^2.0.0" path-exists "^3.0.0" +locate-path@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" + integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== + dependencies: + p-locate "^4.1.0" + locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -5533,6 +5762,13 @@ memorystream@^0.3.1: resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw== +merge-options@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/merge-options/-/merge-options-3.0.4.tgz#84709c2aa2a4b24c1981f66c179fe5565cc6dbb7" + integrity sha512-2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ== + dependencies: + is-plain-obj "^2.1.0" + merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" @@ -6025,6 +6261,13 @@ p-limit@^1.1.0: dependencies: p-try "^1.0.0" +p-limit@^2.2.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -6039,6 +6282,13 @@ p-locate@^2.0.0: dependencies: p-limit "^1.1.0" +p-locate@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" + integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== + dependencies: + p-limit "^2.2.0" + p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -6058,6 +6308,11 @@ p-try@^1.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + package-json-from-dist@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00" @@ -6184,6 +6439,11 @@ pluralize@^8.0.0: resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== +pngjs@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-5.0.0.tgz#e79dd2b215767fd9c04561c01236df960bce7fbb" + integrity sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw== + portfinder@^1.0.28: version "1.0.32" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.32.tgz#2fe1b9e58389712429dc2bea5beb2146146c7f81" @@ -6265,6 +6525,15 @@ punycode@^2.1.0: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== +qrcode@^1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/qrcode/-/qrcode-1.5.4.tgz#5cb81d86eb57c675febb08cf007fff963405da88" + integrity sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg== + dependencies: + dijkstrajs "^1.0.1" + pngjs "^5.0.0" + yargs "^15.3.1" + qs@^6.4.0: version "6.13.0" resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" @@ -6439,6 +6708,11 @@ require-from-string@^2.0.2: resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== +require-main-filename@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" + integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== + requireindex@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef" @@ -6667,6 +6941,11 @@ serialize-javascript@^6.0.2: dependencies: randombytes "^2.1.0" +set-blocking@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== + set-function-length@^1.2.1: version "1.2.2" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" @@ -6999,7 +7278,7 @@ string-format@^2.0.0: resolved "https://registry.yarnpkg.com/string-format/-/string-format-2.0.0.tgz#f2df2e7097440d3b65de31b6d40d54c96eaffb9b" integrity sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA== -"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== @@ -7016,15 +7295,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" @@ -7076,7 +7346,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== @@ -7097,13 +7367,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" @@ -7734,6 +7997,11 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-module@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== + which-typed-array@^1.1.14, which-typed-array@^1.1.15: version "1.1.15" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" @@ -7796,7 +8064,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== @@ -7814,15 +8082,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" @@ -7861,6 +8120,11 @@ ws@^8.17.1, ws@^8.5.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== +y18n@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== + y18n@^5.0.5: version "5.0.8" resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" @@ -7871,6 +8135,14 @@ yaml@^2.3.4, yaml@^2.4.5: resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.5.1.tgz#c9772aacf62cb7494a95b0c4f1fb065b563db130" integrity sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q== +yargs-parser@^18.1.2: + version "18.1.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" + integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== + dependencies: + camelcase "^5.0.0" + decamelize "^1.2.0" + yargs-parser@^20.2.2, yargs-parser@^20.2.9: version "20.2.9" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" @@ -7886,6 +8158,23 @@ yargs-unparser@^2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" +yargs@^15.3.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + yargs@^16.2.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"