Revert "use ethers narive typing instead of @ethersproject/abstract-provider"

aggre · aggre · commit e7990d025d79 · 2023-08-31T12:14:33.000+09:00
This reverts commit 92eb604.
diff --git a/lib/agent/common/approveIfNeeded.ts b/lib/agent/common/approveIfNeeded.ts
@@ -1,6 +1,9 @@
 /* eslint-disable functional/functional-parameters */
 import { UndefinedOr, whenDefined, whenDefinedAll } from '@devprotocol/util-ts'
-import type { TransactionResponse, TransactionReceipt } from 'ethers'
+import {
+	TransactionResponse,
+	TransactionReceipt,
+} from '@ethersproject/abstract-provider'
 import { createErc20Contract } from '../../common/erc20'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { clientsDev } from './clients/clientsDev'
diff --git a/lib/agent/fixtures/swap-arbitrary-tokens/index.ts b/lib/agent/fixtures/swap-arbitrary-tokens/index.ts
@@ -1,7 +1,7 @@
 import { ContractRunner, ethers } from 'ethers'
 import { swapArbitraryTokensAbi } from './abi'
 import { FallbackableOverrides } from '../../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { createGetEstimatedDevForTokensCaller } from './getEstimatedDevForTokens'
 import { createGetEstimatedTokensForDevCaller } from './getEstimatedTokensForDev'
 import { createSwapTokensAndStakeDevCaller } from './swapTokensAndStakeDev'
diff --git a/lib/agent/fixtures/swap-arbitrary-tokens/swapTokensAndStakeDev.ts b/lib/agent/fixtures/swap-arbitrary-tokens/swapTokensAndStakeDev.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { pathOf } from './path-of'
 
 export type CreateSwapTokensAndStakeDevCaller = (
diff --git a/lib/agent/fixtures/swap/index.ts b/lib/agent/fixtures/swap/index.ts
@@ -5,7 +5,7 @@ import { createGetEstimatedDevForEthCaller } from './getEstimatedDevForEth'
 import { createGetEstimatedEthForDevCaller } from './getEstimatedEthForDev'
 import { createSwapEthAndStakeDevCaller } from './swapEthAndStakeDev'
 import { FallbackableOverrides } from '../../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { always } from 'ramda'
 import { createSwapEthAndStakeDevPolygonCaller } from './swapEthAndStakeDevPolygon'
 import { swapAbiV3Polygon } from './abi-v3-polygon'
diff --git a/lib/agent/fixtures/swap/swapEthAndStakeDev.ts b/lib/agent/fixtures/swap/swapEthAndStakeDev.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateSwapEthAndStakeDevCaller = (
 	contract: ethers.Contract,
diff --git a/lib/agent/fixtures/swap/swapEthAndStakeDevPolygon.ts b/lib/agent/fixtures/swap/swapEthAndStakeDevPolygon.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateSwapEthAndStakeDevPolygonCaller = (
 	contract: ethers.Contract,
diff --git a/lib/agent/positionsClaim.ts b/lib/agent/positionsClaim.ts
@@ -1,4 +1,4 @@
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { FallbackableOverrides } from '../common/utils/execute'
 import type { BaseProvider } from '@ethersproject/providers'
 import { UndefinedOr } from '@devprotocol/util-ts'
diff --git a/lib/agent/positionsCreateWithEth.ts b/lib/agent/positionsCreateWithEth.ts
@@ -1,7 +1,7 @@
 /* eslint-disable functional/functional-parameters */
 import { FallbackableOverrides } from '../common/utils/execute'
 import { clientsUtilsSwapForStake } from './common/clients/clientsUtilsSwapForStake'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { ContractRunner, ZeroHash } from 'ethers'
 
 type PositionsCreateWithEth = (options: {
diff --git a/lib/agent/propertiesAuthenticate.ts b/lib/agent/propertiesAuthenticate.ts
@@ -1,6 +1,6 @@
 import { FallbackableOverrides } from '../common/utils/execute'
 import type { BaseProvider } from '@ethersproject/providers'
-import type { TransactionResponse } from 'ethers'
+import type { TransactionResponse } from '@ethersproject/abstract-provider'
 import { UndefinedOr } from '@devprotocol/util-ts'
 
 type PropertiesAuthenticate = (options: {
diff --git a/lib/agent/propertiesCreate.ts b/lib/agent/propertiesCreate.ts
@@ -1,4 +1,4 @@
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { FallbackableOverrides } from '../common/utils/execute'
 import type { BaseProvider } from '@ethersproject/providers'
 import { UndefinedOr } from '@devprotocol/util-ts'
diff --git a/lib/agent/propertiesCreateToAuthenticate.ts b/lib/agent/propertiesCreateToAuthenticate.ts
@@ -1,6 +1,6 @@
 import { FallbackableOverrides } from '../common/utils/execute'
 import type { BaseProvider } from '@ethersproject/providers'
-import type { TransactionResponse } from 'ethers'
+import type { TransactionResponse } from '@ethersproject/abstract-provider'
 import { UndefinedOr } from '@devprotocol/util-ts'
 
 type PropertiesCreateToAuthenticate = (options: {
diff --git a/lib/agent/propertiesDeauthenticate.ts b/lib/agent/propertiesDeauthenticate.ts
@@ -1,6 +1,6 @@
 import { FallbackableOverrides } from '../common/utils/execute'
 import type { BaseProvider } from '@ethersproject/providers'
-import type { TransactionResponse } from 'ethers'
+import type { TransactionResponse } from '@ethersproject/abstract-provider'
 import { UndefinedOr } from '@devprotocol/util-ts'
 
 type PropertiesDeauthenticate = (options: {
diff --git a/lib/common/erc20/approve.ts b/lib/common/erc20/approve.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateApproveCaller = (
 	contract: ethers.Contract,
diff --git a/lib/common/erc20/index.ts b/lib/common/erc20/index.ts
@@ -10,7 +10,7 @@ import { createSymbolCaller } from './symbol'
 import { createDecimalsCaller } from './decimals'
 import { createAllowanceCaller } from './allowance'
 import { FallbackableOverrides } from '../utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type Erc20Contract = {
 	readonly totalSupply: () => Promise<string>
diff --git a/lib/common/erc20/transfer.ts b/lib/common/erc20/transfer.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateTransferCaller = (
 	contract: ethers.Contract,
diff --git a/lib/common/erc20/transferFrom.ts b/lib/common/erc20/transferFrom.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateTransferFromCaller = (
 	contract: ethers.Contract,
diff --git a/lib/common/utils/execute.ts b/lib/common/utils/execute.ts
@@ -1,9 +1,5 @@
-import {
-	ethers,
-	type BrowserProvider,
-	type TransactionResponse,
-	keccak256,
-} from 'ethers'
+import { ethers, type BrowserProvider, keccak256 } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { always, mergeAll } from 'ramda'
 
 import { Positions } from '../../ethereum/s-tokens'
diff --git a/lib/common/utils/for-test.ts b/lib/common/utils/for-test.ts
@@ -9,8 +9,11 @@
 /* eslint-disable @typescript-eslint/promise-function-async */
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 /* eslint-disable no-extend-native */
-import type { TransactionResponse, TransactionReceipt } from 'ethers'
-import type { BigNumberish } from 'ethers'
+import {
+	TransactionResponse,
+	TransactionReceipt,
+} from '@ethersproject/abstract-provider'
+import type { BigNumber } from '@ethersproject/bignumber'
 
 export type StubTransactionResposeFactory = (p: {
 	readonly hash?: string
@@ -34,15 +37,15 @@ export const stubTransactionResposeFactory: StubTransactionResposeFactory = ({
 			from: 'from',
 			contractAddress: 'contractAddress',
 			transactionIndex: 10,
-			gasUsed: 10n,
+			gasUsed: 10n as unknown as BigNumber,
 			logsBloom: 'logsBloom',
 			blockHash: 'blockHash',
 			transactionHash: 'transactionHash',
 			logs: [],
 			blockNumber: 100,
-			confirmations: () => Promise.resolve(102),
-			cumulativeGasUsed: 10n,
-			effectiveGasPrice: 10n,
+			confirmations: 102,
+			cumulativeGasUsed: 10n as unknown as BigNumber,
+			effectiveGasPrice: 10n as unknown as BigNumber,
 			byzantium: true,
 			type: 10,
 		}),
diff --git a/lib/ethereum/dev/deposit.ts b/lib/ethereum/dev/deposit.ts
@@ -4,7 +4,7 @@ import {
 	MutationOption,
 	FallbackableOverrides,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateDepositCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/dev/index.ts b/lib/ethereum/dev/index.ts
@@ -11,7 +11,7 @@ import { createDecimalsCaller } from '../../common/erc20/decimals'
 import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { createDepositCaller } from './deposit'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type DevContract = {
 	readonly totalSupply: () => Promise<string>
diff --git a/lib/ethereum/lockup/depositToPosition.ts b/lib/ethereum/lockup/depositToPosition.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateDepositToPositionCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/lockup/depositToProperty.ts b/lib/ethereum/lockup/depositToProperty.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateDepositToPropertyCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/lockup/index.ts b/lib/ethereum/lockup/index.ts
@@ -16,7 +16,7 @@ import { createDepositToPropertyCaller } from './depositToProperty'
 import { createDepositToPositionCaller } from './depositToPosition'
 import { createMigrateToSTokensCaller } from './migrateToSTokens'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type LockupContract = {
 	readonly getValue: (
diff --git a/lib/ethereum/lockup/migrateToSTokens.ts b/lib/ethereum/lockup/migrateToSTokens.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateMigrateToSTokensCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/lockup/withdraw.ts b/lib/ethereum/lockup/withdraw.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateWithdrawCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/lockup/withdrawByPosition.ts b/lib/ethereum/lockup/withdrawByPosition.ts
@@ -5,7 +5,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateWithdrawByPositionCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/market-factory/create.ts b/lib/ethereum/market-factory/create.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateCreateCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/market-factory/index.ts b/lib/ethereum/market-factory/index.ts
@@ -2,7 +2,7 @@ import { ContractRunner, ethers } from 'ethers'
 import { marketFactoryAbi } from './abi'
 import { createCreateCaller } from './create'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type MarketFactoryContract = {
 	readonly create: (
diff --git a/lib/ethereum/market/index.ts b/lib/ethereum/market/index.ts
@@ -1,5 +1,5 @@
 import { ContractRunner, ethers } from 'ethers'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { marketAbi } from './abi'
 import { createSchemaCaller } from './schema'
 import { createVoteCaller } from './vote'
diff --git a/lib/ethereum/market/vote.ts b/lib/ethereum/market/vote.ts
@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import {
 	execute,
 	FallbackableOverrides,
diff --git a/lib/ethereum/policy-factory/create.ts b/lib/ethereum/policy-factory/create.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateCreateCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/policy-factory/forceAttach.ts b/lib/ethereum/policy-factory/forceAttach.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateForceAttachCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/policy-factory/index.ts b/lib/ethereum/policy-factory/index.ts
@@ -3,7 +3,7 @@ import { policyFactoryAbi } from './abi'
 import { createCreateCaller } from './create'
 import { createForceAttachCaller } from './forceAttach'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type PolicyFactoryContract = {
 	readonly create: (
diff --git a/lib/ethereum/property-factory/createAndAuthenticate.ts b/lib/ethereum/property-factory/createAndAuthenticate.ts
@@ -2,7 +2,7 @@
 /* eslint-disable functional/no-expression-statement */
 /* eslint-disable functional/no-conditional-statement */
 /* eslint-disable functional/functional-parameters */
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { execute, FallbackableOverrides } from '../../common/utils/execute'
 import { ContractRunner, ethers } from 'ethers'
 import { getMetricsProperty, WaitForEventOptions } from '../market/authenticate'
diff --git a/lib/ethereum/property-factory/index.ts b/lib/ethereum/property-factory/index.ts
@@ -1,5 +1,5 @@
 import { ContractRunner, ethers } from 'ethers'
-import type { TransactionResponse } from 'ethers'
+import type { TransactionResponse } from '@ethersproject/abstract-provider'
 import { propertyFactoryAbi } from './abi'
 import { createCreatePropertyCaller } from './create'
 import { WaitForEventOptions } from '../market/authenticate'
diff --git a/lib/ethereum/property/changeAuthor.ts b/lib/ethereum/property/changeAuthor.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateChangeAuthorCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/property/changeName.ts b/lib/ethereum/property/changeName.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateChangeNameCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/property/changeSymbol.ts b/lib/ethereum/property/changeSymbol.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateChangeSymbolCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/property/index.ts b/lib/ethereum/property/index.ts
@@ -14,7 +14,7 @@ import { createBalanceOfCaller } from '../../common/erc20/balanceOf'
 import { createApproveCaller } from '../../common/erc20/approve'
 import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { FallbackableOverrides } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type PropertyContract = {
 	readonly totalSupply: () => Promise<string>
diff --git a/lib/ethereum/s-tokens/freezeTokenURI.ts b/lib/ethereum/s-tokens/freezeTokenURI.ts
@@ -4,7 +4,7 @@ import {
 	FallbackableOverrides,
 	MutationOption,
 } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateFreezeTokenURICaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/s-tokens/index.ts b/lib/ethereum/s-tokens/index.ts
@@ -13,7 +13,7 @@ import { createPositionsOfOwnerCaller } from './positionsOfOwner'
 import { createSetSTokenRoyaltyForPropertyCaller } from './setSTokenRoyaltyForProperty'
 import { createRoyaltyOfCaller } from './royaltyOf'
 import { createSetTokenURIDescriptorCaller } from './setTokenURIDescriptor'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { createTokenURISimCaller, TokenURISimProps } from './tokenURISim'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { createDescriptorOfCaller } from './descriptorOf'
diff --git a/lib/ethereum/s-tokens/setSTokenRoyaltyForProperty.ts b/lib/ethereum/s-tokens/setSTokenRoyaltyForProperty.ts
@@ -1,6 +1,6 @@
 import { ethers } from 'ethers'
 import { execute, MutationOption } from '../../common/utils/execute'
-import type { TransactionResponse } from 'ethers'
+import { TransactionResponse } from '@ethersproject/abstract-provider'
 
 export type CreateSetSTokenRoyaltyForPropertyCaller = (
 	contract: ethers.Contract,
diff --git a/lib/ethereum/s-tokens/setTokenURIDescriptor.ts b/lib/ethereum/s-tokens/setTokenURIDescriptor.ts
diff --git a/lib/ethereum/s-tokens/setTokenURIImage.ts b/lib/ethereum/s-tokens/setTokenURIImage.ts
diff --git a/lib/ethereum/simpleCollection/removeImage.ts b/lib/ethereum/simpleCollection/removeImage.ts
diff --git a/lib/ethereum/simpleCollection/setImages.ts b/lib/ethereum/simpleCollection/setImages.ts
diff --git a/lib/ethereum/withdraw/bulkWithdraw.ts b/lib/ethereum/withdraw/bulkWithdraw.ts
diff --git a/lib/ethereum/withdraw/index.ts b/lib/ethereum/withdraw/index.ts
diff --git a/lib/ethereum/withdraw/withdraw.ts b/lib/ethereum/withdraw/withdraw.ts
diff --git a/lib/l2/lockup/index.ts b/lib/l2/lockup/index.ts
diff --git a/lib/l2/market-factory/index.ts b/lib/l2/market-factory/index.ts
diff --git a/lib/l2/market/index.ts b/lib/l2/market/index.ts
diff --git a/lib/l2/property-factory/createAndAuthenticate.ts b/lib/l2/property-factory/createAndAuthenticate.ts
diff --git a/lib/l2/property-factory/index.ts b/lib/l2/property-factory/index.ts
diff --git a/lib/l2/property/index.ts b/lib/l2/property/index.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { TransactionResponse } from 'ethers'`
	`1`	`+import { TransactionResponse } from '@ethersproject/abstract-provider'`
`2`	`2`	`import { FallbackableOverrides } from '../common/utils/execute'`
`3`	`3`	`import type { BaseProvider } from '@ethersproject/providers'`
`4`	`4`	`import { UndefinedOr } from '@devprotocol/util-ts'`