query both native and wrapped

Author: jsy1218

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

@@ -9,9 +9,11 @@ import {
   log,
   metric,
   MetricLoggerUnit,
+  NATIVE_CURRENCY,
   routeToString,
   SupportedRoutes,
   SwapOptionsUniversalRouter,
+  WRAPPED_NATIVE_CURRENCY,
 } from '@uniswap/smart-order-router'
 import { AWSError, DynamoDB, Lambda } from 'aws-sdk'
 import { ChainId, Currency, CurrencyAmount, Fraction, Token, TradeType } from '@uniswap/sdk-core'
@@ -24,6 +26,7 @@ import { DEFAULT_BLOCKS_TO_LIVE_ROUTES_DB } from '../../../util/defaultBlocksToL
 import { serializeRouteIds } from '@uniswap/smart-order-router/build/main/util/serializeRouteIds'
 import { UniversalRouterVersion } from '@uniswap/universal-router-sdk'
 import { computeProtocolsInvolvedIfMixed } from '../../../util/computeProtocolsInvolvedIfMixed'
+import { QueryInput } from 'aws-sdk/clients/dynamodb'
 
 interface ConstructorParams {
   /**
@@ -141,7 +144,22 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
         },
       }
 
-      const result = await this.ddbClient.query(queryParams).promise()
+      const additionalQueryParams = DynamoRouteCachingProvider.getAdditionalQueryParams(currencyIn, currencyOut, tradeType, chainId, includesV4Pool, this.routesTableName)
+     
+      let result = undefined
+      if (additionalQueryParams === undefined) {
+        result = await this.ddbClient.query(queryParams).promise()
+      } else {
+        const [directResult, additionalResult] = await Promise.all([
+          this.ddbClient.query(queryParams).promise(),
+          this.ddbClient.query(additionalQueryParams).promise(),
+        ])
+        result = {
+          Items: [...directResult.Items ?? [], ...additionalResult.Items ?? []],
+        }
+      }
+
+      result = await this.ddbClient.query(queryParams).promise()
       if (result.Items && result.Items.length > 0) {
         metric.putMetric('RoutesDbPreFilterEntriesFound', result.Items.length, MetricLoggerUnit.Count)
 
@@ -217,6 +235,78 @@ export class DynamoRouteCachingProvider extends IRouteCachingProvider {
     return undefined
   }
 
+  static getAdditionalQueryParams(currencyIn: Currency, currencyOut: Currency, tradeType: TradeType, chainId: ChainId, includesV4Pool: boolean, tableName: string) {
+    let additionalQueryParams = undefined
+
+    if (currencyIn.isNative) {
+      additionalQueryParams = {
+        TableName: tableName,
+        KeyConditionExpression: '#pk = :pk',
+        ExpressionAttributeNames: {
+          '#pk': 'pairTradeTypeChainId',
+        },
+        ExpressionAttributeValues: {
+          ':pk': new PairTradeTypeChainId({
+            currencyIn: WRAPPED_NATIVE_CURRENCY[chainId].address,
+            currencyOut: PairTradeTypeChainId.deriveCurrencyAddress(includesV4Pool, currencyOut),
+            tradeType,
+            chainId,
+          }),
+        },
+      }
+    } else if (currencyIn.address === WRAPPED_NATIVE_CURRENCY[chainId].address) {
+     additionalQueryParams = {
+        TableName: tableName,
+        KeyConditionExpression: '#pk = :pk',
+        ExpressionAttributeNames: {
+          '#pk': 'pairTradeTypeChainId',
+        },
+        ExpressionAttributeValues: {
+          ':pk': new PairTradeTypeChainId({
+            currencyIn: NATIVE_CURRENCY[chainId].toString(),
+            currencyOut: PairTradeTypeChainId.deriveCurrencyAddress(includesV4Pool, currencyOut),
+            tradeType,
+            chainId,
+          }),
+        },
+      }
+    } else if (currencyOut.isNative) {
+      additionalQueryParams = {
+        TableName: tableName,
+        KeyConditionExpression: '#pk = :pk',
+        ExpressionAttributeNames: {
+          '#pk': 'pairTradeTypeChainId',
+        },
+        ExpressionAttributeValues: {
+          ':pk': new PairTradeTypeChainId({
+            currencyIn: PairTradeTypeChainId.deriveCurrencyAddress(includesV4Pool, currencyIn),
+            currencyOut: WRAPPED_NATIVE_CURRENCY[chainId].address,
+            tradeType,
+            chainId,
+          }),
+        },
+      }
+    } else if (currencyOut.address === WRAPPED_NATIVE_CURRENCY[chainId].address) {
+      additionalQueryParams = {
+        TableName: tableName,
+        KeyConditionExpression: '#pk = :pk',
+        ExpressionAttributeNames: {
+          '#pk': 'pairTradeTypeChainId',
+        },
+        ExpressionAttributeValues: {
+          ':pk': new PairTradeTypeChainId({
+            currencyIn: PairTradeTypeChainId.deriveCurrencyAddress(includesV4Pool, currencyIn),
+            currencyOut: NATIVE_CURRENCY[chainId].toString(),
+            tradeType,
+            chainId,
+          }),
+        },
+      }
+    }
+
+    return additionalQueryParams
+  }
+
   private parseCachedRoutes(
     result: PromiseResult<DynamoDB.DocumentClient.QueryOutput, AWSError>,
     chainId: ChainId,