From 6c66486b1ba928942716798cbcb6aa380e8c839d Mon Sep 17 00:00:00 2001 From: Iain Date: Tue, 27 Sep 2022 15:06:14 -0400 Subject: [PATCH 1/3] [ethers deps] use ethers subpackages fix unused ts import --- packages/hardhat-test/package.json | 4 + .../hardhat-test/typechain-types/Counter.ts | 14 +- packages/hardhat-test/typechain-types/Demo.ts | 13 +- .../typechain-types/Directory/Hello.ts | 7 +- .../typechain-types/StructsInConstructor.ts | 13 +- .../hardhat-test/typechain-types/common.ts | 2 +- .../factories/Counter__factory.ts | 8 +- .../factories/Demo__factory.ts | 8 +- .../factories/Directory/Hello__factory.ts | 15 +- .../StructsInConstructor__factory.ts | 8 +- .../artifacts/contracts/EdgeCases.ts | 7 +- .../artifacts/contracts/TestContract.ts | 7 +- .../artifacts/contracts/TestContract1.ts | 7 +- .../artifacts/contracts/lib/SafeMath.ts | 16 +- .../hardhat-project/typechain-types/common.ts | 2 +- .../externalArtifacts/ERC20.ts | 15 +- .../artifacts/contracts/EdgeCases__factory.ts | 17 +- .../contracts/TestContract1__factory.ts | 15 +- .../contracts/TestContract__factory.ts | 15 +- .../contracts/lib/SafeMath__factory.ts | 8 +- .../externalArtifacts/ERC20__factory.ts | 8 +- packages/target-ethers-v5-test/package.json | 4 +- .../target-ethers-v5-test/types/common.ts | 2 +- .../v0.6.4/DataTypesInput__factory.ts | 5 +- .../v0.6.4/DataTypesPure__factory.ts | 5 +- .../v0.6.4/DataTypesView__factory.ts | 5 +- .../types/factories/v0.6.4/Events__factory.ts | 5 +- .../Issue428_Reproduction/A__factory.ts | 5 +- .../Issue428_Reproduction/B__factory.ts | 5 +- .../factories/v0.6.4/Library/Lib__factory.ts | 5 +- .../v0.6.4/LibraryConsumer__factory.ts | 5 +- .../Name-Mangling/NAME12mangling__factory.ts | 5 +- .../factories/v0.6.4/Overloads__factory.ts | 5 +- .../v0.6.4/Payable/PayableFactory__factory.ts | 5 +- .../v0.6.4/Payable/Payable__factory.ts | 5 +- .../factories/v0.8.9/ISimpleToken__factory.ts | 5 +- .../v0.8.9/Issue552_Reproduction__factory.ts | 5 +- .../KingOfTheHill/KingOfTheHill__factory.ts | 5 +- .../KingOfTheHill/Withdrawable__factory.ts | 5 +- .../Rarity/ERC721Enumerable__factory.ts | 5 +- .../v0.8.9/Rarity/ERC721__factory.ts | 5 +- .../Rarity/IERC721Enumerable__factory.ts | 5 +- .../v0.8.9/Rarity/IERC721Receiver__factory.ts | 5 +- .../v0.8.9/Rarity/IERC721__factory.ts | 5 +- .../v0.8.9/Rarity/Rarity__factory.ts | 5 +- .../factories/v0.8.9/SimpleToken__factory.ts | 5 +- .../v0.8.9/nested/a/NestedLibrary__factory.ts | 5 +- .../v0.8.9/nested/b/NestedLibrary__factory.ts | 5 +- .../types/v0.6.4/DataTypesInput.ts | 16 +- .../types/v0.6.4/DataTypesPure.ts | 16 +- .../types/v0.6.4/DataTypesView.ts | 16 +- .../types/v0.6.4/Events.ts | 15 +- .../types/v0.6.4/Issue428_Reproduction/A.ts | 9 +- .../types/v0.6.4/Issue428_Reproduction/B.ts | 10 +- .../types/v0.6.4/Library/Lib.ts | 16 +- .../types/v0.6.4/LibraryConsumer.ts | 16 +- .../v0.6.4/Name-Mangling/NAME12mangling.ts | 16 +- .../types/v0.6.4/Overloads.ts | 16 +- .../types/v0.6.4/Payable/Payable.ts | 15 +- .../types/v0.6.4/Payable/PayableFactory.ts | 15 +- .../types/v0.8.9/ISimpleToken.ts | 16 +- .../types/v0.8.9/Issue552_Reproduction.ts | 16 +- .../v0.8.9/KingOfTheHill/KingOfTheHill.ts | 15 +- .../v0.8.9/KingOfTheHill/Withdrawable.ts | 15 +- .../types/v0.8.9/Rarity/ERC721.ts | 15 +- .../types/v0.8.9/Rarity/ERC721Enumerable.ts | 15 +- .../types/v0.8.9/Rarity/IERC721.ts | 15 +- .../types/v0.8.9/Rarity/IERC721Enumerable.ts | 15 +- .../types/v0.8.9/Rarity/IERC721Receiver.ts | 16 +- .../types/v0.8.9/Rarity/Rarity.ts | 15 +- .../types/v0.8.9/SimpleToken.ts | 16 +- .../types/v0.8.9/nested/a/NestedLibrary.ts | 16 +- .../types/v0.8.9/nested/b/NestedLibrary.ts | 16 +- packages/target-ethers-v5/package.json | 11 +- .../target-ethers-v5/src/codegen/index.ts | 84 ++-- packages/target-ethers-v5/static/common.ts | 2 +- pnpm-lock.yaml | 451 ++++++++++++------ 77 files changed, 716 insertions(+), 549 deletions(-) diff --git a/packages/hardhat-test/package.json b/packages/hardhat-test/package.json index 8d5d0a5ea..445a519cc 100644 --- a/packages/hardhat-test/package.json +++ b/packages/hardhat-test/package.json @@ -17,6 +17,10 @@ "devDependencies": { "@ethersproject/providers": "^5.4.7", "@ethersproject/abi": "^5.4.7", + "@ethersproject/contracts": "^5.4.7", + "@ethersproject/bignumber": "^5.4.7", + "@ethersproject/abstract-signer": "^5.4.7", + "@ethersproject/bytes": "^5.4.7", "@nomiclabs/hardhat-ethers": "^2.0.2", "@typechain/ethers-v5": "workspace:^10.1.0", "@typechain/hardhat": "workspace:^6.1.3", diff --git a/packages/hardhat-test/typechain-types/Counter.ts b/packages/hardhat-test/typechain-types/Counter.ts index 9e8ac5463..5f75e110b 100644 --- a/packages/hardhat-test/typechain-types/Counter.ts +++ b/packages/hardhat-test/typechain-types/Counter.ts @@ -3,16 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -26,7 +26,7 @@ import type { PromiseOrValue, } from "./common"; -export interface CounterInterface extends utils.Interface { +export interface CounterInterface extends Interface { functions: { "countDown()": FunctionFragment; "countUp()": FunctionFragment; diff --git a/packages/hardhat-test/typechain-types/Demo.ts b/packages/hardhat-test/typechain-types/Demo.ts index 6783ca260..fde0d3778 100644 --- a/packages/hardhat-test/typechain-types/Demo.ts +++ b/packages/hardhat-test/typechain-types/Demo.ts @@ -1,14 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { - BaseContract, - BigNumber, - BigNumberish, - Signer, - utils, -} from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -40,7 +37,7 @@ export declare namespace Demo { }; } -export interface DemoInterface extends utils.Interface { +export interface DemoInterface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat-test/typechain-types/Directory/Hello.ts b/packages/hardhat-test/typechain-types/Directory/Hello.ts index f5c219bdf..44ffb74cf 100644 --- a/packages/hardhat-test/typechain-types/Directory/Hello.ts +++ b/packages/hardhat-test/typechain-types/Directory/Hello.ts @@ -1,18 +1,19 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, Signer, utils } from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../common"; -export interface HelloInterface extends utils.Interface { +export interface HelloInterface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat-test/typechain-types/StructsInConstructor.ts b/packages/hardhat-test/typechain-types/StructsInConstructor.ts index b58c72e42..478ad6590 100644 --- a/packages/hardhat-test/typechain-types/StructsInConstructor.ts +++ b/packages/hardhat-test/typechain-types/StructsInConstructor.ts @@ -1,14 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { - BaseContract, - BigNumber, - BigNumberish, - Signer, - utils, -} from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -28,7 +25,7 @@ export type Vector2StructOutput = [BigNumber, BigNumber] & { y: BigNumber; }; -export interface StructsInConstructorInterface extends utils.Interface { +export interface StructsInConstructorInterface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat-test/typechain-types/common.ts b/packages/hardhat-test/typechain-types/common.ts index 4c90b08bb..5fe07b5c2 100644 --- a/packages/hardhat-test/typechain-types/common.ts +++ b/packages/hardhat-test/typechain-types/common.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { Listener } from "@ethersproject/providers"; -import type { Event, EventFilter } from "ethers"; +import type { Event, EventFilter } from "@ethersproject/contracts"; export interface TypedEvent< TArgsArray extends Array = any, diff --git a/packages/hardhat-test/typechain-types/factories/Counter__factory.ts b/packages/hardhat-test/typechain-types/factories/Counter__factory.ts index c3295af98..4856cd0de 100644 --- a/packages/hardhat-test/typechain-types/factories/Counter__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Counter__factory.ts @@ -1,7 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; + import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../common"; import type { Counter, CounterInterface } from "../Counter"; @@ -101,7 +105,7 @@ export class Counter__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): CounterInterface { - return new utils.Interface(_abi) as CounterInterface; + return new Interface(_abi) as CounterInterface; } static connect( address: string, diff --git a/packages/hardhat-test/typechain-types/factories/Demo__factory.ts b/packages/hardhat-test/typechain-types/factories/Demo__factory.ts index 30065c7f4..185b08698 100644 --- a/packages/hardhat-test/typechain-types/factories/Demo__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Demo__factory.ts @@ -1,7 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; + import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../common"; import type { Demo, DemoInterface } from "../Demo"; @@ -93,7 +97,7 @@ export class Demo__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): DemoInterface { - return new utils.Interface(_abi) as DemoInterface; + return new Interface(_abi) as DemoInterface; } static connect(address: string, signerOrProvider: Signer | Provider): Demo { return new Contract(address, _abi, signerOrProvider) as Demo; diff --git a/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts b/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts index ba1fe9300..2508dfb72 100644 --- a/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts @@ -1,14 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { - Signer, - utils, - Contract, - ContractFactory, - BigNumberish, - Overrides, -} from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; +import type { BigNumberish } from "@ethersproject/bignumber"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../common"; import type { Hello, HelloInterface } from "../../Directory/Hello"; @@ -69,7 +66,7 @@ export class Hello__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): HelloInterface { - return new utils.Interface(_abi) as HelloInterface; + return new Interface(_abi) as HelloInterface; } static connect(address: string, signerOrProvider: Signer | Provider): Hello { return new Contract(address, _abi, signerOrProvider) as Hello; diff --git a/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts b/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts index 8ca689e1b..3f5db24e7 100644 --- a/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts @@ -1,7 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; + import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../common"; import type { @@ -81,7 +85,7 @@ export class StructsInConstructor__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): StructsInConstructorInterface { - return new utils.Interface(_abi) as StructsInConstructorInterface; + return new Interface(_abi) as StructsInConstructorInterface; } static connect( address: string, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/EdgeCases.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/EdgeCases.ts index 1dbd37100..2c1cd16af 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/EdgeCases.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/EdgeCases.ts @@ -1,18 +1,19 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, Signer, utils } from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface EdgeCasesInterface extends utils.Interface { +export interface EdgeCasesInterface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract.ts index 2e6f94c42..622314137 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract.ts @@ -1,18 +1,19 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, Signer, utils } from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface TestContractInterface extends utils.Interface { +export interface TestContractInterface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract1.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract1.ts index 0a4eed8e5..da186f6df 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract1.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/TestContract1.ts @@ -1,18 +1,19 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, Signer, utils } from "ethers"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { Interface } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface TestContract1Interface extends utils.Interface { +export interface TestContract1Interface extends Interface { functions: {}; events: {}; diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/lib/SafeMath.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/lib/SafeMath.ts index 19f980490..42dd259dd 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/lib/SafeMath.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/artifacts/contracts/lib/SafeMath.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -21,7 +19,7 @@ import type { PromiseOrValue, } from "../../../common"; -export interface SafeMathInterface extends utils.Interface { +export interface SafeMathInterface extends Interface { functions: { "add(uint256,uint256)": FunctionFragment; "div(uint256,uint256)": FunctionFragment; diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/common.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/common.ts index 4c90b08bb..5fe07b5c2 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/common.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/common.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { Listener } from "@ethersproject/providers"; -import type { Event, EventFilter } from "ethers"; +import type { Event, EventFilter } from "@ethersproject/contracts"; export interface TypedEvent< TArgsArray extends Array = any, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/externalArtifacts/ERC20.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/externalArtifacts/ERC20.ts index db0bc4b92..55eed860b 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/externalArtifacts/ERC20.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/externalArtifacts/ERC20.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../common"; -export interface ERC20Interface extends utils.Interface { +export interface ERC20Interface extends Interface { functions: { "allowance(address,address)": FunctionFragment; "approve(address,uint256)": FunctionFragment; diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/EdgeCases__factory.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/EdgeCases__factory.ts index 00c370d91..fa7f17c17 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/EdgeCases__factory.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/EdgeCases__factory.ts @@ -1,15 +1,12 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { - Signer, - utils, - Contract, - ContractFactory, - BytesLike, - BigNumberish, - Overrides, -} from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BytesLike } from "@ethersproject/bytes"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; +import type { BigNumberish } from "@ethersproject/bignumber"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../../common"; import type { @@ -80,7 +77,7 @@ export class EdgeCases__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): EdgeCasesInterface { - return new utils.Interface(_abi) as EdgeCasesInterface; + return new Interface(_abi) as EdgeCasesInterface; } static connect( address: string, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract1__factory.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract1__factory.ts index 6a9e7336b..a0ab3979f 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract1__factory.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract1__factory.ts @@ -1,14 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { - Signer, - utils, - Contract, - ContractFactory, - BigNumberish, - Overrides, -} from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; +import type { BigNumberish } from "@ethersproject/bignumber"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../../common"; import type { @@ -72,7 +69,7 @@ export class TestContract1__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): TestContract1Interface { - return new utils.Interface(_abi) as TestContract1Interface; + return new Interface(_abi) as TestContract1Interface; } static connect( address: string, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract__factory.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract__factory.ts index dcd2f37ee..80ab86f9d 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract__factory.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/TestContract__factory.ts @@ -1,14 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { - Signer, - utils, - Contract, - ContractFactory, - BigNumberish, - Overrides, -} from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; +import type { BigNumberish } from "@ethersproject/bignumber"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../../common"; import type { @@ -98,7 +95,7 @@ export class TestContract__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): TestContractInterface { - return new utils.Interface(_abi) as TestContractInterface; + return new Interface(_abi) as TestContractInterface; } static connect( address: string, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/lib/SafeMath__factory.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/lib/SafeMath__factory.ts index b28833eb4..8e6ec8922 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/lib/SafeMath__factory.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/artifacts/contracts/lib/SafeMath__factory.ts @@ -1,7 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; + import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../../../common"; import type { @@ -148,7 +152,7 @@ export class SafeMath__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): SafeMathInterface { - return new utils.Interface(_abi) as SafeMathInterface; + return new Interface(_abi) as SafeMathInterface; } static connect( address: string, diff --git a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/externalArtifacts/ERC20__factory.ts b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/externalArtifacts/ERC20__factory.ts index 23c3cb9cb..ea5829df6 100644 --- a/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/externalArtifacts/ERC20__factory.ts +++ b/packages/hardhat/test/fixture-projects/hardhat-project/typechain-types/factories/externalArtifacts/ERC20__factory.ts @@ -1,7 +1,11 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Contract, Overrides } from "@ethersproject/contracts"; +import { ContractFactory } from "@ethersproject/contracts"; + import type { Provider, TransactionRequest } from "@ethersproject/providers"; import type { PromiseOrValue } from "../../common"; import type { ERC20, ERC20Interface } from "../../externalArtifacts/ERC20"; @@ -339,7 +343,7 @@ export class ERC20__factory extends ContractFactory { static readonly bytecode = _bytecode; static readonly abi = _abi; static createInterface(): ERC20Interface { - return new utils.Interface(_abi) as ERC20Interface; + return new Interface(_abi) as ERC20Interface; } static connect(address: string, signerOrProvider: Signer | Provider): ERC20 { return new Contract(address, _abi, signerOrProvider) as ERC20; diff --git a/packages/target-ethers-v5-test/package.json b/packages/target-ethers-v5-test/package.json index 2d1ab6712..481ed6138 100644 --- a/packages/target-ethers-v5-test/package.json +++ b/packages/target-ethers-v5-test/package.json @@ -23,6 +23,8 @@ "@ethersproject/abi": "^5.0.0", "@ethersproject/bytes": "^5.0.0", "@ethersproject/providers": "^5.0.0", - "ethers": "^5.1.3" + "@ethersproject/contracts": "^5.0.0", + "@ethersproject/bignumber": "^5.0.0", + "@ethersproject/abstract-signer": "^5.0.0" } } diff --git a/packages/target-ethers-v5-test/types/common.ts b/packages/target-ethers-v5-test/types/common.ts index 4c90b08bb..5fe07b5c2 100644 --- a/packages/target-ethers-v5-test/types/common.ts +++ b/packages/target-ethers-v5-test/types/common.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { Listener } from "@ethersproject/providers"; -import type { Event, EventFilter } from "ethers"; +import type { Event, EventFilter } from "@ethersproject/contracts"; export interface TypedEvent< TArgsArray extends Array = any, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts index dc7b88e12..e59ffe971 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesInput, @@ -955,7 +956,7 @@ const _abi = [ export class DataTypesInput__factory { static readonly abi = _abi; static createInterface(): DataTypesInputInterface { - return new utils.Interface(_abi) as DataTypesInputInterface; + return new Interface(_abi) as DataTypesInputInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts index df564aa68..ee7c2ce20 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesPure, @@ -219,7 +220,7 @@ const _abi = [ export class DataTypesPure__factory { static readonly abi = _abi; static createInterface(): DataTypesPureInterface { - return new utils.Interface(_abi) as DataTypesPureInterface; + return new Interface(_abi) as DataTypesPureInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts index 58efde74e..0726f5a25 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesView, @@ -219,7 +220,7 @@ const _abi = [ export class DataTypesView__factory { static readonly abi = _abi; static createInterface(): DataTypesViewInterface { - return new utils.Interface(_abi) as DataTypesViewInterface; + return new Interface(_abi) as DataTypesViewInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts index 73bb5bc18..0882059d4 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Events, EventsInterface } from "../../v0.6.4/Events"; @@ -181,7 +182,7 @@ const _abi = [ export class Events__factory { static readonly abi = _abi; static createInterface(): EventsInterface { - return new utils.Interface(_abi) as EventsInterface; + return new Interface(_abi) as EventsInterface; } static connect(address: string, signerOrProvider: Signer | Provider): Events { return new Contract(address, _abi, signerOrProvider) as Events; diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts index 638249122..1f9da2513 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { A, AInterface } from "../../../v0.6.4/Issue428_Reproduction/A"; @@ -25,7 +26,7 @@ const _abi = [ export class A__factory { static readonly abi = _abi; static createInterface(): AInterface { - return new utils.Interface(_abi) as AInterface; + return new Interface(_abi) as AInterface; } static connect(address: string, signerOrProvider: Signer | Provider): A { return new Contract(address, _abi, signerOrProvider) as A; diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts index b5d4e34f0..c54578b5a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { B, BInterface } from "../../../v0.6.4/Issue428_Reproduction/B"; @@ -38,7 +39,7 @@ const _abi = [ export class B__factory { static readonly abi = _abi; static createInterface(): BInterface { - return new utils.Interface(_abi) as BInterface; + return new Interface(_abi) as BInterface; } static connect(address: string, signerOrProvider: Signer | Provider): B { return new Contract(address, _abi, signerOrProvider) as B; diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts index 61252abe8..f6e2a9284 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Lib, LibInterface } from "../../../v0.6.4/Library/Lib"; @@ -31,7 +32,7 @@ const _abi = [ export class Lib__factory { static readonly abi = _abi; static createInterface(): LibInterface { - return new utils.Interface(_abi) as LibInterface; + return new Interface(_abi) as LibInterface; } static connect(address: string, signerOrProvider: Signer | Provider): Lib { return new Contract(address, _abi, signerOrProvider) as Lib; diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts index 0f1c82701..ed9571978 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { LibraryConsumer, @@ -34,7 +35,7 @@ const _abi = [ export class LibraryConsumer__factory { static readonly abi = _abi; static createInterface(): LibraryConsumerInterface { - return new utils.Interface(_abi) as LibraryConsumerInterface; + return new Interface(_abi) as LibraryConsumerInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts index 016ebba98..291ffabfa 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NAME12mangling, @@ -41,7 +42,7 @@ const _abi = [ export class NAME12mangling__factory { static readonly abi = _abi; static createInterface(): NAME12manglingInterface { - return new utils.Interface(_abi) as NAME12manglingInterface; + return new Interface(_abi) as NAME12manglingInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts index 6df345b52..90082967b 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Overloads, OverloadsInterface } from "../../v0.6.4/Overloads"; @@ -55,7 +56,7 @@ const _abi = [ export class Overloads__factory { static readonly abi = _abi; static createInterface(): OverloadsInterface { - return new utils.Interface(_abi) as OverloadsInterface; + return new Interface(_abi) as OverloadsInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts index 9de27e43f..e4c0cfe9b 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { PayableFactory, @@ -28,7 +29,7 @@ const _abi = [ export class PayableFactory__factory { static readonly abi = _abi; static createInterface(): PayableFactoryInterface { - return new utils.Interface(_abi) as PayableFactoryInterface; + return new Interface(_abi) as PayableFactoryInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts index 682aeb92f..9c404600a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Payable, @@ -29,7 +30,7 @@ const _abi = [ export class Payable__factory { static readonly abi = _abi; static createInterface(): PayableInterface { - return new utils.Interface(_abi) as PayableInterface; + return new Interface(_abi) as PayableInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts index 30a992333..f134a2641 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ISimpleToken, @@ -33,7 +34,7 @@ const _abi = [ export class ISimpleToken__factory { static readonly abi = _abi; static createInterface(): ISimpleTokenInterface { - return new utils.Interface(_abi) as ISimpleTokenInterface; + return new Interface(_abi) as ISimpleTokenInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts index 99e971583..e2455cd94 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Issue552_Reproduction, @@ -89,7 +90,7 @@ const _abi = [ export class Issue552_Reproduction__factory { static readonly abi = _abi; static createInterface(): Issue552_ReproductionInterface { - return new utils.Interface(_abi) as Issue552_ReproductionInterface; + return new Interface(_abi) as Issue552_ReproductionInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts index 6d17a4d9b..20d2f559a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { KingOfTheHill, @@ -93,7 +94,7 @@ const _abi = [ export class KingOfTheHill__factory { static readonly abi = _abi; static createInterface(): KingOfTheHillInterface { - return new utils.Interface(_abi) as KingOfTheHillInterface; + return new Interface(_abi) as KingOfTheHillInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts index b3788fd06..5b2374b77 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Withdrawable, @@ -22,7 +23,7 @@ const _abi = [ export class Withdrawable__factory { static readonly abi = _abi; static createInterface(): WithdrawableInterface { - return new utils.Interface(_abi) as WithdrawableInterface; + return new Interface(_abi) as WithdrawableInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts index 009153ef9..3c824a506 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ERC721Enumerable, @@ -337,7 +338,7 @@ const _abi = [ export class ERC721Enumerable__factory { static readonly abi = _abi; static createInterface(): ERC721EnumerableInterface { - return new utils.Interface(_abi) as ERC721EnumerableInterface; + return new Interface(_abi) as ERC721EnumerableInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts index d57960db4..4eafbeaf5 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ERC721, ERC721Interface } from "../../../v0.8.9/Rarity/ERC721"; @@ -278,7 +279,7 @@ const _abi = [ export class ERC721__factory { static readonly abi = _abi; static createInterface(): ERC721Interface { - return new utils.Interface(_abi) as ERC721Interface; + return new Interface(_abi) as ERC721Interface; } static connect(address: string, signerOrProvider: Signer | Provider): ERC721 { return new Contract(address, _abi, signerOrProvider) as ERC721; diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts index 203853423..e2345d3d0 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721Enumerable, @@ -337,7 +338,7 @@ const _abi = [ export class IERC721Enumerable__factory { static readonly abi = _abi; static createInterface(): IERC721EnumerableInterface { - return new utils.Interface(_abi) as IERC721EnumerableInterface; + return new Interface(_abi) as IERC721EnumerableInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts index 7efed1664..b41711422 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721Receiver, @@ -49,7 +50,7 @@ const _abi = [ export class IERC721Receiver__factory { static readonly abi = _abi; static createInterface(): IERC721ReceiverInterface { - return new utils.Interface(_abi) as IERC721ReceiverInterface; + return new Interface(_abi) as IERC721ReceiverInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts index 6e7ed3c6b..fa34a063f 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721, IERC721Interface } from "../../../v0.8.9/Rarity/IERC721"; @@ -278,7 +279,7 @@ const _abi = [ export class IERC721__factory { static readonly abi = _abi; static createInterface(): IERC721Interface { - return new utils.Interface(_abi) as IERC721Interface; + return new Interface(_abi) as IERC721Interface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts index c846135b7..96926af8c 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Rarity, RarityInterface } from "../../../v0.8.9/Rarity/Rarity"; @@ -621,7 +622,7 @@ const _abi = [ export class Rarity__factory { static readonly abi = _abi; static createInterface(): RarityInterface { - return new utils.Interface(_abi) as RarityInterface; + return new Interface(_abi) as RarityInterface; } static connect(address: string, signerOrProvider: Signer | Provider): Rarity { return new Contract(address, _abi, signerOrProvider) as Rarity; diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts index e18649da5..fbc36cb8d 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { SimpleToken, @@ -33,7 +34,7 @@ const _abi = [ export class SimpleToken__factory { static readonly abi = _abi; static createInterface(): SimpleTokenInterface { - return new utils.Interface(_abi) as SimpleTokenInterface; + return new Interface(_abi) as SimpleTokenInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts index d6be41f10..191df0ac2 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NestedLibrary, @@ -28,7 +29,7 @@ const _abi = [ export class NestedLibrary__factory { static readonly abi = _abi; static createInterface(): NestedLibraryInterface { - return new utils.Interface(_abi) as NestedLibraryInterface; + return new Interface(_abi) as NestedLibraryInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts index 42024752e..92a3623e9 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts @@ -2,7 +2,8 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Signer, utils } from "ethers"; +import { Contract } from "@ethersproject/contracts"; +import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NestedLibrary, @@ -28,7 +29,7 @@ const _abi = [ export class NestedLibrary__factory { static readonly abi = _abi; static createInterface(): NestedLibraryInterface { - return new utils.Interface(_abi) as NestedLibraryInterface; + return new Interface(_abi) as NestedLibraryInterface; } static connect( address: string, diff --git a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesInput.ts b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesInput.ts index ab0350658..558b43a39 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesInput.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesInput.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -68,7 +66,7 @@ export declare namespace DataTypesInput { export type Struct3StructOutput = [BigNumber[]] & { input1: BigNumber[] }; } -export interface DataTypesInputInterface extends utils.Interface { +export interface DataTypesInputInterface extends Interface { functions: { "input_address(address)": FunctionFragment; "input_bool(bool)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesPure.ts b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesPure.ts index affdd88aa..de3afd61b 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesPure.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesPure.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -33,7 +31,7 @@ export declare namespace DataTypesPure { }; } -export interface DataTypesPureInterface extends utils.Interface { +export interface DataTypesPureInterface extends Interface { functions: { "pure_address()": FunctionFragment; "pure_bool()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesView.ts b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesView.ts index 400edfd90..67af72e70 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/DataTypesView.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/DataTypesView.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -33,7 +31,7 @@ export declare namespace DataTypesView { }; } -export interface DataTypesViewInterface extends utils.Interface { +export interface DataTypesViewInterface extends Interface { functions: { "view_address()": FunctionFragment; "view_bool()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Events.ts b/packages/target-ethers-v5-test/types/v0.6.4/Events.ts index 9a9db9021..a70192d2c 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Events.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Events.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -39,7 +38,7 @@ export declare namespace Events { }; } -export interface EventsInterface extends utils.Interface { +export interface EventsInterface extends Interface { functions: { "emit_anon1()": FunctionFragment; "emit_event1()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/A.ts b/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/A.ts index f58b16918..f9c44be29 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/A.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/A.ts @@ -1,18 +1,19 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, Signer, utils } from "ethers"; -import type { EventFragment } from "@ethersproject/abi"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; + +import type { Interface, EventFragment } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface AInterface extends utils.Interface { +export interface AInterface extends Interface { functions: {}; events: { diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/B.ts b/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/B.ts index d0bfc5f5d..065b600a5 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/B.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Issue428_Reproduction/B.ts @@ -1,18 +1,20 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type { BaseContract, BigNumber, Signer, utils } from "ethers"; -import type { EventFragment } from "@ethersproject/abi"; +import type { BaseContract } from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; + +import type { Interface, EventFragment } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface BInterface extends utils.Interface { +export interface BInterface extends Interface { functions: {}; events: { diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Library/Lib.ts b/packages/target-ethers-v5-test/types/v0.6.4/Library/Lib.ts index fb00d63f9..546d4c1dd 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Library/Lib.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Library/Lib.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -21,7 +19,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface LibInterface extends utils.Interface { +export interface LibInterface extends Interface { functions: { "other(uint8)": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/LibraryConsumer.ts b/packages/target-ethers-v5-test/types/v0.6.4/LibraryConsumer.ts index fe325fe8c..d7b63114f 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/LibraryConsumer.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/LibraryConsumer.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -21,7 +19,7 @@ import type { PromiseOrValue, } from "../common"; -export interface LibraryConsumerInterface extends utils.Interface { +export interface LibraryConsumerInterface extends Interface { functions: { "someOther(uint8)": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts b/packages/target-ethers-v5-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts index 0bc2c5e14..794741243 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts @@ -3,24 +3,22 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../common"; -export interface NAME12manglingInterface extends utils.Interface { +export interface NAME12manglingInterface extends Interface { functions: { "provider()": FunctionFragment; "works()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Overloads.ts b/packages/target-ethers-v5-test/types/v0.6.4/Overloads.ts index bb1b22a2b..cc7ff11f8 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Overloads.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Overloads.ts @@ -3,15 +3,13 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -21,7 +19,7 @@ import type { PromiseOrValue, } from "../common"; -export interface OverloadsInterface extends utils.Interface { +export interface OverloadsInterface extends Interface { functions: { "overload1(int256)": FunctionFragment; "overload1(uint256,uint256)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Payable/Payable.ts b/packages/target-ethers-v5-test/types/v0.6.4/Payable/Payable.ts index 741f0cd31..847c4c065 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Payable/Payable.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Payable/Payable.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PayableOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -23,7 +22,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface PayableInterface extends utils.Interface { +export interface PayableInterface extends Interface { functions: { "non_payable_func()": FunctionFragment; "payable_func()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.6.4/Payable/PayableFactory.ts b/packages/target-ethers-v5-test/types/v0.6.4/Payable/PayableFactory.ts index 1d8675299..fe5f404eb 100644 --- a/packages/target-ethers-v5-test/types/v0.6.4/Payable/PayableFactory.ts +++ b/packages/target-ethers-v5-test/types/v0.6.4/Payable/PayableFactory.ts @@ -3,16 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -22,7 +21,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface PayableFactoryInterface extends utils.Interface { +export interface PayableFactoryInterface extends Interface { functions: { "newPayable()": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/ISimpleToken.ts b/packages/target-ethers-v5-test/types/v0.8.9/ISimpleToken.ts index 7ce79c2ad..ccdc45ac0 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/ISimpleToken.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/ISimpleToken.ts @@ -3,17 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -23,7 +21,7 @@ import type { PromiseOrValue, } from "../common"; -export interface ISimpleTokenInterface extends utils.Interface { +export interface ISimpleTokenInterface extends Interface { functions: { "transfer(address,uint256)": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Issue552_Reproduction.ts b/packages/target-ethers-v5-test/types/v0.8.9/Issue552_Reproduction.ts index 8c8ef21e6..7f6270bd4 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Issue552_Reproduction.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Issue552_Reproduction.ts @@ -3,17 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -50,7 +48,7 @@ export declare namespace Issue552_Reproduction { }; } -export interface Issue552_ReproductionInterface extends utils.Interface { +export interface Issue552_ReproductionInterface extends Interface { functions: { "bars(uint256)": FunctionFragment; "input(uint256[10])": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts b/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts index f4828020e..7e7aca8b5 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts @@ -3,18 +3,17 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PayableOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -40,7 +39,7 @@ export declare namespace KingOfTheHill { }; } -export interface KingOfTheHillInterface extends utils.Interface { +export interface KingOfTheHillInterface extends Interface { functions: { "bid()": FunctionFragment; "highestBid()": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts b/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts index 06b1f5aee..6a98caf3d 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts @@ -3,16 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -22,7 +21,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface WithdrawableInterface extends utils.Interface { +export interface WithdrawableInterface extends Interface { functions: { "withdraw()": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721.ts index c360463f7..c44404085 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface ERC721Interface extends utils.Interface { +export interface ERC721Interface extends Interface { functions: { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721Enumerable.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721Enumerable.ts index ac2c315c3..4d6e3963e 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721Enumerable.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/ERC721Enumerable.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface ERC721EnumerableInterface extends utils.Interface { +export interface ERC721EnumerableInterface extends Interface { functions: { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721.ts index 0b3087c3a..46289a53e 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface IERC721Interface extends utils.Interface { +export interface IERC721Interface extends Interface { functions: { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Enumerable.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Enumerable.ts index 424002f94..0210f3807 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Enumerable.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Enumerable.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface IERC721EnumerableInterface extends utils.Interface { +export interface IERC721EnumerableInterface extends Interface { functions: { "approve(address,uint256)": FunctionFragment; "balanceOf(address)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Receiver.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Receiver.ts index 739741bfa..4c3816b89 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Receiver.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/IERC721Receiver.ts @@ -3,17 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -23,7 +21,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface IERC721ReceiverInterface extends utils.Interface { +export interface IERC721ReceiverInterface extends Interface { functions: { "onERC721Received(address,address,uint256,bytes)": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/Rarity.ts b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/Rarity.ts index a718c39cd..3c0965ab2 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/Rarity/Rarity.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/Rarity/Rarity.ts @@ -3,17 +3,16 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; import type { + Interface, FunctionFragment, Result, EventFragment, @@ -27,7 +26,7 @@ import type { PromiseOrValue, } from "../../common"; -export interface RarityInterface extends utils.Interface { +export interface RarityInterface extends Interface { functions: { "adventure(uint256)": FunctionFragment; "adventurers_log(uint256)": FunctionFragment; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/SimpleToken.ts b/packages/target-ethers-v5-test/types/v0.8.9/SimpleToken.ts index f4285bc9a..dfb9bf962 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/SimpleToken.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/SimpleToken.ts @@ -3,17 +3,15 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BigNumberish, - BytesLike, - CallOverrides, ContractTransaction, Overrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber, BigNumberish } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, @@ -23,7 +21,7 @@ import type { PromiseOrValue, } from "../common"; -export interface SimpleTokenInterface extends utils.Interface { +export interface SimpleTokenInterface extends Interface { functions: { "transfer(address,uint256)": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/nested/a/NestedLibrary.ts b/packages/target-ethers-v5-test/types/v0.8.9/nested/a/NestedLibrary.ts index f5cc963ab..25292fc59 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/nested/a/NestedLibrary.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/nested/a/NestedLibrary.ts @@ -3,24 +3,22 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../../common"; -export interface NestedLibraryInterface extends utils.Interface { +export interface NestedLibraryInterface extends Interface { functions: { "getValue()": FunctionFragment; }; diff --git a/packages/target-ethers-v5-test/types/v0.8.9/nested/b/NestedLibrary.ts b/packages/target-ethers-v5-test/types/v0.8.9/nested/b/NestedLibrary.ts index 54cdfb326..92d536d90 100644 --- a/packages/target-ethers-v5-test/types/v0.8.9/nested/b/NestedLibrary.ts +++ b/packages/target-ethers-v5-test/types/v0.8.9/nested/b/NestedLibrary.ts @@ -3,24 +3,22 @@ /* eslint-disable */ import type { BaseContract, - BigNumber, - BytesLike, - CallOverrides, PopulatedTransaction, - Signer, - utils, -} from "ethers"; -import type { FunctionFragment, Result } from "@ethersproject/abi"; + CallOverrides, +} from "@ethersproject/contracts"; +import type { Signer } from "@ethersproject/abstract-signer"; +import type { BigNumber } from "@ethersproject/bignumber"; +import type { BytesLike } from "@ethersproject/bytes"; +import type { Interface, FunctionFragment, Result } from "@ethersproject/abi"; import type { Listener, Provider } from "@ethersproject/providers"; import type { TypedEventFilter, TypedEvent, TypedListener, OnEvent, - PromiseOrValue, } from "../../../common"; -export interface NestedLibraryInterface extends utils.Interface { +export interface NestedLibraryInterface extends Interface { functions: { "getValue()": FunctionFragment; }; diff --git a/packages/target-ethers-v5/package.json b/packages/target-ethers-v5/package.json index afd7f399c..5477e6e85 100644 --- a/packages/target-ethers-v5/package.json +++ b/packages/target-ethers-v5/package.json @@ -41,16 +41,19 @@ "typescript": ">=4.3.0" }, "devDependencies": { - "@ethersproject/abi": "^5.0.0", + "@ethersproject/abi": "^5.6.0", + "@ethersproject/abstract-signer": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", "@ethersproject/bytes": "^5.0.0", + "@ethersproject/contracts": "^5.7.0", "@ethersproject/providers": "^5.0.0", "@types/lodash": "^4.14.139", + "@types/proxyquire": "^1.3.28", "ethers": "^5.1.3", + "proxyquire": "^2.1.3", "test-utils": "1.0.0", "typechain": "workspace:^8.1.0", - "typescript": ">=4.3.0", - "@types/proxyquire": "^1.3.28", - "proxyquire": "^2.1.3" + "typescript": ">=4.3.0" }, "dependencies": { "lodash": "^4.17.15", diff --git a/packages/target-ethers-v5/src/codegen/index.ts b/packages/target-ethers-v5/src/codegen/index.ts index 239e1a488..6bcae8ed2 100644 --- a/packages/target-ethers-v5/src/codegen/index.ts +++ b/packages/target-ethers-v5/src/codegen/index.ts @@ -4,7 +4,6 @@ import { CodegenConfig, Contract, createImportsForUsedIdentifiers, - createImportTypeDeclaration, EventDeclaration, FunctionDeclaration, StructType, @@ -38,7 +37,7 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege const source = ` ${generateStructTypes(values(contract.structs).map((v) => v[0]))} - export interface ${contract.name}Interface extends utils.Interface { + export interface ${contract.name}Interface extends Interface { functions: { ${values(contract.functions) .flatMap((v) => v.map(generateInterfaceFunctionDescription)) @@ -120,29 +119,25 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege ? `${new Array(contract.path.length).fill('..').join('/')}/common` : './common' - const imports = - createImportsForUsedIdentifiers( - { - 'type ethers': [ - 'BaseContract', - 'BigNumber', - 'BigNumberish', - 'BytesLike', - 'CallOverrides', - 'ContractTransaction', - 'Overrides', - 'PayableOverrides', - 'PopulatedTransaction', - 'Signer', - 'utils', - ], - 'type @ethersproject/abi': ['FunctionFragment', 'Result', 'EventFragment'], - 'type @ethersproject/providers': ['Listener', 'Provider'], - }, - source, - ) + - '\n' + - createImportTypeDeclaration([...EVENT_IMPORTS, 'PromiseOrValue'], commonPath) + const imports = createImportsForUsedIdentifiers( + { + 'type @ethersproject/contracts': [ + 'BaseContract', + 'ContractTransaction', + 'Overrides', + 'PayableOverrides', + 'PopulatedTransaction', + 'CallOverrides', + ], + 'type @ethersproject/abstract-signer': ['Signer'], + 'type @ethersproject/bignumber': ['BigNumber', 'BigNumberish'], + 'type @ethersproject/bytes': ['BytesLike'], + 'type @ethersproject/abi': ['Interface', 'FunctionFragment', 'Result', 'EventFragment'], + 'type @ethersproject/providers': ['Listener', 'Provider'], + [`type ${commonPath}`]: [...EVENT_IMPORTS, 'PromiseOrValue'], + }, + source, + ) return imports + source } @@ -204,25 +199,19 @@ export function codegenContractFactory( const commonPath = `${new Array(contract.path.length + 1).fill('..').join('/')}/common` - const imports = - createImportsForUsedIdentifiers( - { - ethers: [ - 'Signer', - 'utils', - 'Contract', - 'ContractFactory', - 'PayableOverrides', - 'BytesLike', - 'BigNumberish', - 'Overrides', - ], - 'type @ethersproject/providers': ['Provider', 'TransactionRequest'], - }, - source, - ) + - '\n' + - createImportTypeDeclaration(['PromiseOrValue'], commonPath) + const imports = createImportsForUsedIdentifiers( + { + 'type @ethersproject/abstract-signer': ['Signer'], + 'type @ethersproject/bytes': ['BytesLike'], + 'type @ethersproject/units': ['Units'], + 'type @ethersproject/contracts': ['Contract', 'Overrides'], + '@ethersproject/contracts': ['ContractFactory'], + 'type @ethersproject/bignumber': ['BigNumberish'], + 'type @ethersproject/providers': ['Provider', 'TransactionRequest'], + [`type ${commonPath}`]: ['PromiseOrValue'], + }, + source, + ) return imports + source } @@ -230,7 +219,8 @@ export function codegenContractFactory( export function codegenAbstractContractFactory(contract: Contract, abi: any): string { const { body, header } = codegenCommonContractFactory(contract, abi) return ` - import { Contract, Signer, utils } from "ethers"; + import { Contract } from "@ethersproject/contracts"; + import { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; ${header} @@ -243,7 +233,7 @@ export function codegenAbstractContractFactory(contract: Contract, abi: any): st function codegenCommonContractFactory(contract: Contract, abi: any): { header: string; body: string } { const imports: Set = new Set([contract.name, contract.name + 'Interface']) - contract.constructor[0]?.inputs.forEach(({ type }) => { + contract.constructor[0]?.inputs.forEach(({ type }: { type: any }) => { const { structName } = type as StructType if (structName) { imports.add(structName.namespace || structName.identifier + STRUCT_INPUT_POSTFIX) @@ -263,7 +253,7 @@ function codegenCommonContractFactory(contract: Contract, abi: any): { header: s const body = ` static readonly abi = _abi; static createInterface(): ${contract.name}Interface { - return new utils.Interface(_abi) as ${contract.name}Interface; + return new Interface(_abi) as ${contract.name}Interface; } static connect(address: string, signerOrProvider: Signer | Provider): ${contract.name} { return new Contract(address, _abi, signerOrProvider) as ${contract.name}; diff --git a/packages/target-ethers-v5/static/common.ts b/packages/target-ethers-v5/static/common.ts index 1ba92e4e9..ad865fb9a 100644 --- a/packages/target-ethers-v5/static/common.ts +++ b/packages/target-ethers-v5/static/common.ts @@ -1,5 +1,5 @@ import type { Listener } from '@ethersproject/providers' -import type { Event, EventFilter } from 'ethers' +import type { Event, EventFilter } from '@ethersproject/contracts' export interface TypedEvent = any, TArgsObject = any> extends Event { args: TArgsArray & TArgsObject diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4eca4cfca..496094ba0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -242,6 +242,10 @@ importers: packages/hardhat-test: specifiers: '@ethersproject/abi': ^5.4.7 + '@ethersproject/abstract-signer': ^5.4.7 + '@ethersproject/bignumber': ^5.4.7 + '@ethersproject/bytes': ^5.4.7 + '@ethersproject/contracts': ^5.4.7 '@ethersproject/providers': ^5.4.7 '@nomiclabs/hardhat-ethers': ^2.0.2 '@typechain/ethers-v5': workspace:^10.1.0 @@ -252,6 +256,10 @@ importers: typechain: workspace:^8.1.0 devDependencies: '@ethersproject/abi': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/contracts': 5.7.0 '@ethersproject/providers': 5.6.0 '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.6.0+hardhat@2.9.9 '@typechain/ethers-v5': link:../target-ethers-v5 @@ -263,8 +271,11 @@ importers: packages/target-ethers-v5: specifiers: - '@ethersproject/abi': ^5.0.0 + '@ethersproject/abi': ^5.6.0 + '@ethersproject/abstract-signer': ^5.7.0 + '@ethersproject/bignumber': ^5.7.0 '@ethersproject/bytes': ^5.0.0 + '@ethersproject/contracts': ^5.7.0 '@ethersproject/providers': ^5.0.0 '@types/lodash': ^4.14.139 '@types/proxyquire': ^1.3.28 @@ -280,7 +291,10 @@ importers: ts-essentials: 7.0.3_typescript@4.6.2 devDependencies: '@ethersproject/abi': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 + '@ethersproject/contracts': 5.7.0 '@ethersproject/providers': 5.6.0 '@types/lodash': 4.14.179 '@types/proxyquire': 1.3.28 @@ -293,17 +307,21 @@ importers: packages/target-ethers-v5-test: specifiers: '@ethersproject/abi': ^5.0.0 + '@ethersproject/abstract-signer': ^5.0.0 + '@ethersproject/bignumber': ^5.0.0 '@ethersproject/bytes': ^5.0.0 + '@ethersproject/contracts': ^5.0.0 '@ethersproject/providers': ^5.0.0 - ethers: ^5.1.3 ganache: ^7.0.3 test-utils: 1.0.0 typechain: workspace:^8.1.0 dependencies: '@ethersproject/abi': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 + '@ethersproject/contracts': 5.7.0 '@ethersproject/providers': 5.6.0 - ethers: 5.6.0 devDependencies: ganache: 7.0.3 test-utils: link:../test-utils @@ -889,7 +907,7 @@ packages: dependencies: '@resolver-engine/imports': 0.3.3 '@resolver-engine/imports-fs': 0.3.3 - '@typechain/ethers-v5': 2.0.0_typechain@3.0.0 + '@typechain/ethers-v5': 2.0.0_g7uto4b3myu3f235xnumgfxjwq '@types/mkdirp': 0.5.2 '@types/node-fetch': 2.6.1 ethers: 5.6.0 @@ -1027,12 +1045,12 @@ packages: resolution: {integrity: sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 dev: true @@ -1042,12 +1060,12 @@ packages: resolution: {integrity: sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 @@ -1055,7 +1073,7 @@ packages: resolution: {integrity: sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 @@ -1069,7 +1087,7 @@ packages: resolution: {integrity: sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 @@ -1078,12 +1096,25 @@ packages: '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 + /@ethersproject/abi/5.7.0: + resolution: {integrity: sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==} + dependencies: + '@ethersproject/address': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 + /@ethersproject/abstract-provider/5.4.0: resolution: {integrity: sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/networks': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/transactions': 5.6.0 @@ -1093,21 +1124,32 @@ packages: /@ethersproject/abstract-provider/5.6.0: resolution: {integrity: sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/networks': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/transactions': 5.6.0 '@ethersproject/web': 5.6.0 + /@ethersproject/abstract-provider/5.7.0: + resolution: {integrity: sha512-R41c9UkchKCpAqStMYUpdunjo3pkEvZC3FAwZn5S5MGbXoMQOHIdHItezTETxAO5bevtMApSyEhn9+CHcDsWBw==} + dependencies: + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/networks': 5.7.1 + '@ethersproject/properties': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/web': 5.7.1 + /@ethersproject/abstract-signer/5.4.0: resolution: {integrity: sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 dev: true @@ -1115,73 +1157,103 @@ packages: resolution: {integrity: sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 + /@ethersproject/abstract-signer/5.7.0: + resolution: {integrity: sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==} + dependencies: + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + /@ethersproject/address/5.4.0: resolution: {integrity: sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/rlp': 5.6.0 dev: true /@ethersproject/address/5.6.0: resolution: {integrity: sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/rlp': 5.6.0 + /@ethersproject/address/5.7.0: + resolution: {integrity: sha512-9wYhYt7aghVGo758POM5nqcOMaE168Q6aRLJZwUmiqSrAungkG74gSSeKEIR7ukixesdRZGPgVqme6vmxs1fkA==} + dependencies: + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/rlp': 5.7.0 + /@ethersproject/base64/5.4.0: resolution: {integrity: sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 dev: true /@ethersproject/base64/5.6.0: resolution: {integrity: sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 + + /@ethersproject/base64/5.7.0: + resolution: {integrity: sha512-Dr8tcHt2mEbsZr/mwTPIQAf3Ai0Bks/7gTw9dSqk1mQvhW3XvRlmDJr/4n+wg1JmCl16NZue17CDh8xb/vZ0sQ==} + dependencies: + '@ethersproject/bytes': 5.7.0 /@ethersproject/basex/5.4.0: resolution: {integrity: sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/properties': 5.6.0 dev: true /@ethersproject/basex/5.6.0: resolution: {integrity: sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/properties': 5.6.0 /@ethersproject/bignumber/5.4.0: resolution: {integrity: sha512-OXUu9f9hO3vGRIPxU40cignXZVaYyfx6j9NNMjebKdnaCL3anCLSSy8/b8d03vY6dh7duCC0kW72GEC4tZer2w==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 bn.js: 4.12.0 dev: true /@ethersproject/bignumber/5.6.0: resolution: {integrity: sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 bn.js: 4.12.0 + /@ethersproject/bignumber/5.7.0: + resolution: {integrity: sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==} + dependencies: + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + bn.js: 5.2.1 + /@ethersproject/bytes/5.4.0: resolution: {integrity: sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==} dependencies: - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/bytes/5.6.0: @@ -1189,25 +1261,35 @@ packages: dependencies: '@ethersproject/logger': 5.6.0 + /@ethersproject/bytes/5.7.0: + resolution: {integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==} + dependencies: + '@ethersproject/logger': 5.7.0 + /@ethersproject/constants/5.4.0: resolution: {integrity: sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==} dependencies: - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 dev: true /@ethersproject/constants/5.6.0: resolution: {integrity: sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==} dependencies: - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + + /@ethersproject/constants/5.7.0: + resolution: {integrity: sha512-DHI+y5dBNvkpYUMiRQyxRBYBefZkJfo70VUkUAsRjcPs47muV9evftfZ0PJVCXYbAiCgght0DtcF9srFQmIgWA==} + dependencies: + '@ethersproject/bignumber': 5.7.0 /@ethersproject/contracts/5.4.0: resolution: {integrity: sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==} dependencies: '@ethersproject/abi': 5.6.0 '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 '@ethersproject/constants': 5.6.0 '@ethersproject/logger': 5.6.0 @@ -1220,24 +1302,38 @@ packages: dependencies: '@ethersproject/abi': 5.6.0 '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/transactions': 5.6.0 + /@ethersproject/contracts/5.7.0: + resolution: {integrity: sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==} + dependencies: + '@ethersproject/abi': 5.7.0 + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/transactions': 5.7.0 + /@ethersproject/hash/5.4.0: resolution: {integrity: sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 dev: true @@ -1245,23 +1341,36 @@ packages: /@ethersproject/hash/5.6.0: resolution: {integrity: sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 + /@ethersproject/hash/5.7.0: + resolution: {integrity: sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==} + dependencies: + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/base64': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 + /@ethersproject/hdnode/5.4.0: resolution: {integrity: sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/basex': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/pbkdf2': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/sha2': 5.6.0 @@ -1274,11 +1383,11 @@ packages: /@ethersproject/hdnode/5.6.0: resolution: {integrity: sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/basex': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/pbkdf2': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/sha2': 5.6.0 @@ -1290,12 +1399,12 @@ packages: /@ethersproject/json-wallets/5.4.0: resolution: {integrity: sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hdnode': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/pbkdf2': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/random': 5.6.0 @@ -1308,12 +1417,12 @@ packages: /@ethersproject/json-wallets/5.6.0: resolution: {integrity: sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ==} dependencies: - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hdnode': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/pbkdf2': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/random': 5.6.0 @@ -1325,14 +1434,20 @@ packages: /@ethersproject/keccak256/5.4.0: resolution: {integrity: sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 js-sha3: 0.5.7 dev: true /@ethersproject/keccak256/5.6.0: resolution: {integrity: sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 + js-sha3: 0.8.0 + + /@ethersproject/keccak256/5.7.0: + resolution: {integrity: sha512-2UcPboeL/iW+pSg6vZ6ydF8tCnv3Iu/8tUmLLzWWGzxWKFFqOBQFLo6uLUv6BDrLgCDfN28RJ/wtByx+jZ4KBg==} + dependencies: + '@ethersproject/bytes': 5.7.0 js-sha3: 0.8.0 /@ethersproject/logger/5.4.0: @@ -1342,49 +1457,62 @@ packages: /@ethersproject/logger/5.6.0: resolution: {integrity: sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==} + /@ethersproject/logger/5.7.0: + resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==} + /@ethersproject/networks/5.4.0: resolution: {integrity: sha512-5fywtKRDcnaVeA5SjxXH3DOQqe/IbeD/plwydi94SdPps1fbDUrnO6SzDExaruBZXxpxJcO9upG9UComsei4bg==} dependencies: - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/networks/5.6.0: resolution: {integrity: sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ==} dependencies: - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 + + /@ethersproject/networks/5.7.1: + resolution: {integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==} + dependencies: + '@ethersproject/logger': 5.7.0 /@ethersproject/pbkdf2/5.4.0: resolution: {integrity: sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/sha2': 5.6.0 dev: true /@ethersproject/pbkdf2/5.6.0: resolution: {integrity: sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/sha2': 5.6.0 /@ethersproject/properties/5.4.0: resolution: {integrity: sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==} dependencies: - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/properties/5.6.0: resolution: {integrity: sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==} dependencies: - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 + + /@ethersproject/properties/5.7.0: + resolution: {integrity: sha512-J87jy8suntrAkIZtecpxEPxY//szqr1mlBaYlQ0r4RCaiD2hjheqF9s1LVE8vVuJCXisjIP+JgtK/Do54ej4Sw==} + dependencies: + '@ethersproject/logger': 5.7.0 /@ethersproject/providers/5.4.0: resolution: {integrity: sha512-XRmI9syLnkNdLA8ikEeg0duxmwSWTTt9S+xabnTOyI51JPJyhQ0QUNT+wvmod218ebb7rLupHDPQ7UVe2/+Tjg==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 '@ethersproject/basex': 5.6.0 - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 @@ -1408,10 +1536,10 @@ packages: resolution: {integrity: sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 '@ethersproject/basex': 5.6.0 - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.6.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 @@ -1433,49 +1561,55 @@ packages: /@ethersproject/random/5.4.0: resolution: {integrity: sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/random/5.6.0: resolution: {integrity: sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 /@ethersproject/rlp/5.4.0: resolution: {integrity: sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/rlp/5.6.0: resolution: {integrity: sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + + /@ethersproject/rlp/5.7.0: + resolution: {integrity: sha512-rBxzX2vK8mVF7b0Tol44t5Tb8gomOHkj5guL+HhzQ1yBh/ydjGnpw6at+X6Iw0Kp3OzzzkcKp8N9r0W4kYSs9w==} + dependencies: + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 /@ethersproject/sha2/5.4.0: resolution: {integrity: sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 hash.js: 1.1.7 dev: true /@ethersproject/sha2/5.6.0: resolution: {integrity: sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 hash.js: 1.1.7 /@ethersproject/signing-key/5.4.0: resolution: {integrity: sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 bn.js: 4.12.0 elliptic: 6.5.4 @@ -1485,18 +1619,28 @@ packages: /@ethersproject/signing-key/5.6.0: resolution: {integrity: sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==} dependencies: - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 bn.js: 4.12.0 elliptic: 6.5.4 hash.js: 1.1.7 + /@ethersproject/signing-key/5.7.0: + resolution: {integrity: sha512-MZdy2nL3wO0u7gkB4nA/pEf8lu1TlFswPNmy8AiYkfKTdO6eXBJyUdmHO/ehm/htHw9K/qF8ujnTyUAD+Ry54Q==} + dependencies: + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + bn.js: 5.2.1 + elliptic: 6.5.4 + hash.js: 1.1.7 + /@ethersproject/solidity/5.4.0: resolution: {integrity: sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 '@ethersproject/sha2': 5.6.0 '@ethersproject/strings': 5.6.0 @@ -1505,37 +1649,44 @@ packages: /@ethersproject/solidity/5.6.0: resolution: {integrity: sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww==} dependencies: - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/sha2': 5.6.0 '@ethersproject/strings': 5.6.0 /@ethersproject/strings/5.4.0: resolution: {integrity: sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/strings/5.6.0: resolution: {integrity: sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 + + /@ethersproject/strings/5.7.0: + resolution: {integrity: sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==} + dependencies: + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/logger': 5.7.0 /@ethersproject/transactions/5.4.0: resolution: {integrity: sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/rlp': 5.6.0 '@ethersproject/signing-key': 5.6.0 @@ -1545,43 +1696,56 @@ packages: resolution: {integrity: sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==} dependencies: '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/rlp': 5.6.0 '@ethersproject/signing-key': 5.6.0 + /@ethersproject/transactions/5.7.0: + resolution: {integrity: sha512-kmcNicCp1lp8qanMTC3RIikGgoJ80ztTyvtsFvCYpSCfkjhD0jZ2LOrnbcuxuToLIUYYf+4XwD1rP+B/erDIhQ==} + dependencies: + '@ethersproject/address': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/rlp': 5.7.0 + '@ethersproject/signing-key': 5.7.0 + /@ethersproject/units/5.4.0: resolution: {integrity: sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==} dependencies: - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 dev: true /@ethersproject/units/5.6.0: resolution: {integrity: sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw==} dependencies: - '@ethersproject/bignumber': 5.6.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 /@ethersproject/wallet/5.4.0: resolution: {integrity: sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hash': 5.6.0 '@ethersproject/hdnode': 5.6.0 '@ethersproject/json-wallets': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/random': 5.6.0 '@ethersproject/signing-key': 5.6.0 @@ -1593,15 +1757,15 @@ packages: resolution: {integrity: sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg==} dependencies: '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.6.0 + '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.6.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hash': 5.6.0 '@ethersproject/hdnode': 5.6.0 '@ethersproject/json-wallets': 5.6.0 '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/random': 5.6.0 '@ethersproject/signing-key': 5.6.0 @@ -1612,8 +1776,8 @@ packages: resolution: {integrity: sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==} dependencies: '@ethersproject/base64': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 dev: true @@ -1622,17 +1786,26 @@ packages: resolution: {integrity: sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==} dependencies: '@ethersproject/base64': 5.6.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 + /@ethersproject/web/5.7.1: + resolution: {integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==} + dependencies: + '@ethersproject/base64': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 + /@ethersproject/wordlists/5.4.0: resolution: {integrity: sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hash': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 dev: true @@ -1640,9 +1813,9 @@ packages: /@ethersproject/wordlists/5.6.0: resolution: {integrity: sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q==} dependencies: - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/hash': 5.6.0 - '@ethersproject/logger': 5.6.0 + '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/strings': 5.6.0 @@ -2913,16 +3086,14 @@ packages: resolution: {integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==} dev: true - /@typechain/ethers-v5/2.0.0_typechain@3.0.0: + /@typechain/ethers-v5/2.0.0_g7uto4b3myu3f235xnumgfxjwq: resolution: {integrity: sha512-0xdCkyGOzdqh4h5JSf+zoWx85IusEjDcPIwNEHP8mrWSnCae4rvrqB+/gtpdNfX7zjlFlZiMeePn2r63EI3Lrw==} peerDependencies: + ethers: ^5.0.0 typechain: ^3.0.0 dependencies: ethers: 5.6.0 typechain: 3.0.0_typescript@4.6.2 - transitivePeerDependencies: - - bufferutil - - utf-8-validate dev: true /@types/abstract-leveldown/7.2.0: @@ -4782,6 +4953,9 @@ packages: /bn.js/5.2.0: resolution: {integrity: sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==} + /bn.js/5.2.1: + resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} + /body-parser/1.19.2: resolution: {integrity: sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==} engines: {node: '>= 0.8'} @@ -9720,7 +9894,7 @@ packages: /leb128/0.0.5: resolution: {integrity: sha512-elbNtfmu3GndZbesVF6+iQAfVjOXW9bM/aax9WwMlABZW+oK9sbAZEXoewaPHmL34sxa8kVwWsru8cNE/yn2gg==} dependencies: - bn.js: 5.2.0 + bn.js: 5.2.1 buffer-pipe: 0.0.3 optional: true @@ -14283,7 +14457,6 @@ packages: resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==} engines: {node: '>=4.2.0'} hasBin: true - dev: true /typewise-core/1.2.0: resolution: {integrity: sha1-l+uRgFx/VdL5QXSPpQ0xXZke8ZU=} @@ -16444,7 +16617,7 @@ packages: bip32: 2.0.6 bip39: 3.0.4 blakejs: 1.1.1 - bn.js: 5.2.0 + bn.js: 5.2.1 ipld-dag-cbor: 0.17.1 leb128: 0.0.5 secp256k1: 4.0.3 From fe4ab5cf063cf4b36ab25ed4c54be602066862b8 Mon Sep 17 00:00:00 2001 From: Iain Date: Tue, 27 Sep 2022 17:23:47 -0400 Subject: [PATCH 2/3] fix type issues --- examples/hardhat/package.json | 10 +- packages/hardhat-test/package.json | 2 +- .../factories/Counter__factory.ts | 7 +- .../factories/Demo__factory.ts | 10 +- .../factories/Directory/Hello__factory.ts | 10 +- .../StructsInConstructor__factory.ts | 7 +- packages/hardhat/package.json | 4 +- packages/target-ethers-v5-test/package.json | 13 +- .../test/DataTypesInput.test.ts | 40 +- .../target-ethers-v5-test/test/Events.test.ts | 14 +- .../test/Overload.test.ts | 2 +- packages/target-ethers-v5-test/test/common.ts | 7 +- .../v0.6.4/DataTypesInput__factory.ts | 5 +- .../v0.6.4/DataTypesPure__factory.ts | 5 +- .../v0.6.4/DataTypesView__factory.ts | 5 +- .../types/factories/v0.6.4/Events__factory.ts | 8 +- .../Issue428_Reproduction/A__factory.ts | 8 +- .../Issue428_Reproduction/B__factory.ts | 8 +- .../factories/v0.6.4/Library/Lib__factory.ts | 8 +- .../v0.6.4/LibraryConsumer__factory.ts | 5 +- .../Name-Mangling/NAME12mangling__factory.ts | 5 +- .../factories/v0.6.4/Overloads__factory.ts | 5 +- .../v0.6.4/Payable/PayableFactory__factory.ts | 5 +- .../v0.6.4/Payable/Payable__factory.ts | 5 +- .../factories/v0.8.9/ISimpleToken__factory.ts | 5 +- .../v0.8.9/Issue552_Reproduction__factory.ts | 5 +- .../KingOfTheHill/KingOfTheHill__factory.ts | 5 +- .../KingOfTheHill/Withdrawable__factory.ts | 5 +- .../Rarity/ERC721Enumerable__factory.ts | 5 +- .../v0.8.9/Rarity/ERC721__factory.ts | 8 +- .../Rarity/IERC721Enumerable__factory.ts | 5 +- .../v0.8.9/Rarity/IERC721Receiver__factory.ts | 5 +- .../v0.8.9/Rarity/IERC721__factory.ts | 5 +- .../v0.8.9/Rarity/Rarity__factory.ts | 8 +- .../factories/v0.8.9/SimpleToken__factory.ts | 5 +- .../v0.8.9/nested/a/NestedLibrary__factory.ts | 5 +- .../v0.8.9/nested/b/NestedLibrary__factory.ts | 5 +- packages/target-ethers-v5/package.json | 23 +- .../target-ethers-v5/src/codegen/index.ts | 10 +- packages/typechain/src/codegen/syntax.ts | 1 + pnpm-lock.yaml | 684 ++++++++---------- 41 files changed, 484 insertions(+), 503 deletions(-) diff --git a/examples/hardhat/package.json b/examples/hardhat/package.json index 17668517c..a8f005f4c 100644 --- a/examples/hardhat/package.json +++ b/examples/hardhat/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@nomiclabs/hardhat-ethers": "^2.0.2", "@nomiclabs/hardhat-waffle": "^2.0.1", - "@typechain/ethers-v5": "workspace:^10.0.0", + "@typechain/ethers-v5": "workspace:^10.1.0", "@typechain/hardhat": "workspace:^6.0.0", "@types/chai": "^4.2.15", "@types/chai-as-promised": "^7.1.3", @@ -23,10 +23,10 @@ "chai-as-promised": "^7.1.1", "dotenv": "^8.2.0", "ethereum-waffle": "^3.2.2", - "ethers": "5.4.0", - "@ethersproject/providers": "5.4.0", - "@ethersproject/contracts": "5.4.0", - "@ethersproject/abi": "5.4.0", + "ethers": "5.7.0", + "@ethersproject/providers": "5.7.0", + "@ethersproject/contracts": "5.7.0", + "@ethersproject/abi": "5.7.0", "hardhat": "^2.9.9", "ts-node": "^10.7.0", "typechain": "workspace:^8.0.0", diff --git a/packages/hardhat-test/package.json b/packages/hardhat-test/package.json index 445a519cc..428ee982b 100644 --- a/packages/hardhat-test/package.json +++ b/packages/hardhat-test/package.json @@ -24,7 +24,7 @@ "@nomiclabs/hardhat-ethers": "^2.0.2", "@typechain/ethers-v5": "workspace:^10.1.0", "@typechain/hardhat": "workspace:^6.1.3", - "ethers": "^5.4.7", + "ethers": "^5.7.0", "hardhat": "^2.9.9", "test-utils": "1.0.0", "typechain": "workspace:^8.1.0" diff --git a/packages/hardhat-test/typechain-types/factories/Counter__factory.ts b/packages/hardhat-test/typechain-types/factories/Counter__factory.ts index 4856cd0de..fdf0aa0cf 100644 --- a/packages/hardhat-test/typechain-types/factories/Counter__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Counter__factory.ts @@ -3,10 +3,11 @@ /* eslint-disable */ import type { Signer } from "@ethersproject/abstract-signer"; -import type { Contract, Overrides } from "@ethersproject/contracts"; -import { ContractFactory } from "@ethersproject/contracts"; +import type { Overrides } from "@ethersproject/contracts"; +import { ContractFactory, Contract } from "@ethersproject/contracts"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; +import { Interface } from "@ethersproject/abi"; import type { PromiseOrValue } from "../common"; import type { Counter, CounterInterface } from "../Counter"; @@ -109,7 +110,7 @@ export class Counter__factory extends ContractFactory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): Counter { return new Contract(address, _abi, signerOrProvider) as Counter; } diff --git a/packages/hardhat-test/typechain-types/factories/Demo__factory.ts b/packages/hardhat-test/typechain-types/factories/Demo__factory.ts index 185b08698..0f6e3c91f 100644 --- a/packages/hardhat-test/typechain-types/factories/Demo__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Demo__factory.ts @@ -3,10 +3,11 @@ /* eslint-disable */ import type { Signer } from "@ethersproject/abstract-signer"; -import type { Contract, Overrides } from "@ethersproject/contracts"; -import { ContractFactory } from "@ethersproject/contracts"; +import type { Overrides } from "@ethersproject/contracts"; +import { ContractFactory, Contract } from "@ethersproject/contracts"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; +import { Interface } from "@ethersproject/abi"; import type { PromiseOrValue } from "../common"; import type { Demo, DemoInterface } from "../Demo"; @@ -99,7 +100,10 @@ export class Demo__factory extends ContractFactory { static createInterface(): DemoInterface { return new Interface(_abi) as DemoInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): Demo { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): Demo { return new Contract(address, _abi, signerOrProvider) as Demo; } } diff --git a/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts b/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts index 2508dfb72..f417dd099 100644 --- a/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/Directory/Hello__factory.ts @@ -3,10 +3,11 @@ /* eslint-disable */ import type { Signer } from "@ethersproject/abstract-signer"; -import type { Contract, Overrides } from "@ethersproject/contracts"; -import { ContractFactory } from "@ethersproject/contracts"; +import type { Overrides } from "@ethersproject/contracts"; +import { ContractFactory, Contract } from "@ethersproject/contracts"; import type { BigNumberish } from "@ethersproject/bignumber"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; +import { Interface } from "@ethersproject/abi"; import type { PromiseOrValue } from "../../common"; import type { Hello, HelloInterface } from "../../Directory/Hello"; @@ -68,7 +69,10 @@ export class Hello__factory extends ContractFactory { static createInterface(): HelloInterface { return new Interface(_abi) as HelloInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): Hello { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): Hello { return new Contract(address, _abi, signerOrProvider) as Hello; } } diff --git a/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts b/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts index 3f5db24e7..8adea0f93 100644 --- a/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts +++ b/packages/hardhat-test/typechain-types/factories/StructsInConstructor__factory.ts @@ -3,10 +3,11 @@ /* eslint-disable */ import type { Signer } from "@ethersproject/abstract-signer"; -import type { Contract, Overrides } from "@ethersproject/contracts"; -import { ContractFactory } from "@ethersproject/contracts"; +import type { Overrides } from "@ethersproject/contracts"; +import { ContractFactory, Contract } from "@ethersproject/contracts"; import type { Provider, TransactionRequest } from "@ethersproject/providers"; +import { Interface } from "@ethersproject/abi"; import type { PromiseOrValue } from "../common"; import type { StructsInConstructor, @@ -89,7 +90,7 @@ export class StructsInConstructor__factory extends ContractFactory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): StructsInConstructor { return new Contract( address, diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json index df9daaf7b..296836066 100644 --- a/packages/hardhat/package.json +++ b/packages/hardhat/package.json @@ -39,7 +39,7 @@ "@typechain/ethers-v5": "workspace:^10.1.0", "@types/fs-extra": "^9.0.7", "@types/rimraf": "^3.0.0", - "ethers": "^5.4.7", + "ethers": "^5.7.0", "hardhat": "^2.9.9", "rimraf": "^3.0.2", "typechain": "workspace:^8.1.0", @@ -49,7 +49,7 @@ "@ethersproject/abi": "^5.4.7", "@ethersproject/providers": "^5.4.7", "@typechain/ethers-v5": "workspace:^10.1.0", - "ethers": "^5.4.7", + "ethers": "^5.7.0", "hardhat": "^2.9.9", "typechain": "workspace:^8.1.0" } diff --git a/packages/target-ethers-v5-test/package.json b/packages/target-ethers-v5-test/package.json index 481ed6138..901060315 100644 --- a/packages/target-ethers-v5-test/package.json +++ b/packages/target-ethers-v5-test/package.json @@ -20,11 +20,12 @@ "typechain": "workspace:^8.1.0" }, "dependencies": { - "@ethersproject/abi": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/providers": "^5.0.0", - "@ethersproject/contracts": "^5.0.0", - "@ethersproject/bignumber": "^5.0.0", - "@ethersproject/abstract-signer": "^5.0.0" + "@ethersproject/abi": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/providers": "^5.7.0", + "@ethersproject/contracts": "^5.7.0", + "@ethersproject/strings": "^5.7.0", + "@ethersproject/bignumber": "^5.7.0", + "@ethersproject/abstract-signer": "^5.7.0" } } diff --git a/packages/target-ethers-v5-test/test/DataTypesInput.test.ts b/packages/target-ethers-v5-test/test/DataTypesInput.test.ts index f4978df17..dfce6335d 100644 --- a/packages/target-ethers-v5-test/test/DataTypesInput.test.ts +++ b/packages/target-ethers-v5-test/test/DataTypesInput.test.ts @@ -1,7 +1,9 @@ import type { FunctionFragment } from '@ethersproject/abi' import { expect } from 'earljs' -import type { BigNumberish } from 'ethers' -import { BigNumber, ethers } from 'ethers' +import type { BigNumberish } from '@ethersproject/bignumber' +import { BigNumber } from '@ethersproject/bignumber' +import type { CallOverrides } from '@ethersproject/contracts' +import { formatBytes32String } from '@ethersproject/strings' import type { AssertTrue, IsExact } from 'test-utils' import { q18, typedAssert } from 'test-utils' @@ -53,7 +55,7 @@ describe('DataTypesInput', () => { typedAssert(await chain.contract.input_bytes1([0]), '0x00') typedAssert( - await chain.contract.input_bytes(ethers.utils.formatBytes32String('TypeChain')), + await chain.contract.input_bytes(formatBytes32String('TypeChain')), '0x54797065436861696e0000000000000000000000000000000000000000000000', ) @@ -114,7 +116,7 @@ describe('DataTypesInput', () => { typedAssert(await chain.contract.input_bytes1(getPromise([0])), '0x00') typedAssert( - await chain.contract.input_bytes(getPromise(ethers.utils.formatBytes32String('TypeChain'))), + await chain.contract.input_bytes(getPromise(formatBytes32String('TypeChain'))), '0x54797065436861696e0000000000000000000000000000000000000000000000', ) @@ -167,7 +169,7 @@ describe('DataTypesInput', () => { type InputType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact[], overrides?: ethers.CallOverrides | undefined]> + IsExact[], overrides?: CallOverrides | undefined]> > }) @@ -267,7 +269,7 @@ describe('DataTypesInput', () => { [PromiseOrValue, PromiseOrValue, PromiseOrValue][], [PromiseOrValue, PromiseOrValue, PromiseOrValue][], ], - overrides?: ethers.CallOverrides | undefined, + overrides?: CallOverrides | undefined, ] > > @@ -292,7 +294,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -307,7 +309,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -322,7 +324,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -337,7 +339,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -354,7 +356,7 @@ describe('DataTypesInput', () => { type _t1 = AssertTrue< IsExact< ViewStructType, - [input1: [Struct1Struct[], Struct1Struct[]], overrides?: ethers.CallOverrides | undefined] + [input1: [Struct1Struct[], Struct1Struct[]], overrides?: CallOverrides | undefined] > > }) @@ -374,7 +376,7 @@ describe('DataTypesInput', () => { ViewStructType, [ input1: [[Struct1Struct, Struct1Struct], [Struct1Struct, Struct1Struct], [Struct1Struct, Struct1Struct]], - overrides?: ethers.CallOverrides | undefined, + overrides?: CallOverrides | undefined, ] > > @@ -400,7 +402,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -423,7 +425,7 @@ describe('DataTypesInput', () => { [Struct1Struct, Struct1Struct][], [Struct1Struct, Struct1Struct][], ], - overrides?: ethers.CallOverrides | undefined, + overrides?: CallOverrides | undefined, ] > > @@ -458,7 +460,7 @@ describe('DataTypesInput', () => { [[Struct1Struct, Struct1Struct][], [Struct1Struct, Struct1Struct][], [Struct1Struct, Struct1Struct][]][], [[Struct1Struct, Struct1Struct][], [Struct1Struct, Struct1Struct][], [Struct1Struct, Struct1Struct][]][], ], - overrides?: ethers.CallOverrides | undefined, + overrides?: CallOverrides | undefined, ] > > @@ -503,7 +505,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -518,7 +520,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -533,7 +535,7 @@ describe('DataTypesInput', () => { type ViewStructType = Parameters // eslint-disable-next-line @typescript-eslint/no-unused-vars type _t1 = AssertTrue< - IsExact + IsExact > }) @@ -570,7 +572,7 @@ describe('DataTypesInput', () => { ViewFunctionInputType, [ info1: { a: PromiseOrValue; b: PromiseOrValue }, - overrides?: ethers.CallOverrides | undefined, + overrides?: CallOverrides | undefined, ] > > diff --git a/packages/target-ethers-v5-test/test/Events.test.ts b/packages/target-ethers-v5-test/test/Events.test.ts index 80a2419a8..81f0094a1 100644 --- a/packages/target-ethers-v5-test/test/Events.test.ts +++ b/packages/target-ethers-v5-test/test/Events.test.ts @@ -1,4 +1,4 @@ -import { BigNumber, ethers } from 'ethers' +import { BigNumber } from '@ethersproject/bignumber' import { AssertTrue, IsExact, typedAssert } from 'test-utils' import type { TypedEventFilter } from '../types/common' @@ -65,9 +65,9 @@ describe('Events', () => { contract.on(filter, (a, b, c) => { typedAssert(a, BigNumber.from(1)) typedAssert(b, BigNumber.from(2)) - const args = [a, b] as [ethers.BigNumber, ethers.BigNumber] & { - value1: ethers.BigNumber - value2: ethers.BigNumber + const args = [a, b] as [BigNumber, BigNumber] & { + value1: BigNumber + value2: BigNumber } args.value1 = a args.value2 = b @@ -85,9 +85,9 @@ describe('Events', () => { contract.once(filter, (a, b, c) => { typedAssert(a, BigNumber.from(1)) typedAssert(b, BigNumber.from(2)) - const args = [a, b] as [ethers.BigNumber, ethers.BigNumber] & { - value1: ethers.BigNumber - value2: ethers.BigNumber + const args = [a, b] as [BigNumber, BigNumber] & { + value1: BigNumber + value2: BigNumber } args.value1 = a args.value2 = b diff --git a/packages/target-ethers-v5-test/test/Overload.test.ts b/packages/target-ethers-v5-test/test/Overload.test.ts index 45cc1b80a..485b32032 100644 --- a/packages/target-ethers-v5-test/test/Overload.test.ts +++ b/packages/target-ethers-v5-test/test/Overload.test.ts @@ -1,5 +1,5 @@ import { expect } from 'earljs' -import { BigNumber } from 'ethers' +import { BigNumber } from '@ethersproject/bignumber' import { typedAssert } from 'test-utils' import type { Overloads } from '../types/v0.6.4/Overloads' diff --git a/packages/target-ethers-v5-test/test/common.ts b/packages/target-ethers-v5-test/test/common.ts index 7084b5573..653d39f6d 100644 --- a/packages/target-ethers-v5-test/test/common.ts +++ b/packages/target-ethers-v5-test/test/common.ts @@ -1,5 +1,6 @@ +import { ContractFactory } from '@ethersproject/contracts' import { JsonRpcProvider, JsonRpcSigner } from '@ethersproject/providers' -import { ethers } from 'ethers' +import type { Signer } from '@ethersproject/abstract-signer' import { Server as GanacheServer, server as createGanacheServer } from 'ganache' import { loadContract } from 'test-utils' @@ -43,9 +44,9 @@ export function createNewBlockchain(contractName: string) { return ctx as Ctx } -export function deployContract(signer: ethers.Signer, name: string): Promise { +export function deployContract(signer: Signer, name: string): Promise { const { abi, code } = loadContract(name) - const factory = new ethers.ContractFactory(abi, code, signer) + const factory = new ContractFactory(abi, code, signer) return factory.deploy() as any as Promise } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts index e59ffe971..8e7bfb190 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesInput__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesInput, @@ -960,7 +961,7 @@ export class DataTypesInput__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): DataTypesInput { return new Contract(address, _abi, signerOrProvider) as DataTypesInput; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts index ee7c2ce20..620a8c67a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesPure__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesPure, @@ -224,7 +225,7 @@ export class DataTypesPure__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): DataTypesPure { return new Contract(address, _abi, signerOrProvider) as DataTypesPure; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts index 0726f5a25..3913d8ef4 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/DataTypesView__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { DataTypesView, @@ -224,7 +225,7 @@ export class DataTypesView__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): DataTypesView { return new Contract(address, _abi, signerOrProvider) as DataTypesView; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts index 0882059d4..37d53e8d4 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Events__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Events, EventsInterface } from "../../v0.6.4/Events"; @@ -184,7 +185,10 @@ export class Events__factory { static createInterface(): EventsInterface { return new Interface(_abi) as EventsInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): Events { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): Events { return new Contract(address, _abi, signerOrProvider) as Events; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts index 1f9da2513..d3d38347a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { A, AInterface } from "../../../v0.6.4/Issue428_Reproduction/A"; @@ -28,7 +29,10 @@ export class A__factory { static createInterface(): AInterface { return new Interface(_abi) as AInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): A { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): A { return new Contract(address, _abi, signerOrProvider) as A; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts index c54578b5a..89e0ee02a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { B, BInterface } from "../../../v0.6.4/Issue428_Reproduction/B"; @@ -41,7 +42,10 @@ export class B__factory { static createInterface(): BInterface { return new Interface(_abi) as BInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): B { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): B { return new Contract(address, _abi, signerOrProvider) as B; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts index f6e2a9284..0f672b38c 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Library/Lib__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Lib, LibInterface } from "../../../v0.6.4/Library/Lib"; @@ -34,7 +35,10 @@ export class Lib__factory { static createInterface(): LibInterface { return new Interface(_abi) as LibInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): Lib { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): Lib { return new Contract(address, _abi, signerOrProvider) as Lib; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts index ed9571978..c31a9fc06 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/LibraryConsumer__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { LibraryConsumer, @@ -39,7 +40,7 @@ export class LibraryConsumer__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): LibraryConsumer { return new Contract(address, _abi, signerOrProvider) as LibraryConsumer; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts index 291ffabfa..dcdb595c5 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NAME12mangling, @@ -46,7 +47,7 @@ export class NAME12mangling__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): NAME12mangling { return new Contract(address, _abi, signerOrProvider) as NAME12mangling; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts index 90082967b..1a352ae7a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Overloads__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Overloads, OverloadsInterface } from "../../v0.6.4/Overloads"; @@ -60,7 +61,7 @@ export class Overloads__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): Overloads { return new Contract(address, _abi, signerOrProvider) as Overloads; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts index e4c0cfe9b..8d513a2ee 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { PayableFactory, @@ -33,7 +34,7 @@ export class PayableFactory__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): PayableFactory { return new Contract(address, _abi, signerOrProvider) as PayableFactory; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts index 9c404600a..325948799 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.6.4/Payable/Payable__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Payable, @@ -34,7 +35,7 @@ export class Payable__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): Payable { return new Contract(address, _abi, signerOrProvider) as Payable; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts index f134a2641..e0c734d58 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/ISimpleToken__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ISimpleToken, @@ -38,7 +39,7 @@ export class ISimpleToken__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): ISimpleToken { return new Contract(address, _abi, signerOrProvider) as ISimpleToken; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts index e2455cd94..e3d5fc44a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Issue552_Reproduction, @@ -94,7 +95,7 @@ export class Issue552_Reproduction__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): Issue552_Reproduction { return new Contract( address, diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts index 20d2f559a..ddc26eff9 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { KingOfTheHill, @@ -98,7 +99,7 @@ export class KingOfTheHill__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): KingOfTheHill { return new Contract(address, _abi, signerOrProvider) as KingOfTheHill; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts index 5b2374b77..b1753671a 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Withdrawable, @@ -27,7 +28,7 @@ export class Withdrawable__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): Withdrawable { return new Contract(address, _abi, signerOrProvider) as Withdrawable; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts index 3c824a506..41d4917d9 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ERC721Enumerable, @@ -342,7 +343,7 @@ export class ERC721Enumerable__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): ERC721Enumerable { return new Contract(address, _abi, signerOrProvider) as ERC721Enumerable; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts index 4eafbeaf5..704782998 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { ERC721, ERC721Interface } from "../../../v0.8.9/Rarity/ERC721"; @@ -281,7 +282,10 @@ export class ERC721__factory { static createInterface(): ERC721Interface { return new Interface(_abi) as ERC721Interface; } - static connect(address: string, signerOrProvider: Signer | Provider): ERC721 { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): ERC721 { return new Contract(address, _abi, signerOrProvider) as ERC721; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts index e2345d3d0..87c933248 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721Enumerable, @@ -342,7 +343,7 @@ export class IERC721Enumerable__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): IERC721Enumerable { return new Contract(address, _abi, signerOrProvider) as IERC721Enumerable; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts index b41711422..856b91507 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721Receiver, @@ -54,7 +55,7 @@ export class IERC721Receiver__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): IERC721Receiver { return new Contract(address, _abi, signerOrProvider) as IERC721Receiver; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts index fa34a063f..2dd18e35c 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { IERC721, IERC721Interface } from "../../../v0.8.9/Rarity/IERC721"; @@ -283,7 +284,7 @@ export class IERC721__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): IERC721 { return new Contract(address, _abi, signerOrProvider) as IERC721; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts index 96926af8c..c7aab3671 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { Rarity, RarityInterface } from "../../../v0.8.9/Rarity/Rarity"; @@ -624,7 +625,10 @@ export class Rarity__factory { static createInterface(): RarityInterface { return new Interface(_abi) as RarityInterface; } - static connect(address: string, signerOrProvider: Signer | Provider): Rarity { + static connect( + address: string, + signerOrProvider: Signer | Provider | undefined + ): Rarity { return new Contract(address, _abi, signerOrProvider) as Rarity; } } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts index fbc36cb8d..342a06926 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/SimpleToken__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { SimpleToken, @@ -38,7 +39,7 @@ export class SimpleToken__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): SimpleToken { return new Contract(address, _abi, signerOrProvider) as SimpleToken; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts index 191df0ac2..c8a87ca4f 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NestedLibrary, @@ -33,7 +34,7 @@ export class NestedLibrary__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): NestedLibrary { return new Contract(address, _abi, signerOrProvider) as NestedLibrary; } diff --git a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts index 92a3623e9..5fb09f2dd 100644 --- a/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts +++ b/packages/target-ethers-v5-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts @@ -3,7 +3,8 @@ /* eslint-disable */ import { Contract } from "@ethersproject/contracts"; -import { Signer } from "@ethersproject/abstract-signer"; +import { Interface } from "@ethersproject/abi"; +import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; import type { NestedLibrary, @@ -33,7 +34,7 @@ export class NestedLibrary__factory { } static connect( address: string, - signerOrProvider: Signer | Provider + signerOrProvider: Signer | Provider | undefined ): NestedLibrary { return new Contract(address, _abi, signerOrProvider) as NestedLibrary; } diff --git a/packages/target-ethers-v5/package.json b/packages/target-ethers-v5/package.json index 5477e6e85..722da8d75 100644 --- a/packages/target-ethers-v5/package.json +++ b/packages/target-ethers-v5/package.json @@ -1,5 +1,5 @@ { - "name": "@typechain/ethers-v5", + "name": "@iainnash/ethers-v5-devel-fix", "description": "🔌 TypeChain target for ethers-v5", "keywords": [ "ethers", @@ -8,9 +8,9 @@ "TypeChain", "TypeScript" ], - "version": "10.1.0", + "version": "10.2.4", "license": "MIT", - "repository": "https://github.com/ethereum-ts/Typechain", + "repository": "https://github.com/iainnash/Typechain", "main": "./dist/index.js", "module": "./dist/index.js", "types": "./dist/index.d.ts", @@ -33,23 +33,24 @@ "test:fix": "pnpm lint:fix && pnpm format:fix && pnpm test && pnpm typecheck" }, "peerDependencies": { - "@ethersproject/abi": "^5.0.0", - "@ethersproject/bytes": "^5.0.0", - "@ethersproject/providers": "^5.0.0", - "ethers": "^5.1.3", + "@ethersproject/abi": "^5.7.0", + "@ethersproject/bytes": "^5.7.0", + "@ethersproject/providers": "^5.7.0", "typechain": "workspace:^8.1.0", "typescript": ">=4.3.0" }, + "publishConfig": { + "registry": "https://npm.pkg.github.com/iainnash" + }, "devDependencies": { - "@ethersproject/abi": "^5.6.0", + "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/bignumber": "^5.7.0", - "@ethersproject/bytes": "^5.0.0", + "@ethersproject/bytes": "^5.7.0", "@ethersproject/contracts": "^5.7.0", - "@ethersproject/providers": "^5.0.0", + "@ethersproject/providers": "^5.7.0", "@types/lodash": "^4.14.139", "@types/proxyquire": "^1.3.28", - "ethers": "^5.1.3", "proxyquire": "^2.1.3", "test-utils": "1.0.0", "typechain": "workspace:^8.1.0", diff --git a/packages/target-ethers-v5/src/codegen/index.ts b/packages/target-ethers-v5/src/codegen/index.ts index 6bcae8ed2..c61f16273 100644 --- a/packages/target-ethers-v5/src/codegen/index.ts +++ b/packages/target-ethers-v5/src/codegen/index.ts @@ -204,10 +204,11 @@ export function codegenContractFactory( 'type @ethersproject/abstract-signer': ['Signer'], 'type @ethersproject/bytes': ['BytesLike'], 'type @ethersproject/units': ['Units'], - 'type @ethersproject/contracts': ['Contract', 'Overrides'], - '@ethersproject/contracts': ['ContractFactory'], + 'type @ethersproject/contracts': ['Overrides', 'PayableOverrides', 'CallOverrides', 'ContractTransaction'], + '@ethersproject/contracts': ['ContractFactory', 'Contract'], 'type @ethersproject/bignumber': ['BigNumberish'], 'type @ethersproject/providers': ['Provider', 'TransactionRequest'], + '@ethersproject/abi': ['Interface'], [`type ${commonPath}`]: ['PromiseOrValue'], }, source, @@ -220,7 +221,8 @@ export function codegenAbstractContractFactory(contract: Contract, abi: any): st const { body, header } = codegenCommonContractFactory(contract, abi) return ` import { Contract } from "@ethersproject/contracts"; - import { Signer } from "@ethersproject/abstract-signer"; + import { Interface } from "@ethersproject/abi"; + import type { Signer } from "@ethersproject/abstract-signer"; import type { Provider } from "@ethersproject/providers"; ${header} @@ -255,7 +257,7 @@ function codegenCommonContractFactory(contract: Contract, abi: any): { header: s static createInterface(): ${contract.name}Interface { return new Interface(_abi) as ${contract.name}Interface; } - static connect(address: string, signerOrProvider: Signer | Provider): ${contract.name} { + static connect(address: string, signerOrProvider: Signer | Provider | undefined): ${contract.name} { return new Contract(address, _abi, signerOrProvider) as ${contract.name}; } `.trim() diff --git a/packages/typechain/src/codegen/syntax.ts b/packages/typechain/src/codegen/syntax.ts index 5a5198e0e..f12996805 100644 --- a/packages/typechain/src/codegen/syntax.ts +++ b/packages/typechain/src/codegen/syntax.ts @@ -41,6 +41,7 @@ export function getUsedIdentifiers(identifiers: string[], sourceFile: string): s identifiers.forEach((identifier) => { if (new RegExp(`\\W${identifier}(\\W|$)`).test(sourceFile)) usedIdentifiers.add(identifier) }) + console.log(Array.from(usedIdentifiers)) return Array.from(usedIdentifiers) } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 496094ba0..d445e4ecd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -63,12 +63,12 @@ importers: examples/hardhat: specifiers: - '@ethersproject/abi': 5.4.0 - '@ethersproject/contracts': 5.4.0 - '@ethersproject/providers': 5.4.0 + '@ethersproject/abi': 5.7.0 + '@ethersproject/contracts': 5.7.0 + '@ethersproject/providers': 5.7.0 '@nomiclabs/hardhat-ethers': ^2.0.2 '@nomiclabs/hardhat-waffle': ^2.0.1 - '@typechain/ethers-v5': workspace:^10.0.0 + '@typechain/ethers-v5': workspace:^10.1.0 '@typechain/hardhat': workspace:^6.0.0 '@types/chai': ^4.2.15 '@types/chai-as-promised': ^7.1.3 @@ -78,17 +78,17 @@ importers: chai-as-promised: ^7.1.1 dotenv: ^8.2.0 ethereum-waffle: ^3.2.2 - ethers: 5.4.0 + ethers: 5.7.0 hardhat: ^2.9.9 ts-node: ^10.7.0 typechain: workspace:^8.0.0 typescript: ^4.6 devDependencies: - '@ethersproject/abi': 5.4.0 - '@ethersproject/contracts': 5.4.0 - '@ethersproject/providers': 5.4.0 - '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.4.0+hardhat@2.9.9 - '@nomiclabs/hardhat-waffle': 2.0.3_vg5rnw7vapjgnnmlrqsnbl36dq + '@ethersproject/abi': 5.7.0 + '@ethersproject/contracts': 5.7.0 + '@ethersproject/providers': 5.7.0 + '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.7.0+hardhat@2.9.9 + '@nomiclabs/hardhat-waffle': 2.0.3_h6ctc6v6jrkzlkmpfveebaupf4 '@typechain/ethers-v5': link:../../packages/target-ethers-v5 '@typechain/hardhat': link:../../packages/hardhat '@types/chai': 4.3.0 @@ -99,7 +99,7 @@ importers: chai-as-promised: 7.1.1_chai@4.3.6 dotenv: 8.6.0 ethereum-waffle: 3.4.0_typescript@4.6.2 - ethers: 5.4.0 + ethers: 5.7.0 hardhat: 2.9.9_ydznwdtnuvt5v5poxvazn5c734 ts-node: 10.7.0_55hvwysvdsti7rc6ljwd3v4ani typechain: link:../../packages/typechain @@ -218,7 +218,7 @@ importers: '@typechain/ethers-v5': workspace:^10.1.0 '@types/fs-extra': ^9.0.7 '@types/rimraf': ^3.0.0 - ethers: ^5.4.7 + ethers: ^5.7.0 fs-extra: ^9.1.0 hardhat: ^2.9.9 rimraf: ^3.0.2 @@ -229,11 +229,11 @@ importers: devDependencies: '@ethersproject/abi': 5.6.0 '@ethersproject/providers': 5.6.0 - '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.6.0+hardhat@2.9.9 + '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.7.1+hardhat@2.9.9 '@typechain/ethers-v5': link:../target-ethers-v5 '@types/fs-extra': 9.0.13 '@types/rimraf': 3.0.2 - ethers: 5.6.0 + ethers: 5.7.1 hardhat: 2.9.9_typescript@4.6.2 rimraf: 3.0.2 typechain: link:../typechain @@ -250,7 +250,7 @@ importers: '@nomiclabs/hardhat-ethers': ^2.0.2 '@typechain/ethers-v5': workspace:^10.1.0 '@typechain/hardhat': workspace:^6.1.3 - ethers: ^5.4.7 + ethers: ^5.7.0 hardhat: ^2.9.9 test-utils: 1.0.0 typechain: workspace:^8.1.0 @@ -261,25 +261,24 @@ importers: '@ethersproject/bytes': 5.7.0 '@ethersproject/contracts': 5.7.0 '@ethersproject/providers': 5.6.0 - '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.6.0+hardhat@2.9.9 + '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.7.1+hardhat@2.9.9 '@typechain/ethers-v5': link:../target-ethers-v5 '@typechain/hardhat': link:../hardhat - ethers: 5.6.0 + ethers: 5.7.1 hardhat: 2.9.9 test-utils: link:../test-utils typechain: link:../typechain packages/target-ethers-v5: specifiers: - '@ethersproject/abi': ^5.6.0 + '@ethersproject/abi': ^5.7.0 '@ethersproject/abstract-signer': ^5.7.0 '@ethersproject/bignumber': ^5.7.0 - '@ethersproject/bytes': ^5.0.0 + '@ethersproject/bytes': ^5.7.0 '@ethersproject/contracts': ^5.7.0 - '@ethersproject/providers': ^5.0.0 + '@ethersproject/providers': ^5.7.0 '@types/lodash': ^4.14.139 '@types/proxyquire': ^1.3.28 - ethers: ^5.1.3 lodash: ^4.17.15 proxyquire: ^2.1.3 test-utils: 1.0.0 @@ -290,15 +289,14 @@ importers: lodash: 4.17.21 ts-essentials: 7.0.3_typescript@4.6.2 devDependencies: - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/contracts': 5.7.0 - '@ethersproject/providers': 5.6.0 + '@ethersproject/providers': 5.7.1 '@types/lodash': 4.14.179 '@types/proxyquire': 1.3.28 - ethers: 5.6.0 proxyquire: 2.1.3 test-utils: link:../test-utils typechain: link:../typechain @@ -306,22 +304,24 @@ importers: packages/target-ethers-v5-test: specifiers: - '@ethersproject/abi': ^5.0.0 - '@ethersproject/abstract-signer': ^5.0.0 - '@ethersproject/bignumber': ^5.0.0 - '@ethersproject/bytes': ^5.0.0 - '@ethersproject/contracts': ^5.0.0 - '@ethersproject/providers': ^5.0.0 + '@ethersproject/abi': ^5.7.0 + '@ethersproject/abstract-signer': ^5.7.0 + '@ethersproject/bignumber': ^5.7.0 + '@ethersproject/bytes': ^5.7.0 + '@ethersproject/contracts': ^5.7.0 + '@ethersproject/providers': ^5.7.0 + '@ethersproject/strings': ^5.7.0 ganache: ^7.0.3 test-utils: 1.0.0 typechain: workspace:^8.1.0 dependencies: - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/contracts': 5.7.0 - '@ethersproject/providers': 5.6.0 + '@ethersproject/providers': 5.7.1 + '@ethersproject/strings': 5.7.0 devDependencies: ganache: 7.0.3 test-utils: link:../test-utils @@ -894,7 +894,7 @@ packages: engines: {node: '>=10.0'} dependencies: '@ethereum-waffle/provider': 3.4.1 - ethers: 5.6.0 + ethers: 5.7.1 transitivePeerDependencies: - bufferutil - supports-color @@ -907,10 +907,10 @@ packages: dependencies: '@resolver-engine/imports': 0.3.3 '@resolver-engine/imports-fs': 0.3.3 - '@typechain/ethers-v5': 2.0.0_g7uto4b3myu3f235xnumgfxjwq + '@typechain/ethers-v5': 2.0.0_hvhmgvgv65f7ns5nchpmx3azgq '@types/mkdirp': 0.5.2 '@types/node-fetch': 2.6.1 - ethers: 5.6.0 + ethers: 5.7.1 mkdirp: 0.5.5 node-fetch: 2.6.7 solc: 0.6.12 @@ -930,7 +930,7 @@ packages: dependencies: '@ensdomains/ens': 0.4.5 '@ensdomains/resolver': 0.2.4 - ethers: 5.6.0 + ethers: 5.7.1 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -940,8 +940,8 @@ packages: resolution: {integrity: sha512-h9yChF7IkpJLODg/o9/jlwKwTcXJLSEIq3gewgwUJuBHnhPkJGekcZvsTbximYc+e42QUZrDUATSuTCIryeCEA==} engines: {node: '>=10.0'} dependencies: - '@ethersproject/abi': 5.6.0 - ethers: 5.6.0 + '@ethersproject/abi': 5.7.0 + ethers: 5.7.1 transitivePeerDependencies: - bufferutil - utf-8-validate @@ -952,7 +952,7 @@ packages: engines: {node: '>=10.0'} dependencies: '@ethereum-waffle/ens': 3.3.1 - ethers: 5.6.0 + ethers: 5.7.1 ganache-core: 2.13.2 patch-package: 6.4.7 postinstall-postinstall: 2.1.0 @@ -1044,57 +1044,43 @@ packages: /@ethersproject/abi/5.0.0-beta.153: resolution: {integrity: sha512-aXweZ1Z7vMNzJdLpR1CZUAIgnwjrZeUSvN9syCwlBaEBUFJmFY+HHnfuTI5vIhVs/mRkfJVrbEyl51JZQqyjAg==} dependencies: - '@ethersproject/address': 5.6.0 + '@ethersproject/address': 5.7.0 '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/hash': 5.6.0 - '@ethersproject/keccak256': 5.6.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/keccak256': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 dev: true optional: true /@ethersproject/abi/5.0.7: resolution: {integrity: sha512-Cqktk+hSIckwP/W8O47Eef60VwmoSC/L3lY0+dIBhQPCNn9E4V7rwmm2aFrNRRDJfFlGuZ1khkQUOc3oBX+niw==} dependencies: - '@ethersproject/address': 5.6.0 + '@ethersproject/address': 5.7.0 '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/hash': 5.6.0 - '@ethersproject/keccak256': 5.6.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/keccak256': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 - - /@ethersproject/abi/5.4.0: - resolution: {integrity: sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==} - dependencies: - '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/hash': 5.6.0 - '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 - dev: true + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 /@ethersproject/abi/5.6.0: resolution: {integrity: sha512-AhVByTwdXCc2YQ20v300w6KVHle9g2OFc28ZAFCPnJyEpkv1xKXjZcSTgWOlv1i+0dqlgF8RCF2Rn2KC1t+1Vg==} dependencies: '@ethersproject/address': 5.6.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 '@ethersproject/keccak256': 5.6.0 '@ethersproject/logger': 5.6.0 '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 /@ethersproject/abi/5.7.0: resolution: {integrity: sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA==} @@ -1109,18 +1095,6 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - /@ethersproject/abstract-provider/5.4.0: - resolution: {integrity: sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/networks': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/transactions': 5.6.0 - '@ethersproject/web': 5.6.0 - dev: true - /@ethersproject/abstract-provider/5.6.0: resolution: {integrity: sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==} dependencies: @@ -1143,16 +1117,6 @@ packages: '@ethersproject/transactions': 5.7.0 '@ethersproject/web': 5.7.1 - /@ethersproject/abstract-signer/5.4.0: - resolution: {integrity: sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==} - dependencies: - '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - dev: true - /@ethersproject/abstract-signer/5.6.0: resolution: {integrity: sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==} dependencies: @@ -1161,6 +1125,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 + dev: false /@ethersproject/abstract-signer/5.7.0: resolution: {integrity: sha512-a16V8bq1/Cz+TGCkE2OPMTOUDLS3grCpdjoJCYNnVBbdYEMSgKrU0+B90s8b6H+ByYTBZN7a3g76jdIJi7UfKQ==} @@ -1171,16 +1136,6 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 - /@ethersproject/address/5.4.0: - resolution: {integrity: sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/rlp': 5.6.0 - dev: true - /@ethersproject/address/5.6.0: resolution: {integrity: sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==} dependencies: @@ -1199,12 +1154,6 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/rlp': 5.7.0 - /@ethersproject/base64/5.4.0: - resolution: {integrity: sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==} - dependencies: - '@ethersproject/bytes': 5.7.0 - dev: true - /@ethersproject/base64/5.6.0: resolution: {integrity: sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==} dependencies: @@ -1215,26 +1164,17 @@ packages: dependencies: '@ethersproject/bytes': 5.7.0 - /@ethersproject/basex/5.4.0: - resolution: {integrity: sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==} - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/properties': 5.6.0 - dev: true - /@ethersproject/basex/5.6.0: resolution: {integrity: sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==} dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/properties': 5.6.0 - /@ethersproject/bignumber/5.4.0: - resolution: {integrity: sha512-OXUu9f9hO3vGRIPxU40cignXZVaYyfx6j9NNMjebKdnaCL3anCLSSy8/b8d03vY6dh7duCC0kW72GEC4tZer2w==} + /@ethersproject/basex/5.7.0: + resolution: {integrity: sha512-ywlh43GwZLv2Voc2gQVTKBoVQ1mti3d8HK5aMxsfu/nRDnMmNqaSJ3r3n85HBByT8OpoY96SXM1FogC533T4zw==} dependencies: '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - bn.js: 4.12.0 - dev: true + '@ethersproject/properties': 5.7.0 /@ethersproject/bignumber/5.6.0: resolution: {integrity: sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==} @@ -1242,6 +1182,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 bn.js: 4.12.0 + dev: false /@ethersproject/bignumber/5.7.0: resolution: {integrity: sha512-n1CAdIHRWjSucQO3MC1zPSVgV/6dy/fjL9pMrPP9peL+QxEg9wOsVqwD4+818B6LUEtaXzVHQiuivzRoxPxUGw==} @@ -1250,28 +1191,17 @@ packages: '@ethersproject/logger': 5.7.0 bn.js: 5.2.1 - /@ethersproject/bytes/5.4.0: - resolution: {integrity: sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==} - dependencies: - '@ethersproject/logger': 5.7.0 - dev: true - /@ethersproject/bytes/5.6.0: resolution: {integrity: sha512-3hJPlYemb9V4VLfJF5BfN0+55vltPZSHU3QKUyP9M3Y2TcajbiRrz65UG+xVHOzBereB1b9mn7r12o177xgN7w==} dependencies: '@ethersproject/logger': 5.6.0 + dev: false /@ethersproject/bytes/5.7.0: resolution: {integrity: sha512-nsbxwgFXWh9NyYWo+U8atvmMsSdKJprTcICAkvbBffT75qDocbuggBU0SJiVK2MuTrp0q+xvLkTnGMPK1+uA9A==} dependencies: '@ethersproject/logger': 5.7.0 - /@ethersproject/constants/5.4.0: - resolution: {integrity: sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - dev: true - /@ethersproject/constants/5.6.0: resolution: {integrity: sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==} dependencies: @@ -1282,25 +1212,10 @@ packages: dependencies: '@ethersproject/bignumber': 5.7.0 - /@ethersproject/contracts/5.4.0: - resolution: {integrity: sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==} - dependencies: - '@ethersproject/abi': 5.6.0 - '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/transactions': 5.6.0 - dev: true - /@ethersproject/contracts/5.6.0: resolution: {integrity: sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw==} dependencies: - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@ethersproject/abstract-provider': 5.6.0 '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 @@ -1310,6 +1225,7 @@ packages: '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 '@ethersproject/transactions': 5.6.0 + dev: false /@ethersproject/contracts/5.7.0: resolution: {integrity: sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg==} @@ -1325,19 +1241,6 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/transactions': 5.7.0 - /@ethersproject/hash/5.4.0: - resolution: {integrity: sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==} - dependencies: - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 - dev: true - /@ethersproject/hash/5.6.0: resolution: {integrity: sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==} dependencies: @@ -1348,7 +1251,7 @@ packages: '@ethersproject/keccak256': 5.6.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 /@ethersproject/hash/5.7.0: resolution: {integrity: sha512-qX5WrQfnah1EFnO5zJv1v46a8HW0+E5xuBBDTwMFZLuVTx0tbU2kkx15NqdjxecrLGatQN9FGQKpb1FKdHCt+g==} @@ -1363,23 +1266,6 @@ packages: '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 - /@ethersproject/hdnode/5.4.0: - resolution: {integrity: sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==} - dependencies: - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/basex': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/pbkdf2': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/sha2': 5.6.0 - '@ethersproject/signing-key': 5.6.0 - '@ethersproject/strings': 5.6.0 - '@ethersproject/transactions': 5.6.0 - '@ethersproject/wordlists': 5.6.0 - dev: true - /@ethersproject/hdnode/5.6.0: resolution: {integrity: sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw==} dependencies: @@ -1392,26 +1278,26 @@ packages: '@ethersproject/properties': 5.6.0 '@ethersproject/sha2': 5.6.0 '@ethersproject/signing-key': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 '@ethersproject/transactions': 5.6.0 '@ethersproject/wordlists': 5.6.0 + dev: false - /@ethersproject/json-wallets/5.4.0: - resolution: {integrity: sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==} + /@ethersproject/hdnode/5.7.0: + resolution: {integrity: sha512-OmyYo9EENBPPf4ERhR7oj6uAtUAhYGqOnIS+jE5pTXvdKBS99ikzq1E7Iv0ZQZ5V36Lqx1qZLeak0Ra16qpeOg==} dependencies: '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.6.0 + '@ethersproject/basex': 5.7.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 - '@ethersproject/hdnode': 5.6.0 - '@ethersproject/keccak256': 5.6.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/pbkdf2': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/random': 5.6.0 - '@ethersproject/strings': 5.6.0 - '@ethersproject/transactions': 5.6.0 - aes-js: 3.0.0 - scrypt-js: 3.0.1 + '@ethersproject/pbkdf2': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/signing-key': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/wordlists': 5.7.0 dev: true /@ethersproject/json-wallets/5.6.0: @@ -1426,16 +1312,28 @@ packages: '@ethersproject/pbkdf2': 5.6.0 '@ethersproject/properties': 5.6.0 '@ethersproject/random': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 '@ethersproject/transactions': 5.6.0 aes-js: 3.0.0 scrypt-js: 3.0.1 + dev: false - /@ethersproject/keccak256/5.4.0: - resolution: {integrity: sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==} + /@ethersproject/json-wallets/5.7.0: + resolution: {integrity: sha512-8oee5Xgu6+RKgJTkvEMl2wDgSPSAQ9MB/3JYjFV9jlKvcYHUXZC+cQp0njgmxdHkYWn8s6/IqIZYm0YWCjO/0g==} dependencies: + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 '@ethersproject/bytes': 5.7.0 - js-sha3: 0.5.7 + '@ethersproject/hdnode': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/pbkdf2': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/random': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + aes-js: 3.0.0 + scrypt-js: 3.0.1 dev: true /@ethersproject/keccak256/5.6.0: @@ -1450,49 +1348,40 @@ packages: '@ethersproject/bytes': 5.7.0 js-sha3: 0.8.0 - /@ethersproject/logger/5.4.0: - resolution: {integrity: sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==} - dev: true - /@ethersproject/logger/5.6.0: resolution: {integrity: sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==} /@ethersproject/logger/5.7.0: resolution: {integrity: sha512-0odtFdXu/XHtjQXJYA3u9G0G8btm0ND5Cu8M7i5vhEcE8/HmF4Lbdqanwyv4uQTr2tx6b7fQRmgLrsnpQlmnig==} - /@ethersproject/networks/5.4.0: - resolution: {integrity: sha512-5fywtKRDcnaVeA5SjxXH3DOQqe/IbeD/plwydi94SdPps1fbDUrnO6SzDExaruBZXxpxJcO9upG9UComsei4bg==} + /@ethersproject/networks/5.6.0: + resolution: {integrity: sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ==} dependencies: '@ethersproject/logger': 5.7.0 - dev: true - /@ethersproject/networks/5.6.0: - resolution: {integrity: sha512-DaVzgyThzHgSDLuURhvkp4oviGoGe9iTZW4jMEORHDRCgSZ9K9THGFKqL+qGXqPAYLEgZTf5z2w56mRrPR1MjQ==} + /@ethersproject/networks/5.7.0: + resolution: {integrity: sha512-MG6oHSQHd4ebvJrleEQQ4HhVu8Ichr0RDYEfHzsVAVjHNM+w36x9wp9r+hf1JstMXtseXDtkiVoARAG6M959AA==} dependencies: '@ethersproject/logger': 5.7.0 + dev: true /@ethersproject/networks/5.7.1: resolution: {integrity: sha512-n/MufjFYv3yFcUyfhnXotyDlNdFb7onmkSy8aQERi2PjNcnWQ66xXxa3XlS8nCcA8aJKJjIIMNJTC7tu80GwpQ==} dependencies: '@ethersproject/logger': 5.7.0 - /@ethersproject/pbkdf2/5.4.0: - resolution: {integrity: sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==} - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/sha2': 5.6.0 - dev: true - /@ethersproject/pbkdf2/5.6.0: resolution: {integrity: sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ==} dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/sha2': 5.6.0 + dev: false - /@ethersproject/properties/5.4.0: - resolution: {integrity: sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==} + /@ethersproject/pbkdf2/5.7.0: + resolution: {integrity: sha512-oR/dBRZR6GTyaofd86DehG72hY6NpAjhabkhxgr3X2FpJtJuodEl2auADWBZfhDHgVCbu3/H/Ocq2uC6dpNjjw==} dependencies: - '@ethersproject/logger': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/sha2': 5.7.0 dev: true /@ethersproject/properties/5.6.0: @@ -1505,15 +1394,15 @@ packages: dependencies: '@ethersproject/logger': 5.7.0 - /@ethersproject/providers/5.4.0: - resolution: {integrity: sha512-XRmI9syLnkNdLA8ikEeg0duxmwSWTTt9S+xabnTOyI51JPJyhQ0QUNT+wvmod218ebb7rLupHDPQ7UVe2/+Tjg==} + /@ethersproject/providers/5.6.0: + resolution: {integrity: sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==} dependencies: '@ethersproject/abstract-provider': 5.6.0 '@ethersproject/abstract-signer': 5.7.0 '@ethersproject/address': 5.6.0 '@ethersproject/basex': 5.6.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 + '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/hash': 5.6.0 '@ethersproject/logger': 5.6.0 @@ -1522,7 +1411,7 @@ packages: '@ethersproject/random': 5.6.0 '@ethersproject/rlp': 5.6.0 '@ethersproject/sha2': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 '@ethersproject/transactions': 5.6.0 '@ethersproject/web': 5.6.0 bech32: 1.1.4 @@ -1530,40 +1419,61 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate - dev: true - /@ethersproject/providers/5.6.0: - resolution: {integrity: sha512-6+5PKXTWAttJWFWF8+xCDTCa2/dtq9BNrdKQHGl0IyIOwj99vM6OeThmIRcsIAzIOb8m0XS6w+1KFZwrf3j9nw==} + /@ethersproject/providers/5.7.0: + resolution: {integrity: sha512-+TTrrINMzZ0aXtlwO/95uhAggKm4USLm1PbeCBR/3XZ7+Oey+3pMyddzZEyRhizHpy1HXV0FRWRMI1O3EGYibA==} dependencies: - '@ethersproject/abstract-provider': 5.6.0 + '@ethersproject/abstract-provider': 5.7.0 '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.6.0 - '@ethersproject/basex': 5.6.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/base64': 5.7.0 + '@ethersproject/basex': 5.7.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.6.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/hash': 5.6.0 - '@ethersproject/logger': 5.6.0 - '@ethersproject/networks': 5.6.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/random': 5.6.0 - '@ethersproject/rlp': 5.6.0 - '@ethersproject/sha2': 5.6.0 - '@ethersproject/strings': 5.6.0 - '@ethersproject/transactions': 5.6.0 - '@ethersproject/web': 5.6.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/networks': 5.7.1 + '@ethersproject/properties': 5.7.0 + '@ethersproject/random': 5.7.0 + '@ethersproject/rlp': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/web': 5.7.1 bech32: 1.1.4 ws: 7.4.6 transitivePeerDependencies: - bufferutil - utf-8-validate + dev: true - /@ethersproject/random/5.4.0: - resolution: {integrity: sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==} + /@ethersproject/providers/5.7.1: + resolution: {integrity: sha512-vZveG/DLyo+wk4Ga1yx6jSEHrLPgmTt+dFv0dv8URpVCRf0jVhalps1jq/emN/oXnMRsC7cQgAF32DcXLL7BPQ==} dependencies: + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/base64': 5.7.0 + '@ethersproject/basex': 5.7.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/hash': 5.7.0 '@ethersproject/logger': 5.7.0 - dev: true + '@ethersproject/networks': 5.7.1 + '@ethersproject/properties': 5.7.0 + '@ethersproject/random': 5.7.0 + '@ethersproject/rlp': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/web': 5.7.1 + bech32: 1.1.4 + ws: 7.4.6 + transitivePeerDependencies: + - bufferutil + - utf-8-validate /@ethersproject/random/5.6.0: resolution: {integrity: sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==} @@ -1571,12 +1481,11 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - /@ethersproject/rlp/5.4.0: - resolution: {integrity: sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==} + /@ethersproject/random/5.7.0: + resolution: {integrity: sha512-19WjScqRA8IIeWclFme75VMXSBvi4e6InrUNuaR4s5pTF2qNhcGdCUwdxUVGtDDqC00sDLCO93jPQoDUH4HVmQ==} dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - dev: true /@ethersproject/rlp/5.6.0: resolution: {integrity: sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==} @@ -1590,14 +1499,6 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - /@ethersproject/sha2/5.4.0: - resolution: {integrity: sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==} - dependencies: - '@ethersproject/bytes': 5.7.0 - '@ethersproject/logger': 5.7.0 - hash.js: 1.1.7 - dev: true - /@ethersproject/sha2/5.6.0: resolution: {integrity: sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==} dependencies: @@ -1605,16 +1506,12 @@ packages: '@ethersproject/logger': 5.7.0 hash.js: 1.1.7 - /@ethersproject/signing-key/5.4.0: - resolution: {integrity: sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==} + /@ethersproject/sha2/5.7.0: + resolution: {integrity: sha512-gKlH42riwb3KYp0reLsFTokByAKoJdgFCwI+CCiX/k+Jm2mbNs6oOaCjYQSlI1+XBVejwH2KrmCbMAT/GnRDQw==} dependencies: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - bn.js: 4.12.0 - elliptic: 6.5.4 hash.js: 1.1.7 - dev: true /@ethersproject/signing-key/5.6.0: resolution: {integrity: sha512-S+njkhowmLeUu/r7ir8n78OUKx63kBdMCPssePS89So1TH4hZqnWFsThEd/GiXYp9qMxVrydf7KdM9MTGPFukA==} @@ -1636,16 +1533,6 @@ packages: elliptic: 6.5.4 hash.js: 1.1.7 - /@ethersproject/solidity/5.4.0: - resolution: {integrity: sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/keccak256': 5.6.0 - '@ethersproject/sha2': 5.6.0 - '@ethersproject/strings': 5.6.0 - dev: true - /@ethersproject/solidity/5.6.0: resolution: {integrity: sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww==} dependencies: @@ -1654,14 +1541,18 @@ packages: '@ethersproject/keccak256': 5.6.0 '@ethersproject/logger': 5.7.0 '@ethersproject/sha2': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 + dev: false - /@ethersproject/strings/5.4.0: - resolution: {integrity: sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==} + /@ethersproject/solidity/5.7.0: + resolution: {integrity: sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA==} dependencies: + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.6.0 + '@ethersproject/keccak256': 5.7.0 '@ethersproject/logger': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/strings': 5.7.0 dev: true /@ethersproject/strings/5.6.0: @@ -1670,6 +1561,7 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/logger': 5.7.0 + dev: false /@ethersproject/strings/5.7.0: resolution: {integrity: sha512-/9nu+lj0YswRNSH0NXYqrh8775XNyEdUQAuf3f+SmOrnVewcJ5SBNAjF7lpgehKi4abvNNXyf+HX86czCdJ8Mg==} @@ -1678,20 +1570,6 @@ packages: '@ethersproject/constants': 5.7.0 '@ethersproject/logger': 5.7.0 - /@ethersproject/transactions/5.4.0: - resolution: {integrity: sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==} - dependencies: - '@ethersproject/address': 5.6.0 - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/keccak256': 5.6.0 - '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/rlp': 5.6.0 - '@ethersproject/signing-key': 5.6.0 - dev: true - /@ethersproject/transactions/5.6.0: resolution: {integrity: sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==} dependencies: @@ -1718,39 +1596,20 @@ packages: '@ethersproject/rlp': 5.7.0 '@ethersproject/signing-key': 5.7.0 - /@ethersproject/units/5.4.0: - resolution: {integrity: sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==} - dependencies: - '@ethersproject/bignumber': 5.7.0 - '@ethersproject/constants': 5.6.0 - '@ethersproject/logger': 5.7.0 - dev: true - /@ethersproject/units/5.6.0: resolution: {integrity: sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw==} dependencies: '@ethersproject/bignumber': 5.7.0 '@ethersproject/constants': 5.6.0 '@ethersproject/logger': 5.7.0 + dev: false - /@ethersproject/wallet/5.4.0: - resolution: {integrity: sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==} + /@ethersproject/units/5.7.0: + resolution: {integrity: sha512-pD3xLMy3SJu9kG5xDGI7+xhTEmGXlEqXU4OfNapmfnxLVY4EMSSRp7j1k7eezutBPH7RBN/7QPnwR7hzNlEFeg==} dependencies: - '@ethersproject/abstract-provider': 5.6.0 - '@ethersproject/abstract-signer': 5.7.0 - '@ethersproject/address': 5.6.0 '@ethersproject/bignumber': 5.7.0 - '@ethersproject/bytes': 5.7.0 - '@ethersproject/hash': 5.6.0 - '@ethersproject/hdnode': 5.6.0 - '@ethersproject/json-wallets': 5.6.0 - '@ethersproject/keccak256': 5.6.0 + '@ethersproject/constants': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/random': 5.6.0 - '@ethersproject/signing-key': 5.6.0 - '@ethersproject/transactions': 5.6.0 - '@ethersproject/wordlists': 5.6.0 dev: true /@ethersproject/wallet/5.6.0: @@ -1771,15 +1630,26 @@ packages: '@ethersproject/signing-key': 5.6.0 '@ethersproject/transactions': 5.6.0 '@ethersproject/wordlists': 5.6.0 + dev: false - /@ethersproject/web/5.4.0: - resolution: {integrity: sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==} + /@ethersproject/wallet/5.7.0: + resolution: {integrity: sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA==} dependencies: - '@ethersproject/base64': 5.6.0 + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/bignumber': 5.7.0 '@ethersproject/bytes': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/hdnode': 5.7.0 + '@ethersproject/json-wallets': 5.7.0 + '@ethersproject/keccak256': 5.7.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/random': 5.7.0 + '@ethersproject/signing-key': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/wordlists': 5.7.0 dev: true /@ethersproject/web/5.6.0: @@ -1789,26 +1659,26 @@ packages: '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 - /@ethersproject/web/5.7.1: - resolution: {integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==} + /@ethersproject/web/5.7.0: + resolution: {integrity: sha512-ApHcbbj+muRASVDSCl/tgxaH2LBkRMEYfLOLVa0COipx0+nlu0QKet7U2lEg0vdkh8XRSLf2nd1f1Uk9SrVSGA==} dependencies: '@ethersproject/base64': 5.7.0 '@ethersproject/bytes': 5.7.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.7.0 '@ethersproject/strings': 5.7.0 + dev: true - /@ethersproject/wordlists/5.4.0: - resolution: {integrity: sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==} + /@ethersproject/web/5.7.1: + resolution: {integrity: sha512-Gueu8lSvyjBWL4cYsWsjh6MtMwM0+H4HvqFPZfB6dV8ctbP9zFAO73VG1cMWae0FLPCtz0peKPpZY8/ugJJX2w==} dependencies: + '@ethersproject/base64': 5.7.0 '@ethersproject/bytes': 5.7.0 - '@ethersproject/hash': 5.6.0 '@ethersproject/logger': 5.7.0 - '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 - dev: true + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 /@ethersproject/wordlists/5.6.0: resolution: {integrity: sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q==} @@ -1817,7 +1687,18 @@ packages: '@ethersproject/hash': 5.6.0 '@ethersproject/logger': 5.7.0 '@ethersproject/properties': 5.6.0 - '@ethersproject/strings': 5.6.0 + '@ethersproject/strings': 5.7.0 + dev: false + + /@ethersproject/wordlists/5.7.0: + resolution: {integrity: sha512-S2TFNJNfHWVHNE6cNDjbVlZ6MgE17MIxMbMg2zv3wn+3XSJGosL1m9ZVv3GXCf/2ymSsQ+hRI5IzoMJTG6aoVA==} + dependencies: + '@ethersproject/bytes': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/strings': 5.7.0 + dev: true /@graphql-tools/batch-execute/8.3.2_graphql@15.8.0: resolution: {integrity: sha512-ICWqM+MvEkIPHm18Q0cmkvm134zeQMomBKmTRxyxMNhL/ouz6Nqld52/brSlaHnzA3fczupeRJzZ0YatruGBcQ==} @@ -1979,7 +1860,7 @@ packages: /@ledgerhq/hw-app-eth/6.27.1: resolution: {integrity: sha512-5v9D00syMWMDM0k7xGOWTx3LFHNCfoKF+MysHVvWOdo9JEZj1ZAVKdmSW9sbegtIf3lQUfbXTK63BDKmE3xu6Q==} dependencies: - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@ethersproject/rlp': 5.6.0 '@ledgerhq/cryptoassets': 6.27.1 '@ledgerhq/errors': 6.10.0 @@ -2121,23 +2002,23 @@ packages: fastq: 1.13.0 dev: true - /@nomiclabs/hardhat-ethers/2.0.5_ethers@5.4.0+hardhat@2.9.9: + /@nomiclabs/hardhat-ethers/2.0.5_ethers@5.7.0+hardhat@2.9.9: resolution: {integrity: sha512-A2gZAGB6kUvLx+kzM92HKuUF33F1FSe90L0TmkXkT2Hh0OKRpvWZURUSU2nghD2yC4DzfEZ3DftfeHGvZ2JTUw==} peerDependencies: ethers: ^5.0.0 hardhat: ^2.0.0 dependencies: - ethers: 5.4.0 + ethers: 5.7.0 hardhat: 2.9.9_ydznwdtnuvt5v5poxvazn5c734 dev: true - /@nomiclabs/hardhat-ethers/2.0.5_ethers@5.6.0+hardhat@2.9.9: + /@nomiclabs/hardhat-ethers/2.0.5_ethers@5.7.1+hardhat@2.9.9: resolution: {integrity: sha512-A2gZAGB6kUvLx+kzM92HKuUF33F1FSe90L0TmkXkT2Hh0OKRpvWZURUSU2nghD2yC4DzfEZ3DftfeHGvZ2JTUw==} peerDependencies: ethers: ^5.0.0 hardhat: ^2.0.0 dependencies: - ethers: 5.6.0 + ethers: 5.7.1 hardhat: 2.9.9_typescript@4.6.2 dev: true @@ -2146,7 +2027,7 @@ packages: peerDependencies: hardhat: ^2.0.4 dependencies: - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@ethersproject/address': 5.6.0 cbor: 5.2.0 debug: 4.3.3 @@ -2184,7 +2065,7 @@ packages: - web3-utils dev: true - /@nomiclabs/hardhat-waffle/2.0.3_vg5rnw7vapjgnnmlrqsnbl36dq: + /@nomiclabs/hardhat-waffle/2.0.3_h6ctc6v6jrkzlkmpfveebaupf4: resolution: {integrity: sha512-049PHSnI1CZq6+XTbrMbMv5NaL7cednTfPenx02k3cEh8wBMLa6ys++dBETJa6JjfwgA9nBhhHQ173LJv6k2Pg==} peerDependencies: '@nomiclabs/hardhat-ethers': ^2.0.0 @@ -2192,11 +2073,11 @@ packages: ethers: ^5.0.0 hardhat: ^2.0.0 dependencies: - '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.4.0+hardhat@2.9.9 + '@nomiclabs/hardhat-ethers': 2.0.5_ethers@5.7.0+hardhat@2.9.9 '@types/sinon-chai': 3.2.8 '@types/web3': 1.0.19 ethereum-waffle: 3.4.0_typescript@4.6.2 - ethers: 5.4.0 + ethers: 5.7.0 hardhat: 2.9.9_ydznwdtnuvt5v5poxvazn5c734 dev: true @@ -2757,7 +2638,7 @@ packages: '@truffle/abi-utils': 0.2.10 '@truffle/compile-common': 0.7.29 big.js: 5.2.2 - bn.js: 5.2.0 + bn.js: 5.2.1 cbor: 5.2.0 debug: 4.3.3 lodash: 4.17.21 @@ -2878,7 +2759,7 @@ packages: '@truffle/abi-utils': 0.2.10 '@truffle/codec': 0.12.2 '@truffle/source-map-utils': 1.3.74 - bn.js: 5.2.0 + bn.js: 5.2.1 debug: 4.3.3 json-pointer: 0.6.2 json-stable-stringify: 1.0.1 @@ -2924,7 +2805,7 @@ packages: /@truffle/interface-adapter/0.5.12: resolution: {integrity: sha512-Qrc5VARnvSILYqZNsAM0xsUHqGqphLXVdIvDnhUA1Xj1xyNz8iboTr8bXorMd+Uspw+PXmsW44BJ/Wioo/jL2A==} dependencies: - bn.js: 5.2.0 + bn.js: 5.2.1 ethers: 4.0.49 web3: 1.5.3 transitivePeerDependencies: @@ -3086,13 +2967,13 @@ packages: resolution: {integrity: sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==} dev: true - /@typechain/ethers-v5/2.0.0_g7uto4b3myu3f235xnumgfxjwq: + /@typechain/ethers-v5/2.0.0_hvhmgvgv65f7ns5nchpmx3azgq: resolution: {integrity: sha512-0xdCkyGOzdqh4h5JSf+zoWx85IusEjDcPIwNEHP8mrWSnCae4rvrqB+/gtpdNfX7zjlFlZiMeePn2r63EI3Lrw==} peerDependencies: ethers: ^5.0.0 typechain: ^3.0.0 dependencies: - ethers: 5.6.0 + ethers: 5.7.1 typechain: 3.0.0_typescript@4.6.2 dev: true @@ -5066,7 +4947,7 @@ packages: /browserify-rsa/4.1.0: resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==} dependencies: - bn.js: 5.2.0 + bn.js: 5.2.1 randombytes: 2.1.0 /browserify-sign/4.2.1: @@ -7089,7 +6970,7 @@ packages: '@ethereum-waffle/compiler': 3.4.0_typescript@4.6.2 '@ethereum-waffle/mock-contract': 3.3.1 '@ethereum-waffle/provider': 3.4.1 - ethers: 5.6.0 + ethers: 5.7.1 transitivePeerDependencies: - bufferutil - encoding @@ -7315,44 +7196,6 @@ packages: uuid: 2.0.1 xmlhttprequest: 1.8.0 - /ethers/5.4.0: - resolution: {integrity: sha512-hqN1x0CV8VMpQ25WnNEjaMqtB3nA4DRAb2FSmmNaUbD1dF6kWbHs8YaXbVvD37FCg3GTEyc4rV9Pxafk1ByHKw==} - dependencies: - '@ethersproject/abi': 5.4.0 - '@ethersproject/abstract-provider': 5.4.0 - '@ethersproject/abstract-signer': 5.4.0 - '@ethersproject/address': 5.4.0 - '@ethersproject/base64': 5.4.0 - '@ethersproject/basex': 5.4.0 - '@ethersproject/bignumber': 5.4.0 - '@ethersproject/bytes': 5.4.0 - '@ethersproject/constants': 5.4.0 - '@ethersproject/contracts': 5.4.0 - '@ethersproject/hash': 5.4.0 - '@ethersproject/hdnode': 5.4.0 - '@ethersproject/json-wallets': 5.4.0 - '@ethersproject/keccak256': 5.4.0 - '@ethersproject/logger': 5.4.0 - '@ethersproject/networks': 5.4.0 - '@ethersproject/pbkdf2': 5.4.0 - '@ethersproject/properties': 5.4.0 - '@ethersproject/providers': 5.4.0 - '@ethersproject/random': 5.4.0 - '@ethersproject/rlp': 5.4.0 - '@ethersproject/sha2': 5.4.0 - '@ethersproject/signing-key': 5.4.0 - '@ethersproject/solidity': 5.4.0 - '@ethersproject/strings': 5.4.0 - '@ethersproject/transactions': 5.4.0 - '@ethersproject/units': 5.4.0 - '@ethersproject/wallet': 5.4.0 - '@ethersproject/web': 5.4.0 - '@ethersproject/wordlists': 5.4.0 - transitivePeerDependencies: - - bufferutil - - utf-8-validate - dev: true - /ethers/5.6.0: resolution: {integrity: sha512-00FP71jt6bW3ndO5DhgH9mLIZhoCGnAKFLu8qig5KmV03ubEChKf2ilB3g6fX512tTYo+tSMDJ5WpCJWdBHkBQ==} dependencies: @@ -7389,6 +7232,83 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate + dev: false + + /ethers/5.7.0: + resolution: {integrity: sha512-5Xhzp2ZQRi0Em+0OkOcRHxPzCfoBfgtOQA+RUylSkuHbhTEaQklnYi2hsWbRgs3ztJsXVXd9VKBcO1ScWL8YfA==} + dependencies: + '@ethersproject/abi': 5.7.0 + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/base64': 5.7.0 + '@ethersproject/basex': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/contracts': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/hdnode': 5.7.0 + '@ethersproject/json-wallets': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/networks': 5.7.0 + '@ethersproject/pbkdf2': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/providers': 5.7.0 + '@ethersproject/random': 5.7.0 + '@ethersproject/rlp': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/signing-key': 5.7.0 + '@ethersproject/solidity': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/units': 5.7.0 + '@ethersproject/wallet': 5.7.0 + '@ethersproject/web': 5.7.0 + '@ethersproject/wordlists': 5.7.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + dev: true + + /ethers/5.7.1: + resolution: {integrity: sha512-5krze4dRLITX7FpU8J4WscXqADiKmyeNlylmmDLbS95DaZpBhDe2YSwRQwKXWNyXcox7a3gBgm/MkGXV1O1S/Q==} + dependencies: + '@ethersproject/abi': 5.7.0 + '@ethersproject/abstract-provider': 5.7.0 + '@ethersproject/abstract-signer': 5.7.0 + '@ethersproject/address': 5.7.0 + '@ethersproject/base64': 5.7.0 + '@ethersproject/basex': 5.7.0 + '@ethersproject/bignumber': 5.7.0 + '@ethersproject/bytes': 5.7.0 + '@ethersproject/constants': 5.7.0 + '@ethersproject/contracts': 5.7.0 + '@ethersproject/hash': 5.7.0 + '@ethersproject/hdnode': 5.7.0 + '@ethersproject/json-wallets': 5.7.0 + '@ethersproject/keccak256': 5.7.0 + '@ethersproject/logger': 5.7.0 + '@ethersproject/networks': 5.7.1 + '@ethersproject/pbkdf2': 5.7.0 + '@ethersproject/properties': 5.7.0 + '@ethersproject/providers': 5.7.1 + '@ethersproject/random': 5.7.0 + '@ethersproject/rlp': 5.7.0 + '@ethersproject/sha2': 5.7.0 + '@ethersproject/signing-key': 5.7.0 + '@ethersproject/solidity': 5.7.0 + '@ethersproject/strings': 5.7.0 + '@ethersproject/transactions': 5.7.0 + '@ethersproject/units': 5.7.0 + '@ethersproject/wallet': 5.7.0 + '@ethersproject/web': 5.7.1 + '@ethersproject/wordlists': 5.7.0 + transitivePeerDependencies: + - bufferutil + - utf-8-validate + dev: true /ethjs-unit/0.1.6: resolution: {integrity: sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=} @@ -8307,7 +8227,7 @@ packages: '@ethereumjs/common': 2.6.4 '@ethereumjs/tx': 3.5.2 '@ethereumjs/vm': 5.9.2 - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@metamask/eth-sig-util': 4.0.0 '@sentry/node': 5.30.0 '@solidity-parser/parser': 0.14.1 @@ -8374,7 +8294,7 @@ packages: '@ethereumjs/common': 2.6.4 '@ethereumjs/tx': 3.5.2 '@ethereumjs/vm': 5.9.2 - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@metamask/eth-sig-util': 4.0.0 '@sentry/node': 5.30.0 '@solidity-parser/parser': 0.14.1 @@ -8442,7 +8362,7 @@ packages: '@ethereumjs/common': 2.6.4 '@ethereumjs/tx': 3.5.2 '@ethereumjs/vm': 5.9.2 - '@ethersproject/abi': 5.6.0 + '@ethersproject/abi': 5.7.0 '@metamask/eth-sig-util': 4.0.0 '@sentry/node': 5.30.0 '@solidity-parser/parser': 0.14.1 @@ -14893,7 +14813,7 @@ packages: resolution: {integrity: sha512-ff0q76Cde94HAxLDZ6DbdmKniYCQVtvuaYh+rtOUMB6kssa5FX0q3vPmixi7NPooFnbKmmZCM6NvXg4IreTPIw==} engines: {node: '>=8.0.0'} dependencies: - '@ethersproject/transactions': 5.6.0 + '@ethersproject/transactions': 5.7.0 underscore: 1.9.1 web3-core-helpers: 1.2.11 web3-core-promievent: 1.2.11 @@ -14906,7 +14826,7 @@ packages: resolution: {integrity: sha512-RyegqVGxn0cyYW5yzAwkPlsSEynkdPiegd7RxgB4ak1eKk2Cv1q2x4C7D2sZjeeCEF+q6fOkVmo2OZNqS2iQxg==} engines: {node: '>=8.0.0'} dependencies: - '@ethersproject/transactions': 5.6.0 + '@ethersproject/transactions': 5.7.0 underscore: 1.12.1 web3-core-helpers: 1.3.6 web3-core-promievent: 1.3.6 @@ -14919,7 +14839,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: '@ethereumjs/common': 2.6.2 - '@ethersproject/transactions': 5.6.0 + '@ethersproject/transactions': 5.7.0 web3-core-helpers: 1.5.3 web3-core-promievent: 1.5.3 web3-core-subscriptions: 1.5.3 From 24d5631fa2c5b337d45098cfc1913ee324342188 Mon Sep 17 00:00:00 2001 From: Iain Date: Tue, 27 Sep 2022 17:25:49 -0400 Subject: [PATCH 3/3] remove debugging console.log --- packages/typechain/src/codegen/syntax.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/typechain/src/codegen/syntax.ts b/packages/typechain/src/codegen/syntax.ts index f12996805..5a5198e0e 100644 --- a/packages/typechain/src/codegen/syntax.ts +++ b/packages/typechain/src/codegen/syntax.ts @@ -41,7 +41,6 @@ export function getUsedIdentifiers(identifiers: string[], sourceFile: string): s identifiers.forEach((identifier) => { if (new RegExp(`\\W${identifier}(\\W|$)`).test(sourceFile)) usedIdentifiers.add(identifier) }) - console.log(Array.from(usedIdentifiers)) return Array.from(usedIdentifiers) }