fix typings

Author: aggre

lib/agent/common/approveIfNeeded.ts

@@ -1,5 +1,5 @@
 /* eslint-disable functional/functional-parameters */
-import { UndefinedOr, whenDefinedAll } from '@devprotocol/util-ts'
+import { whenDefinedAll } from '@devprotocol/util-ts'
 import {
 	TransactionResponse,
 	TransactionReceipt,
@@ -9,40 +9,44 @@ import { BigNumber } from 'ethers'
 import { FallbackableOverrides } from '../../common/utils/execute'
 import { devClients } from './clients/devClients'
 
-export const approveIfNeeded =
-	(factoryOptions: {
-		readonly provider: Provider
-		readonly requiredAmount: string
-		readonly from: string
-		readonly to?: string
-		readonly callback: (
-			receipt?: TransactionReceipt
-		) => UndefinedOr<Promise<TransactionResponse>>
-	}) =>
-	async (options: {
-		readonly amount?: string
-		readonly overrides?: FallbackableOverrides
-	}) => {
+type ApproveIfNeeded = (factoryOptions: {
+	readonly provider: Provider
+	readonly requiredAmount: string
+	readonly from: string
+	readonly to?: string
+	readonly callback: (
+		receipt?: TransactionReceipt
+	) => Promise<TransactionResponse>
+}) => (options: {
+	readonly amount?: string
+	readonly overrides?: FallbackableOverrides
+}) => Promise<{
+	readonly waitOrSkip: () => Promise<TransactionResponse>
+}>
+
+export const approveIfNeeded: ApproveIfNeeded =
+	(factoryOptions) => async (options) => {
 		const [l1, l2] = await devClients(factoryOptions.provider)
 		const client = l1 ?? l2
 		const allowance = await whenDefinedAll(
 			[client, factoryOptions.to],
 			([x, to]) => x.allowance(factoryOptions.from, to)
 		)
 		const callback = {
-			wait: () => factoryOptions.callback(),
-		}
+			waitOrSkip: () => factoryOptions.callback(),
+		} as const
 
 		return (
 			whenDefinedAll([client, factoryOptions.to], async ([dev, to]) => {
 				return BigNumber.from(allowance).lt(factoryOptions.requiredAmount)
-					? ((approve) => ({
-							...approve,
-							wait: async () => {
-								const repeipt = await approve.wait()
-								return factoryOptions.callback(repeipt)
-							},
-					  }))(
+					? ((approve) =>
+							({
+								...approve,
+								waitOrSkip: async () => {
+									const repeipt = await approve.wait()
+									return factoryOptions.callback(repeipt)
+								},
+							} as const))(
 							await dev.approve(
 								to,
 								options.amount ?? factoryOptions.requiredAmount,

lib/agent/positionsCreate.ts

@@ -2,41 +2,45 @@ import { FallbackableOverrides } from '../common/utils/execute'
 import { Provider } from '@ethersproject/abstract-provider'
 import { lockupClients } from './common/clients/lockupClients'
 import { approveIfNeeded as _approveIfNeeded } from './common/approveIfNeeded'
+import { UndefinedOr } from '@devprotocol/util-ts'
 
 type PositionsCreate = (options: {
 	readonly provider: Provider
 	readonly from: string
 	readonly destination: string
 	readonly amount: string
 	readonly overrides?: FallbackableOverrides
-}) => Promise<{
-	readonly approveIfNeeded: ReturnType<typeof _approveIfNeeded>
-}>
+}) => Promise<
+	UndefinedOr<{
+		readonly approveIfNeeded: ReturnType<typeof _approveIfNeeded>
+	}>
+>
 
 export const positionsCreate: PositionsCreate = async (options) => {
 	const [l1, l2] = await lockupClients(options.provider)
-	const approveIfNeeded = _approveIfNeeded({
-		provider: options.provider,
-		requiredAmount: options.amount,
-		from: options.from,
-		to: ((x) => x?.contract().address)(l1 ?? l2),
-		callback: (receipt) =>
-			l1
-				? l1.depositToProperty(
-						options.destination,
-						options.amount,
-						options.overrides
-				  )
-				: l2
-				? l2.depositToProperty(
-						options.destination,
-						options.amount,
-						options.overrides
-				  )
-				: undefined,
-	})
 
-	return {
-		approveIfNeeded,
-	}
+	return l1 || l2
+		? {
+				approveIfNeeded: _approveIfNeeded({
+					provider: options.provider,
+					requiredAmount: options.amount,
+					from: options.from,
+					to: ((x) => x?.contract().address)(l1 ?? l2),
+					callback: (receipt) =>
+						l1
+							? l1.depositToProperty(
+									options.destination,
+									options.amount,
+									options.overrides
+							  )
+							: l2
+							? l2.depositToProperty(
+									options.destination,
+									options.amount,
+									options.overrides
+							  )
+							: (undefined as never),
+				}),
+		  }
+		: undefined
 }