From eb56000cb33de554ca353385ea1eaf4dd3d8d553 Mon Sep 17 00:00:00 2001 From: Clouds Flowing Date: Wed, 10 May 2023 16:46:28 +0800 Subject: [PATCH 1/3] fix type ContractRunner --- .../types/ethers-contracts/factories/Dai__factory.ts | 2 +- .../types/factories/v0.6.4/DataTypesInput__factory.ts | 2 +- .../types/factories/v0.6.4/DataTypesPure__factory.ts | 2 +- .../types/factories/v0.6.4/DataTypesView__factory.ts | 2 +- .../types/factories/v0.6.4/Events__factory.ts | 2 +- .../factories/v0.6.4/Issue428_Reproduction/A__factory.ts | 2 +- .../factories/v0.6.4/Issue428_Reproduction/B__factory.ts | 2 +- .../types/factories/v0.6.4/Library/Lib__factory.ts | 2 +- .../types/factories/v0.6.4/LibraryConsumer__factory.ts | 2 +- .../factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts | 2 +- .../types/factories/v0.6.4/Overloads__factory.ts | 2 +- .../types/factories/v0.6.4/Payable/PayableFactory__factory.ts | 2 +- .../types/factories/v0.6.4/Payable/Payable__factory.ts | 2 +- .../types/factories/v0.8.9/ISimpleToken__factory.ts | 2 +- .../types/factories/v0.8.9/Issue552_Reproduction__factory.ts | 2 +- .../factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts | 2 +- .../factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts | 2 +- .../factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts | 2 +- .../types/factories/v0.8.9/Rarity/ERC721__factory.ts | 2 +- .../factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts | 2 +- .../types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts | 2 +- .../types/factories/v0.8.9/Rarity/IERC721__factory.ts | 2 +- .../types/factories/v0.8.9/Rarity/Rarity__factory.ts | 2 +- .../types/factories/v0.8.9/SimpleToken__factory.ts | 2 +- .../types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts | 2 +- .../types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts | 2 +- packages/target-ethers-v6/src/codegen/index.ts | 4 ++-- 27 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts b/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts index fbd890585..0611dab55 100644 --- a/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts +++ b/examples/ethers-v6/types/ethers-contracts/factories/Dai__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Dai, DaiInterface } from "../Dai"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts index c0c5a0991..5a0caa8d9 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesInput__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { DataTypesInput, DataTypesInputInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts index 997c35863..ad5a4bf5d 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesPure__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { DataTypesPure, DataTypesPureInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts index af869ea54..66910d1b6 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/DataTypesView__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { DataTypesView, DataTypesViewInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts index 19b95de1e..3906f8657 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Events__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Events, EventsInterface } from "../../v0.6.4/Events"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts index d0d3874e9..c9b69c6ea 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/A__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { A, AInterface } from "../../../v0.6.4/Issue428_Reproduction/A"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts index 3919b6a91..162814210 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Issue428_Reproduction/B__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { B, BInterface } from "../../../v0.6.4/Issue428_Reproduction/B"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts index dbcad51e2..362d87716 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Library/Lib__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Lib, LibInterface } from "../../../v0.6.4/Library/Lib"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts index e497991c3..a25b4d95f 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/LibraryConsumer__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { LibraryConsumer, LibraryConsumerInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts index a32b8fb83..476c496db 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Name-Mangling/NAME12mangling__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { NAME12mangling, NAME12manglingInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts index dbef1c2e4..2bb72aefd 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Overloads__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Overloads, OverloadsInterface } from "../../v0.6.4/Overloads"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts index 2b9ff9464..977853fe9 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/PayableFactory__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { PayableFactory, PayableFactoryInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts index 832a5109e..418fdc8e7 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.6.4/Payable/Payable__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Payable, PayableInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts index a300af752..f6c9f27a3 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/ISimpleToken__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { ISimpleToken, ISimpleTokenInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts index f65e4fb71..834a2b063 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Issue552_Reproduction__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Issue552_Reproduction, Issue552_ReproductionInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts index 149428cb1..82417648e 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/KingOfTheHill__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { KingOfTheHill, KingOfTheHillInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts index fee29a088..698f75822 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/KingOfTheHill/Withdrawable__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Withdrawable, WithdrawableInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts index cef19e466..36b5255fd 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721Enumerable__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { ERC721Enumerable, ERC721EnumerableInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts index 5180ffb40..d13d12fe2 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/ERC721__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { ERC721, ERC721Interface } from "../../../v0.8.9/Rarity/ERC721"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts index adbfd19fc..ee3735cfd 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Enumerable__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { IERC721Enumerable, IERC721EnumerableInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts index 98a531a2c..d87c1b02f 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721Receiver__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { IERC721Receiver, IERC721ReceiverInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts index 8ddb45589..e7d5f53d2 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/IERC721__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { IERC721, IERC721Interface } from "../../../v0.8.9/Rarity/IERC721"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts index adbbfb15e..12ce533cb 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/Rarity/Rarity__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { Rarity, RarityInterface } from "../../../v0.8.9/Rarity/Rarity"; const _abi = [ diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts index 64b2ba875..165267d00 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/SimpleToken__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { SimpleToken, SimpleTokenInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts index 717dec947..eeda07e02 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/a/NestedLibrary__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { NestedLibrary, NestedLibraryInterface, diff --git a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts index b5b03fb2f..7b874a965 100644 --- a/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts +++ b/packages/target-ethers-v6-test/types/factories/v0.8.9/nested/b/NestedLibrary__factory.ts @@ -2,7 +2,7 @@ /* tslint:disable */ /* eslint-disable */ -import { Contract, Interface, ContractRunner } from "ethers"; +import { Contract, Interface, type ContractRunner } from "ethers"; import type { NestedLibrary, NestedLibraryInterface, diff --git a/packages/target-ethers-v6/src/codegen/index.ts b/packages/target-ethers-v6/src/codegen/index.ts index bb7209f37..a9d117cd0 100644 --- a/packages/target-ethers-v6/src/codegen/index.ts +++ b/packages/target-ethers-v6/src/codegen/index.ts @@ -81,7 +81,7 @@ export function codegenContractTypings(contract: Contract, codegenConfig: Codege getFunction(key: string | FunctionFragment): T; - + ${values(contract.functions) .flatMap((v) => processDeclaration(v, alwaysGenerateOverloads, generateGetFunctionForContract)) .join('\n')} @@ -214,7 +214,7 @@ export function codegenContractFactory( export function codegenAbstractContractFactory(contract: Contract, abi: any): string { const { body, header } = codegenCommonContractFactory(contract, abi) return ` - import { Contract, Interface, ContractRunner } from "ethers"; + import { Contract, Interface, type ContractRunner } from "ethers"; ${header} export class ${contract.name}${FACTORY_POSTFIX} { From f4d7be8f0b873fdf4ac9301b793290ff5ac52d8c Mon Sep 17 00:00:00 2001 From: Clouds Flowing Date: Wed, 10 May 2023 17:05:45 +0800 Subject: [PATCH 2/3] add changeset --- .changeset/ethers-v6-runner.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ethers-v6-runner.md diff --git a/.changeset/ethers-v6-runner.md b/.changeset/ethers-v6-runner.md new file mode 100644 index 000000000..1aaf74c2b --- /dev/null +++ b/.changeset/ethers-v6-runner.md @@ -0,0 +1,5 @@ +--- +"@typechain/ethers-v6": patch +--- + +fix import type ContractRunner From 21df03c3c77f32054bb4365119bd676ffc12a6a3 Mon Sep 17 00:00:00 2001 From: Clouds Flowing Date: Thu, 11 May 2023 00:38:31 +0800 Subject: [PATCH 3/3] fix typing in generated contract --- packages/target-ethers-v6/src/codegen/index.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/target-ethers-v6/src/codegen/index.ts b/packages/target-ethers-v6/src/codegen/index.ts index a9d117cd0..d7ab003b5 100644 --- a/packages/target-ethers-v6/src/codegen/index.ts +++ b/packages/target-ethers-v6/src/codegen/index.ts @@ -188,14 +188,16 @@ export function codegenContractFactory( createImportsForUsedIdentifiers( { ethers: [ - 'Signer', 'Contract', 'ContractFactory', + 'ContractTransactionResponse', + 'Interface', + ], + 'type ethers': [ + 'Signer', 'BytesLike', 'BigNumberish', 'Overrides', - 'ContractTransactionResponse', - 'Interface', 'AddressLike', 'ContractDeployTransaction', 'Provider',