Merge pull request #1122 from dev-protocol/ethers-v6

Using Ethers v6.x

Author: aggre

.github/workflows/nodejs.yml

@@ -20,7 +20,6 @@ jobs:
         run: |
           yarn install
           yarn lint
-          yarn run build
-          yarn test
+          yarn test --maxWorkers=50% --silent
         env:
           CI: true

lib/agent/common/approveIfNeeded.ts

@@ -4,11 +4,10 @@ import {
 	TransactionResponse,
 	TransactionReceipt,
 } from '@ethersproject/abstract-provider'
-import type { BaseProvider } from '@ethersproject/providers'
-import { BigNumber } from 'ethers'
 import { createErc20Contract } from '../../common/erc20'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { clientsDev } from './clients/clientsDev'
+import { ContractRunner } from 'ethers'
 
 // eslint-disable-next-line functional/no-mixed-type
 export type ApproveIfNeededResultForApproveIsNeeded = {
@@ -43,7 +42,7 @@ export type ApproveIfNeededResult =
 	| ApproveIfNeededResultForApproveIsNotNeeded
 
 export type ApproveIfNeeded = (factoryOptions: {
-	readonly provider: BaseProvider
+	readonly provider: ContractRunner
 	readonly requiredAmount: string
 	readonly from: string
 	readonly to?: string
@@ -63,7 +62,7 @@ export const approveIfNeeded: ApproveIfNeeded = async (factoryOptions) => {
 	)
 
 	return whenDefinedAll([client, factoryOptions.to], ([dev, to]) => {
-		return BigNumber.from(allowance).lt(factoryOptions.requiredAmount)
+		return BigInt(allowance ?? 0) < BigInt(factoryOptions.requiredAmount)
 			? ({
 					approvalNeeded: true,
 					approveIfNeeded: async (options) => {

lib/agent/common/clients/clientsDev.ts

@@ -5,25 +5,29 @@ import {
 	createDevContract as createDevContractL2,
 	DevContract as DevContractL2,
 } from '../../../l2/dev'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [UndefinedOr<DevContract>, UndefinedOr<DevContractL2>]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
-export const clientsDev = async (provider: BaseProvider): Promise<Results> => {
+export const clientsDev = async (
+	provider: ContractRunner
+): Promise<Results> => {
 	const res =
 		cache.get(provider) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const [registry] = await clientsRegistry(provider)
 			const l1 = registry
 				? createDevContract(provider)(await registry.token())
 				: undefined
 			const l2 = ((data) =>
 				data ? createDevContractL2(provider)(data.map.token) : undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			// eslint-disable-next-line functional/no-expression-statement

lib/agent/common/clients/clientsLockup.ts

@@ -5,30 +5,32 @@ import {
 	createLockupContract as createLockupContractL2,
 	LockupContract as LockupContractL2,
 } from '../../../l2/lockup'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [
 	UndefinedOr<LockupContract>,
 	UndefinedOr<LockupContractL2>
 ]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsLockup = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const [registry] = await clientsRegistry(provider)
 			const l1 = registry
 				? createLockupContract(provider)(await registry.lockup())
 				: undefined
 			const l2 = ((data) =>
 				data ? createLockupContractL2(provider)(data.map.lockup) : undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			// eslint-disable-next-line functional/no-expression-statement

lib/agent/common/clients/clientsMarketFactory.ts

@@ -8,23 +8,23 @@ import {
 	createMarketFactoryContract as createMarketFactoryContractL2,
 	MarketFactoryContract as MarketFactoryContractL2,
 } from '../../../l2/market-factory'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [
 	UndefinedOr<MarketFactoryContract>,
 	UndefinedOr<MarketFactoryContractL2>
 ]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsMarketFactory = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const [registry] = await clientsRegistry(provider)
 			const l1 = registry
 				? createMarketFactoryContract(provider)(await registry.marketFactory())
@@ -33,7 +33,9 @@ export const clientsMarketFactory = async (
 				data
 					? createMarketFactoryContractL2(provider)(data.map.marketFactory)
 					: undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			// eslint-disable-next-line functional/no-expression-statement

lib/agent/common/clients/clientsMetricsFactory.ts

@@ -4,25 +4,27 @@ import {
 	createMetricsFactoryContract as createMetricsFactoryContractL2,
 	MetricsFactoryContract as MetricsFactoryContractL2,
 } from '../../../l2/metrics-factory'
-import type { BaseProvider } from '@ethersproject/providers'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [undefined, UndefinedOr<MetricsFactoryContractL2>]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsMetricsFactory = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const l1 = undefined
 			const l2 = ((data) =>
 				data
 					? createMetricsFactoryContractL2(provider)(data.map.metricsFactory)
 					: undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			// eslint-disable-next-line functional/no-expression-statement

lib/agent/common/clients/clientsMetricsGroup.ts

@@ -3,15 +3,15 @@ import {
 	createMetricsGroupContract,
 	CreateMetricsGroupContract,
 } from '../../../ethereum/metrics-group'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [UndefinedOr<CreateMetricsGroupContract>, undefined]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsMetricsGroup = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??

lib/agent/common/clients/clientsPolicy.ts

@@ -4,19 +4,19 @@ import {
 	createPolicyContract as createPolicyContractL2,
 	PolicyContract as PolicyContractL2,
 } from '../../../l2/policy'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [
 	UndefinedOr<PolicyContract>,
 	UndefinedOr<PolicyContractL2>
 ]
 
 // eslint-disable-next-line functional/prefer-readonly-type
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsPolicy = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??

lib/agent/common/clients/clientsProperty.ts

@@ -8,32 +8,34 @@ import {
 	createPropertyContract as createPropertyContractL2,
 	PropertyContract as PropertyContractL2,
 } from '../../../l2/property'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [
 	UndefinedOr<PropertyContract>,
 	UndefinedOr<PropertyContractL2>
 ]
 
 // eslint-disable-next-line functional/prefer-readonly-type
-const cache: WeakMap<BaseProvider, Map<string, Results>> = new WeakMap()
+const cache: WeakMap<ContractRunner, Map<string, Results>> = new WeakMap()
 
 export const clientsProperty = async (
-	provider: BaseProvider,
+	provider: ContractRunner,
 	tokenAddress: string
 ): Promise<Results> => {
 	const res =
 		cache.get(provider)?.get(tokenAddress) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const [registry] = await clientsRegistry(provider)
 			const l1 = registry
 				? createPropertyContract(provider)(tokenAddress)
 				: undefined
 			const l2 = ((data) =>
 				data ? createPropertyContractL2(provider)(tokenAddress) : undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			const map = cache.get(provider)

lib/agent/common/clients/clientsPropertyFactory.ts

@@ -8,23 +8,23 @@ import {
 	createPropertyFactoryContract as createPropertyFactoryContractL2,
 	PropertyFactoryContract as PropertyFactoryContractL2,
 } from '../../../l2/property-factory'
-import type { BaseProvider } from '@ethersproject/providers'
 import { clientsRegistry } from './clientsRegistry'
+import { ContractRunner } from 'ethers'
 
 type Results = readonly [
 	UndefinedOr<PropertyFactoryContract>,
 	UndefinedOr<PropertyFactoryContractL2>
 ]
 
-const cache: WeakMap<BaseProvider, Results> = new WeakMap()
+const cache: WeakMap<ContractRunner, Results> = new WeakMap()
 
 export const clientsPropertyFactory = async (
-	provider: BaseProvider
+	provider: ContractRunner
 ): Promise<Results> => {
 	const res =
 		cache.get(provider) ??
 		(await (async () => {
-			const net = await provider.getNetwork()
+			const net = await provider.provider?.getNetwork()
 			const [registry] = await clientsRegistry(provider)
 			const l1 = registry
 				? createPropertyFactoryContract(provider)(
@@ -35,7 +35,9 @@ export const clientsPropertyFactory = async (
 				data
 					? createPropertyFactoryContractL2(provider)(data.map.propertyFactory)
 					: undefined)(
-				l2AvailableNetworks.find(({ chainId }) => chainId === net.chainId)
+				l2AvailableNetworks.find(
+					({ chainId }) => chainId === Number(net?.chainId)
+				)
 			)
 			const results: Results = [l1, l2]
 			// eslint-disable-next-line functional/no-expression-statement