diff --git a/.changeset/nasty-years-lie.md b/.changeset/nasty-years-lie.md new file mode 100644 index 000000000..53c288880 --- /dev/null +++ b/.changeset/nasty-years-lie.md @@ -0,0 +1,7 @@ +--- +"@gnosis-guild/typechain-hardhat-test": patch +"@gnosis-guild/typechain-hardhat": patch +"@gnosis-guild/typechain-ethers-v6-test": patch +--- + +feat: typed `attach` return value diff --git a/examples/ethers-v6-nodenext/types/ethers-contracts/Dai.ts b/examples/ethers-v6-nodenext/types/ethers-contracts/Dai.ts index 00753e252..b2c96718a 100644 --- a/examples/ethers-v6-nodenext/types/ethers-contracts/Dai.ts +++ b/examples/ethers-v6-nodenext/types/ethers-contracts/Dai.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -230,6 +231,7 @@ export namespace TransferEvent { export interface Dai extends BaseContract { connect(runner?: ContractRunner | null): Dai; + attach(target: string | Addressable): Dai; waitForDeployment(): Promise; interface: DaiInterface; diff --git a/examples/ethers-v6/types/ethers-contracts/Dai.ts b/examples/ethers-v6/types/ethers-contracts/Dai.ts index 597469cec..b279c30f6 100644 --- a/examples/ethers-v6/types/ethers-contracts/Dai.ts +++ b/examples/ethers-v6/types/ethers-contracts/Dai.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -230,6 +231,7 @@ export namespace TransferEvent { export interface Dai extends BaseContract { connect(runner?: ContractRunner | null): Dai; + attach(target: string | Addressable): Dai; waitForDeployment(): Promise; interface: DaiInterface; diff --git a/package.json b/package.json index 029e2b74a..67bd611b9 100644 --- a/package.json +++ b/package.json @@ -51,5 +51,6 @@ "@types/node" ] } - } -} \ No newline at end of file + }, + "packageManager": "pnpm@8.14.0+sha512.5d4bf97b349faf1a51318aa1ba887e99d9c36e203dbcb55938a91fddd2454246cb00723d6642f54d463a0f52a2701dadf8de002a37fc613c9cdc94ed5675ddce" +} diff --git a/packages/hardhat-test/typechain-types/Counter.ts b/packages/hardhat-test/typechain-types/Counter.ts index 9d8ad3bab..291bd77d6 100644 --- a/packages/hardhat-test/typechain-types/Counter.ts +++ b/packages/hardhat-test/typechain-types/Counter.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -52,6 +53,7 @@ export namespace CountedToEvent { export interface Counter extends BaseContract { connect(runner?: ContractRunner | null): Counter; + attach(target: string | Addressable): Counter; waitForDeployment(): Promise; interface: CounterInterface; diff --git a/packages/hardhat-test/typechain-types/Demo.ts b/packages/hardhat-test/typechain-types/Demo.ts index dae9aab5a..15fdc7095 100644 --- a/packages/hardhat-test/typechain-types/Demo.ts +++ b/packages/hardhat-test/typechain-types/Demo.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, FunctionFragment, @@ -37,6 +38,7 @@ export interface DemoInterface extends Interface {} export interface Demo extends BaseContract { connect(runner?: ContractRunner | null): Demo; + attach(target: string | Addressable): Demo; waitForDeployment(): Promise; interface: DemoInterface; diff --git a/packages/hardhat-test/typechain-types/Directory/Hello.ts b/packages/hardhat-test/typechain-types/Directory/Hello.ts index a68059bfb..1e4b84778 100644 --- a/packages/hardhat-test/typechain-types/Directory/Hello.ts +++ b/packages/hardhat-test/typechain-types/Directory/Hello.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, FunctionFragment, Interface, @@ -20,6 +21,7 @@ export interface HelloInterface extends Interface {} export interface Hello extends BaseContract { connect(runner?: ContractRunner | null): Hello; + attach(target: string | Addressable): Hello; waitForDeployment(): Promise; interface: HelloInterface; diff --git a/packages/hardhat-test/typechain-types/StructsInConstructor.ts b/packages/hardhat-test/typechain-types/StructsInConstructor.ts index 0d9729668..5f53c173b 100644 --- a/packages/hardhat-test/typechain-types/StructsInConstructor.ts +++ b/packages/hardhat-test/typechain-types/StructsInConstructor.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, FunctionFragment, @@ -28,6 +29,7 @@ export interface StructsInConstructorInterface extends Interface {} export interface StructsInConstructor extends BaseContract { connect(runner?: ContractRunner | null): StructsInConstructor; + attach(target: string | Addressable): StructsInConstructor; waitForDeployment(): Promise; interface: StructsInConstructorInterface; 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 31006d6f1..8856f2bfe 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 @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, FunctionFragment, Interface, @@ -20,6 +21,7 @@ export interface EdgeCasesInterface extends Interface {} export interface EdgeCases extends BaseContract { connect(runner?: ContractRunner | null): EdgeCases; + attach(target: string | Addressable): EdgeCases; waitForDeployment(): Promise; interface: EdgeCasesInterface; 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 d9b1c4a62..ab4a61453 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 @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, FunctionFragment, Interface, @@ -20,6 +21,7 @@ export interface TestContractInterface extends Interface {} export interface TestContract extends BaseContract { connect(runner?: ContractRunner | null): TestContract; + attach(target: string | Addressable): TestContract; waitForDeployment(): Promise; interface: TestContractInterface; 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 790f6a613..7e79b0d32 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 @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, FunctionFragment, Interface, @@ -20,6 +21,7 @@ export interface TestContract1Interface extends Interface {} export interface TestContract1 extends BaseContract { connect(runner?: ContractRunner | null): TestContract1; + attach(target: string | Addressable): TestContract1; waitForDeployment(): Promise; interface: TestContract1Interface; 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 105048e9c..99abb5b3e 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 @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -48,6 +49,7 @@ export interface SafeMathInterface extends Interface { export interface SafeMath extends BaseContract { connect(runner?: ContractRunner | null): SafeMath; + attach(target: string | Addressable): SafeMath; waitForDeployment(): Promise; interface: SafeMathInterface; 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 2cec5ac72..ba4d714dd 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 @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -140,6 +141,7 @@ export namespace TransferEvent { export interface ERC20 extends BaseContract { connect(runner?: ContractRunner | null): ERC20; + attach(target: string | Addressable): ERC20; waitForDeployment(): Promise; interface: ERC20Interface; diff --git a/packages/target-ethers-v6-test/package.json b/packages/target-ethers-v6-test/package.json index 5ca98283d..aaf4feb52 100644 --- a/packages/target-ethers-v6-test/package.json +++ b/packages/target-ethers-v6-test/package.json @@ -20,6 +20,6 @@ "typechain": "workspace:^8.3.2" }, "dependencies": { - "ethers": "6.1.0" + "ethers": "6.13.4" } } \ No newline at end of file diff --git a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesInput.ts b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesInput.ts index 28a3dfec1..ecf675162 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesInput.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesInput.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -400,6 +401,7 @@ export namespace event_struct_2Event { export interface DataTypesInput extends BaseContract { connect(runner?: ContractRunner | null): DataTypesInput; + attach(target: string | Addressable): DataTypesInput; waitForDeployment(): Promise; interface: DataTypesInputInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesPure.ts b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesPure.ts index 7b605787c..1c2be43f1 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesPure.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesPure.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -138,6 +139,7 @@ export interface DataTypesPureInterface extends Interface { export interface DataTypesPure extends BaseContract { connect(runner?: ContractRunner | null): DataTypesPure; + attach(target: string | Addressable): DataTypesPure; waitForDeployment(): Promise; interface: DataTypesPureInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesView.ts b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesView.ts index 0dfce6ae7..21bec9f0e 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/DataTypesView.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/DataTypesView.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -138,6 +139,7 @@ export interface DataTypesViewInterface extends Interface { export interface DataTypesView extends BaseContract { connect(runner?: ContractRunner | null): DataTypesView; + attach(target: string | Addressable): DataTypesView; waitForDeployment(): Promise; interface: DataTypesViewInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Events.ts b/packages/target-ethers-v6-test/types/v0.6.4/Events.ts index 13505d614..83915509b 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Events.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Events.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -228,6 +229,7 @@ export namespace UpdateFrequencySetEvent { export interface Events extends BaseContract { connect(runner?: ContractRunner | null): Events; + attach(target: string | Addressable): Events; waitForDeployment(): Promise; interface: EventsInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/A.ts b/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/A.ts index e09106845..1971c708c 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/A.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/A.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, FunctionFragment, Interface, @@ -37,6 +38,7 @@ export namespace CommittedEvent { export interface A extends BaseContract { connect(runner?: ContractRunner | null): A; + attach(target: string | Addressable): A; waitForDeployment(): Promise; interface: AInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/B.ts b/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/B.ts index 171590655..b4dd13b2f 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/B.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Issue428_Reproduction/B.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, FunctionFragment, @@ -52,6 +53,7 @@ export namespace Committed_address_array_Event { export interface B extends BaseContract { connect(runner?: ContractRunner | null): B; + attach(target: string | Addressable): B; waitForDeployment(): Promise; interface: BInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Library/Lib.ts b/packages/target-ethers-v6-test/types/v0.6.4/Library/Lib.ts index f9ca7c6ff..d5eba8ed9 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Library/Lib.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Library/Lib.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -30,6 +31,7 @@ export interface LibInterface extends Interface { export interface Lib extends BaseContract { connect(runner?: ContractRunner | null): Lib; + attach(target: string | Addressable): Lib; waitForDeployment(): Promise; interface: LibInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/LibraryConsumer.ts b/packages/target-ethers-v6-test/types/v0.6.4/LibraryConsumer.ts index 2675f636c..e1a7f6636 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/LibraryConsumer.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/LibraryConsumer.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -33,6 +34,7 @@ export interface LibraryConsumerInterface extends Interface { export interface LibraryConsumer extends BaseContract { connect(runner?: ContractRunner | null): LibraryConsumer; + attach(target: string | Addressable): LibraryConsumer; waitForDeployment(): Promise; interface: LibraryConsumerInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts b/packages/target-ethers-v6-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts index c91b91415..67a49be46 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Name-Mangling/NAME12mangling.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -31,6 +32,7 @@ export interface NAME12manglingInterface extends Interface { export interface NAME12mangling extends BaseContract { connect(runner?: ContractRunner | null): NAME12mangling; + attach(target: string | Addressable): NAME12mangling; waitForDeployment(): Promise; interface: NAME12manglingInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Overloads.ts b/packages/target-ethers-v6-test/types/v0.6.4/Overloads.ts index 17614f0bd..f0f832a9f 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Overloads.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Overloads.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -46,6 +47,7 @@ export interface OverloadsInterface extends Interface { export interface Overloads extends BaseContract { connect(runner?: ContractRunner | null): Overloads; + attach(target: string | Addressable): Overloads; waitForDeployment(): Promise; interface: OverloadsInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Payable/Payable.ts b/packages/target-ethers-v6-test/types/v0.6.4/Payable/Payable.ts index 8222d3c7b..8c5e19087 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Payable/Payable.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Payable/Payable.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -45,6 +46,7 @@ export interface PayableInterface extends Interface { export interface Payable extends BaseContract { connect(runner?: ContractRunner | null): Payable; + attach(target: string | Addressable): Payable; waitForDeployment(): Promise; interface: PayableInterface; diff --git a/packages/target-ethers-v6-test/types/v0.6.4/Payable/PayableFactory.ts b/packages/target-ethers-v6-test/types/v0.6.4/Payable/PayableFactory.ts index ffca10cf4..ceffc5603 100644 --- a/packages/target-ethers-v6-test/types/v0.6.4/Payable/PayableFactory.ts +++ b/packages/target-ethers-v6-test/types/v0.6.4/Payable/PayableFactory.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -32,6 +33,7 @@ export interface PayableFactoryInterface extends Interface { export interface PayableFactory extends BaseContract { connect(runner?: ContractRunner | null): PayableFactory; + attach(target: string | Addressable): PayableFactory; waitForDeployment(): Promise; interface: PayableFactoryInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/ISimpleToken.ts b/packages/target-ethers-v6-test/types/v0.8.9/ISimpleToken.ts index e4493ce8d..3b6232306 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/ISimpleToken.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/ISimpleToken.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -34,6 +35,7 @@ export interface ISimpleTokenInterface extends Interface { export interface ISimpleToken extends BaseContract { connect(runner?: ContractRunner | null): ISimpleToken; + attach(target: string | Addressable): ISimpleToken; waitForDeployment(): Promise; interface: ISimpleTokenInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Issue552_Reproduction.ts b/packages/target-ethers-v6-test/types/v0.8.9/Issue552_Reproduction.ts index db637736c..58658895c 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Issue552_Reproduction.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Issue552_Reproduction.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -72,6 +73,7 @@ export interface Issue552_ReproductionInterface extends Interface { export interface Issue552_Reproduction extends BaseContract { connect(runner?: ContractRunner | null): Issue552_Reproduction; + attach(target: string | Addressable): Issue552_Reproduction; waitForDeployment(): Promise; interface: Issue552_ReproductionInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts b/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts index df85cd561..5e0455228 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/KingOfTheHill.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -65,6 +66,7 @@ export namespace HighestBidIncreasedEvent { export interface KingOfTheHill extends BaseContract { connect(runner?: ContractRunner | null): KingOfTheHill; + attach(target: string | Addressable): KingOfTheHill; waitForDeployment(): Promise; interface: KingOfTheHillInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts b/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts index 8231ca56d..9bf3e8921 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/KingOfTheHill/Withdrawable.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -29,6 +30,7 @@ export interface WithdrawableInterface extends Interface { export interface Withdrawable extends BaseContract { connect(runner?: ContractRunner | null): Withdrawable; + attach(target: string | Addressable): Withdrawable; waitForDeployment(): Promise; interface: WithdrawableInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/NameClashes.ts b/packages/target-ethers-v6-test/types/v0.8.9/NameClashes.ts index b3b663825..55520a079 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/NameClashes.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/NameClashes.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -92,6 +93,7 @@ export interface NameClashesInterface extends Interface { export interface NameClashes extends BaseContract { connect(runner?: ContractRunner | null): NameClashes; + attach(target: string | Addressable): NameClashes; waitForDeployment(): Promise; interface: NameClashesInterface; @@ -133,8 +135,6 @@ export interface NameClashes extends BaseContract { event?: TCEvent ): Promise; - attach: TypedContractMethod<[], [string], "view">; - deployed: TypedContractMethod<[], [string], "view">; provider: TypedContractMethod<[], [string], "view">; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721.ts index a572f5af8..9ec7bf8ad 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -167,6 +168,7 @@ export namespace TransferEvent { export interface ERC721 extends BaseContract { connect(runner?: ContractRunner | null): ERC721; + attach(target: string | Addressable): ERC721; waitForDeployment(): Promise; interface: ERC721Interface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721Enumerable.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721Enumerable.ts index 4b5afba88..1f70fbb58 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721Enumerable.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/ERC721Enumerable.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -194,6 +195,7 @@ export namespace TransferEvent { export interface ERC721Enumerable extends BaseContract { connect(runner?: ContractRunner | null): ERC721Enumerable; + attach(target: string | Addressable): ERC721Enumerable; waitForDeployment(): Promise; interface: ERC721EnumerableInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721.ts index bc1b4ede1..cdc9f7f0a 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -167,6 +168,7 @@ export namespace TransferEvent { export interface IERC721 extends BaseContract { connect(runner?: ContractRunner | null): IERC721; + attach(target: string | Addressable): IERC721; waitForDeployment(): Promise; interface: IERC721Interface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Enumerable.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Enumerable.ts index bfaae3cd3..281ed833e 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Enumerable.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Enumerable.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -194,6 +195,7 @@ export namespace TransferEvent { export interface IERC721Enumerable extends BaseContract { connect(runner?: ContractRunner | null): IERC721Enumerable; + attach(target: string | Addressable): IERC721Enumerable; waitForDeployment(): Promise; interface: IERC721EnumerableInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Receiver.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Receiver.ts index fc8627ec2..5a7ca38a8 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Receiver.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/IERC721Receiver.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -37,6 +38,7 @@ export interface IERC721ReceiverInterface extends Interface { export interface IERC721Receiver extends BaseContract { connect(runner?: ContractRunner | null): IERC721Receiver; + attach(target: string | Addressable): IERC721Receiver; waitForDeployment(): Promise; interface: IERC721ReceiverInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/Rarity.ts b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/Rarity.ts index a1a7e1186..169c4cc89 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/Rarity/Rarity.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/Rarity/Rarity.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -313,6 +314,7 @@ export namespace summonedEvent { export interface Rarity extends BaseContract { connect(runner?: ContractRunner | null): Rarity; + attach(target: string | Addressable): Rarity; waitForDeployment(): Promise; interface: RarityInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/SimpleToken.ts b/packages/target-ethers-v6-test/types/v0.8.9/SimpleToken.ts index 760f9e2d7..b92eecf07 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/SimpleToken.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/SimpleToken.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BigNumberish, BytesLike, @@ -34,6 +35,7 @@ export interface SimpleTokenInterface extends Interface { export interface SimpleToken extends BaseContract { connect(runner?: ContractRunner | null): SimpleToken; + attach(target: string | Addressable): SimpleToken; waitForDeployment(): Promise; interface: SimpleTokenInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/nested/a/NestedLibrary.ts b/packages/target-ethers-v6-test/types/v0.8.9/nested/a/NestedLibrary.ts index 1ee0dbf6f..127880cb6 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/nested/a/NestedLibrary.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/nested/a/NestedLibrary.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -29,6 +30,7 @@ export interface NestedLibraryInterface extends Interface { export interface NestedLibrary extends BaseContract { connect(runner?: ContractRunner | null): NestedLibrary; + attach(target: string | Addressable): NestedLibrary; waitForDeployment(): Promise; interface: NestedLibraryInterface; diff --git a/packages/target-ethers-v6-test/types/v0.8.9/nested/b/NestedLibrary.ts b/packages/target-ethers-v6-test/types/v0.8.9/nested/b/NestedLibrary.ts index 1ee0dbf6f..127880cb6 100644 --- a/packages/target-ethers-v6-test/types/v0.8.9/nested/b/NestedLibrary.ts +++ b/packages/target-ethers-v6-test/types/v0.8.9/nested/b/NestedLibrary.ts @@ -2,6 +2,7 @@ /* tslint:disable */ /* eslint-disable */ import type { + Addressable, BaseContract, BytesLike, FunctionFragment, @@ -29,6 +30,7 @@ export interface NestedLibraryInterface extends Interface { export interface NestedLibrary extends BaseContract { connect(runner?: ContractRunner | null): NestedLibrary; + attach(target: string | Addressable): NestedLibrary; waitForDeployment(): Promise; interface: NestedLibraryInterface; diff --git a/packages/target-ethers-v6/package.json b/packages/target-ethers-v6/package.json index 6dd5925ab..08dc1c573 100644 --- a/packages/target-ethers-v6/package.json +++ b/packages/target-ethers-v6/package.json @@ -40,7 +40,7 @@ "devDependencies": { "@types/lodash": "^4.14.139", "@types/proxyquire": "^1.3.28", - "ethers": "6.1.0", + "ethers": "6.13.4", "proxyquire": "^2.1.3", "test-utils": "1.0.0", "typechain": "workspace:^8.3.2", diff --git a/packages/target-ethers-v6/src/codegen/index.ts b/packages/target-ethers-v6/src/codegen/index.ts index 697dd21e2..65d27536a 100644 --- a/packages/target-ethers-v6/src/codegen/index.ts +++ b/packages/target-ethers-v6/src/codegen/index.ts @@ -67,6 +67,7 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege export interface ${contract.name} extends BaseContract { ${codegenConfig.discriminateTypes ? `contractName: '${contract.name}';\n` : ``} connect(runner?: ContractRunner | null): ${contract.name}; + attach(target: string | Addressable): ${contract.name}; waitForDeployment(): Promise; interface: ${contract.name}Interface; @@ -104,6 +105,7 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege createImportsForUsedIdentifiers( { 'type ethers': [ + 'Addressable', 'BaseContract', 'BigNumberish', 'BytesLike', diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 32eec9108..87a72cab0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,5 +1,9 @@ lockfileVersion: '6.0' +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false + importers: .: @@ -364,8 +368,8 @@ importers: specifier: ^1.3.28 version: 1.3.28 ethers: - specifier: 6.1.0 - version: 6.1.0 + specifier: 6.13.4 + version: 6.13.4 proxyquire: specifier: ^2.1.3 version: 2.1.3 @@ -382,8 +386,8 @@ importers: packages/target-ethers-v6-test: dependencies: ethers: - specifier: 6.1.0 - version: 6.1.0 + specifier: 6.13.4 + version: 6.13.4 devDependencies: ganache: specifier: ^7.8.0 @@ -513,8 +517,12 @@ importers: packages: + /@adraffy/ens-normalize@1.10.1: + resolution: {integrity: sha512-96Z2IP3mYmF1Xg2cDm8f1gWGf/HUVedQ3FMifV4kG/PQ4yEP51xDtRAEfhVNt5f/uzpNkZHwWQuUcu6D6K+Ekw==} + /@adraffy/ens-normalize@1.8.9: resolution: {integrity: sha512-93OmGCV0vO8+JQ3FHG+gZk/MPHzzMPDRiCiFcCQNTCnHaaxsacO3ScTPGlu2wX2dOtgfalbchPcw1cOYYjHCYQ==} + dev: false /@adraffy/ens-normalize@1.9.0: resolution: {integrity: sha512-iowxq3U30sghZotgl4s/oJRci6WPBfNO5YYgk2cIOMCHr3LeGPcsZjCEr+33Q4N+oV3OABDAtA+pyvWjbvBifQ==} @@ -1349,9 +1357,18 @@ packages: tweetnacl-util: 0.15.1 dev: true + /@noble/curves@1.2.0: + resolution: {integrity: sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==} + dependencies: + '@noble/hashes': 1.3.2 + /@noble/hashes@1.1.2: resolution: {integrity: sha512-KYRCASVTv6aeUi1tsF8/vpyR7zpfs3FUzy2Jqm+MU+LmUKhQ0y2FpfwqkCcxSg2ua4GALJd8k2R76WxwZGbQpA==} + /@noble/hashes@1.3.2: + resolution: {integrity: sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==} + engines: {node: '>= 16'} + /@noble/secp256k1@1.7.1: resolution: {integrity: sha512-hOUk6AyBFmqVrv7k5WAw/LpszxVbj9gGN4JRkIX52fdFAj1UA61KXmZDvqVEm+pOyec3+fIeZB02LYa/pWOArw==} @@ -1795,6 +1812,11 @@ packages: dependencies: undici-types: 5.26.5 + /@types/node@22.7.5: + resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} + dependencies: + undici-types: 6.19.8 + /@types/normalize-package-data@2.4.0: resolution: {integrity: sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==} dev: true @@ -2113,6 +2135,9 @@ packages: /aes-js@4.0.0-beta.3: resolution: {integrity: sha512-/xJX0/VTPcbc5xQE2VUP91y1xN8q/rDfhEzLm+vLc3hYvb5+qHCnpJRuFcrKn63zumK/sCwYYzhG8HP78JYSTA==} + /aes-js@4.0.0-beta.5: + resolution: {integrity: sha512-G965FqalsNyrPqgEGON7nIx1e/OVENSgiEIzyC63haUMuvNnwIgIjMs52hlTCKhkBny7A2ORNlfY9Zu+jmGk1Q==} + /agent-base@6.0.2: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} @@ -5028,6 +5053,22 @@ packages: transitivePeerDependencies: - bufferutil - utf-8-validate + dev: false + + /ethers@6.13.4: + resolution: {integrity: sha512-21YtnZVg4/zKkCQPjrDj38B1r4nQvTZLopUGMLQ1ePU2zV/joCfDC3t3iKQjWRzjjjbzR+mdAIoikeBRNkdllA==} + engines: {node: '>=14.0.0'} + dependencies: + '@adraffy/ens-normalize': 1.10.1 + '@noble/curves': 1.2.0 + '@noble/hashes': 1.3.2 + '@types/node': 22.7.5 + aes-js: 4.0.0-beta.5 + tslib: 2.7.0 + ws: 8.17.1 + transitivePeerDependencies: + - bufferutil + - utf-8-validate /ethers@6.3.0: resolution: {integrity: sha512-CKFYvTne1YT4S1glTiu7TgGsj0t6c6GAD7evrIk8zbeUb6nK8dcUPAiAWM8uDX/1NmRTvLM9+1Vnn49hwKtEzw==} @@ -5058,6 +5099,7 @@ packages: is-hex-prefixed: 1.0.0 strip-hex-prefix: 1.0.0 dev: true + bundledDependencies: false /event-target-shim@5.0.1: resolution: {integrity: sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==} @@ -10213,6 +10255,9 @@ packages: /tslib@2.4.0: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} + /tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} + /tsort@0.0.1: resolution: {integrity: sha1-4igPXoF/i/QnVlf9D5rr1E9aJ4Y=} dev: true @@ -10409,6 +10454,9 @@ packages: /undici-types@5.26.5: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} + /undici-types@6.19.8: + resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==} + /undici@5.4.0: resolution: {integrity: sha512-A1SRXysDg7J+mVP46jF+9cKANw0kptqSFZ8tGyL+HBiv0K1spjxPX8Z4EGu+Eu6pjClJUBdnUPlxrOafR668/g==} engines: {node: '>=12.18'} @@ -11179,6 +11227,18 @@ packages: optional: true dev: true + /ws@8.17.1: + resolution: {integrity: sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==} + engines: {node: '>=10.0.0'} + peerDependencies: + bufferutil: ^4.0.1 + utf-8-validate: '>=5.0.2' + peerDependenciesMeta: + bufferutil: + optional: true + utf-8-validate: + optional: true + /ws@8.2.3(bufferutil@4.0.5)(utf-8-validate@5.0.7): resolution: {integrity: sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==} engines: {node: '>=10.0.0'} @@ -11411,7 +11471,3 @@ packages: bn.js: 4.12.0 ethereumjs-util: 6.2.1 dev: true - -settings: - autoInstallPeers: true - excludeLinksFromLockfile: false