refactor: create type alias for router route

Author: bayological

src/services/liquidity/zapHelpers.ts

@@ -2,7 +2,7 @@ import { Address, encodeFunctionData } from 'viem'
 import { RouteService } from '../routes'
 import { ZapParams } from '../../core/types'
 import { ROUTER_ABI } from '../../core/abis'
-import { encodeRoutePath, RouterRoute } from '../../utils/pathEncoder'
+import { encodeRoutePath, RouterRoute, ReadonlyRouterRoutes } from '../../utils/pathEncoder'
 
 // ========== ENCODING FUNCTIONS ==========
 
@@ -21,7 +21,7 @@ export function encodeZapInCall(
   return encodeFunctionData({
     abi: ROUTER_ABI,
     functionName: 'zapIn',
-    args: [tokenIn, amountInA, amountInB, zapParams as { factory: Address, tokenA: Address, tokenB: Address, amountAMin: bigint, amountBMin: bigint, amountOutMinA: bigint, amountOutMinB: bigint }, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[], recipient],
+    args: [tokenIn, amountInA, amountInB, zapParams as { factory: Address, tokenA: Address, tokenB: Address, amountAMin: bigint, amountBMin: bigint, amountOutMinA: bigint, amountOutMinB: bigint }, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes, recipient],
   })
 }
 
@@ -38,7 +38,7 @@ export function encodeZapOutCall(
   return encodeFunctionData({
     abi: ROUTER_ABI,
     functionName: 'zapOut',
-    args: [tokenOut, liquidity, zapParams as { factory: Address, tokenA: Address, tokenB: Address, amountAMin: bigint, amountBMin: bigint, amountOutMinA: bigint, amountOutMinB: bigint }, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[]],
+    args: [tokenOut, liquidity, zapParams as { factory: Address, tokenA: Address, tokenB: Address, amountAMin: bigint, amountBMin: bigint, amountOutMinA: bigint, amountOutMinB: bigint }, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes],
   })
 }
 

src/services/liquidity/zapIn.ts

@@ -11,6 +11,7 @@ import {
 import { ROUTER_ABI, ERC20_ABI } from '../../core/abis'
 import { getContractAddress, ChainId } from '../../core/constants'
 import { validateAddress } from '../../utils/validation'
+import { ReadonlyRouterRoutes } from '../../utils/pathEncoder'
 import { buildApprovalParams, getAllowance, calculateMinAmount, getPoolInfo } from './liquidityHelpers'
 import {
   encodeZapInCall,
@@ -100,7 +101,7 @@ export async function buildZapInParamsInternal(
     address: routerAddress as Address,
     abi: ROUTER_ABI,
     functionName: 'generateZapInParams',
-    args: [token0, token1, factoryAddr, amountInA, amountInB, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[]],
+    args: [token0, token1, factoryAddr, amountInA, amountInB, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes],
   })) as [bigint, bigint, bigint, bigint]
 
   // Apply slippage to all minimum amounts
@@ -181,7 +182,7 @@ export async function quoteZapInInternal(
     address: routerAddress as Address,
     abi: ROUTER_ABI,
     functionName: 'generateZapInParams',
-    args: [token0, token1, factoryAddr, amountInA, amountInB, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[]],
+    args: [token0, token1, factoryAddr, amountInA, amountInB, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes],
   })) as [bigint, bigint, bigint, bigint]
 
   const poolDetails = await poolService.getPoolDetails(poolAddress)

src/services/liquidity/zapOut.ts

@@ -11,6 +11,7 @@ import {
 import { ROUTER_ABI } from '../../core/abis'
 import { getContractAddress, ChainId } from '../../core/constants'
 import { validateAddress } from '../../utils/validation'
+import { ReadonlyRouterRoutes } from '../../utils/pathEncoder'
 import { buildApprovalParams, getAllowance, calculateMinAmount, getPoolInfo } from './liquidityHelpers'
 import { encodeZapOutCall, findZapOutRoutes } from './zapHelpers'
 
@@ -89,7 +90,7 @@ export async function buildZapOutParamsInternal(
     address: routerAddress as Address,
     abi: ROUTER_ABI,
     functionName: 'generateZapOutParams',
-    args: [token0, token1, factoryAddr, liquidity, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[]],
+    args: [token0, token1, factoryAddr, liquidity, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes],
   })) as [bigint, bigint, bigint, bigint]
 
   // Apply slippage to all minimum amounts
@@ -152,7 +153,7 @@ export async function quoteZapOutInternal(
     address: routerAddress as Address,
     abi: ROUTER_ABI,
     functionName: 'generateZapOutParams',
-    args: [token0, token1, factoryAddr, liquidity, routesA as readonly { from: Address, to: Address, factory: Address }[], routesB as readonly { from: Address, to: Address, factory: Address }[]],
+    args: [token0, token1, factoryAddr, liquidity, routesA as ReadonlyRouterRoutes, routesB as ReadonlyRouterRoutes],
   })) as [bigint, bigint, bigint, bigint]
 
   const finalAmountOutFromA = calculateMinAmount(amountOutMinA, options.slippageTolerance)

src/services/quotes/QuoteService.ts

@@ -4,7 +4,7 @@ import { Route } from '../../core/types'
 import { ROUTER_ABI } from '../../core/abis'
 import { getContractAddress, ChainId } from '../../core/constants'
 import { FXMarketClosedError } from '../../core/errors'
-import { encodeRoutePath } from '../../utils/pathEncoder'
+import { encodeRoutePath, ReadonlyRouterRoutes } from '../../utils/pathEncoder'
 import { validateAddress } from '../../utils/validation'
 
 const FX_MARKET_CLOSED_SIG = '0xa407143a'
@@ -74,7 +74,7 @@ export class QuoteService {
         address: routerAddress as `0x${string}`,
         abi: ROUTER_ABI,
         functionName: 'getAmountsOut',
-        args: [amountIn, routerRoutes as readonly { from: Address, to: Address, factory: Address }[]],
+        args: [amountIn, routerRoutes as ReadonlyRouterRoutes],
       })) as bigint[]
 
       return amounts[amounts.length - 1]

src/services/swap/SwapService.ts

@@ -4,7 +4,7 @@ import { QuoteService } from '../quotes'
 import { Route, CallParams } from '../../core/types'
 import { ROUTER_ABI, ERC20_ABI } from '../../core/abis'
 import { getContractAddress, ChainId } from '../../core/constants'
-import { encodeRoutePath, RouterRoute } from '../../utils/pathEncoder'
+import { encodeRoutePath, RouterRoute, ReadonlyRouterRoutes } from '../../utils/pathEncoder'
 import { validateAddress } from '../../utils/validation'
 
 /**
@@ -271,7 +271,7 @@ export class SwapService {
     return encodeFunctionData({
       abi: ROUTER_ABI,
       functionName: 'swapExactTokensForTokens',
-      args: [amountIn, amountOutMin, routes as readonly { from: Address, to: Address, factory: Address }[], recipient, deadline],
+      args: [amountIn, amountOutMin, routes as ReadonlyRouterRoutes, recipient, deadline],
     })
   }
 }

src/utils/pathEncoder.ts

@@ -10,6 +10,8 @@ export interface RouterRoute {
   factory: Address
 }
 
+export type ReadonlyRouterRoutes = readonly { from: Address; to: Address; factory: Address }[]
+
 /**
  * Converts a route path to the format expected by the Router contract.
  * Used by both QuoteService (getAmountsOut) and SwapService (swapTokensForTokens).