fix: pass in correct async lambda query string params for caching and deleting cached routes upon sim failures

Author: jsy1218

lib/handlers/router-entities/route-caching/dynamo-route-caching-provider.ts

@@ -3,6 +3,7 @@ import {
   CachedRoute,
   CachedRoutes,
   CacheMode,
+  HooksOptions,
   ID_TO_NETWORK_NAME,
   INTENT,
   IRouteCachingProvider,
@@ -11,6 +12,7 @@ import {
   MetricLoggerUnit,
   routeToString,
   SupportedRoutes,
+  SwapOptionsUniversalRouter,
 } from '@uniswap/smart-order-router'
 import { AWSError, DynamoDB, Lambda } from 'aws-sdk'
 import { ChainId, Currency, CurrencyAmount, Fraction, Token, TradeType } from '@uniswap/sdk-core'
@@ -20,7 +22,6 @@ import { PairTradeTypeChainId } from './model/pair-trade-type-chain-id'
 import { CachedRoutesMarshaller } from '../../marshalling/cached-routes-marshaller'
 import { PromiseResult } from 'aws-sdk/lib/request'
 import { DEFAULT_BLOCKS_TO_LIVE_ROUTES_DB } from '../../../util/defaultBlocksToLiveRoutesDB'
-import { getSymbolOrAddress } from '../../../util/getSymbolOrAddress'
 import { serializeRouteIds } from '@uniswap/smart-order-router/build/main/util/serializeRouteIds'
 import { UniversalRouterVersion } from '@uniswap/universal-router-sdk'
 import { computeProtocolsInvolvedIfMixed } from '../../../util/computeProtocolsInvolvedIfMixed'
@@ -200,6 +201,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
           partitionKey,
           amount,
           protocols,
+          currencyIn,
+          currencyOut,
           alphaRouterConfig,
           swapOptions
         )
@@ -223,6 +226,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
     partitionKey: PairTradeTypeChainId,
     amount: CurrencyAmount<Currency>,
     protocols: Protocol[],
+    currencyIn: Currency,
+    currencyOut: Currency,
     alphaRouterConfig?: AlphaRouterConfig,
     swapOptions?: SwapOptions
   ): CachedRoutes {
@@ -358,6 +363,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
         amount,
         currentBlockNumber,
         cachedRoutes.routes.map((route) => route.routeId),
+        currencyIn,
+        currencyOut,
         alphaRouterConfig,
         swapOptions
       )
@@ -371,6 +378,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
     amount: CurrencyAmount<Currency>,
     currentBlockNumber: number,
     cachedRoutesRouteIds: number[],
+    currencyIn: Currency,
+    currencyOut: Currency,
     alphaRouterConfig?: AlphaRouterConfig,
     swapOptions?: SwapOptions
   ): Promise<void> {
@@ -413,6 +422,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
           [Protocol.V2, Protocol.V3, Protocol.V4, Protocol.MIXED],
           amount,
           cachedRoutesRouteIds,
+          currencyIn,
+          currencyOut,
           alphaRouterConfig,
           swapOptions
         )
@@ -430,6 +441,8 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
     protocols: Protocol[],
     amount: CurrencyAmount<Currency>,
     cachedRoutesRouteIds: number[],
+    currencyIn: Currency,
+    currencyOut: Currency,
     alphaRouterConfig?: AlphaRouterConfig,
     swapOptions?: SwapOptions
   ): void {
@@ -440,9 +453,9 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
           : UniversalRouterVersion.V1_2,
       },
       queryStringParameters: {
-        tokenInAddress: getSymbolOrAddress(partitionKey.currencyIn, partitionKey.chainId),
+        tokenInAddress: currencyIn.isNative ? currencyIn.symbol : currencyIn.address,
         tokenInChainId: partitionKey.chainId.toString(),
-        tokenOutAddress: getSymbolOrAddress(partitionKey.currencyOut, partitionKey.chainId),
+        tokenOutAddress: currencyOut.isNative ? currencyOut.symbol : currencyOut.address,
         tokenOutChainId: partitionKey.chainId.toString(),
         amount: amount.quotient.toString(),
         type: partitionKey.tradeType === 0 ? 'exactIn' : 'exactOut',
@@ -451,8 +464,20 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
         requestSource: 'routing-api',
         cachedRoutesRouteIds: serializeRouteIds(cachedRoutesRouteIds),
         enableDebug: alphaRouterConfig?.enableDebug,
-        swapOptions: swapOptions?.simulate?.fromAddress,
         enableUniversalRouter: true,
+        slippageTolerance: swapOptions?.slippageTolerance?.toFixed(2),
+        simulateFromAddress: swapOptions?.simulate?.fromAddress,
+        recipient: swapOptions?.recipient,
+        deadline:
+          parseInt((swapOptions as SwapOptionsUniversalRouter).deadlineOrPreviousBlockhash?.toString() ?? '0') -
+          Math.floor(Date.now() / 1000),
+        permitSignature: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.signature,
+        permitNonce: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.details?.nonce,
+        permitExpiration: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.details?.expiration,
+        permitAmount: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.details?.amount,
+        permitToken: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.details?.token,
+        permitSpender: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.spender,
+        permitSigDeadline: (swapOptions as SwapOptionsUniversalRouter).inputTokenPermit?.sigDeadline,
       },
     }