Refactor and address comments

Author: ashwinrava

api/_bridges/index.ts

@@ -3,6 +3,7 @@ import { getHyperCoreBridgeStrategy } from "./hypercore/strategy";
 import {
   BridgeStrategiesConfig,
   BridgeStrategy,
+  BridgeStrategyDataParams,
   GetBridgeStrategyParams,
 } from "./types";
 import { CHAIN_IDs } from "../_constants";
@@ -37,7 +38,6 @@ export async function getBridgeStrategy({
   amountType,
   recipient,
   depositor,
-  logger,
 }: GetBridgeStrategyParams): Promise<BridgeStrategy> {
   const fromToChainOverride =
     bridgeStrategies.fromToChains?.[originChainId]?.[destinationChainId];
@@ -50,14 +50,34 @@ export async function getBridgeStrategy({
   if (supportedBridgeStrategies.length === 1) {
     return supportedBridgeStrategies[0];
   }
+  if (supportedBridgeStrategies.includes(getCctpBridgeStrategy())) {
+    return routeStrategyForCctp({
+      inputToken,
+      outputToken,
+      amount,
+      amountType,
+      recipient,
+      depositor,
+    });
+  }
+  return getAcrossBridgeStrategy();
+}
+
+async function routeStrategyForCctp({
+  inputToken,
+  outputToken,
+  amount,
+  amountType,
+  recipient,
+  depositor,
+}: BridgeStrategyDataParams): Promise<BridgeStrategy> {
   const bridgeStrategyData = await getBridgeStrategyData({
     inputToken,
     outputToken,
     amount,
     amountType,
     recipient,
     depositor,
-    logger,
   });
   if (!bridgeStrategyData) {
     return bridgeStrategies.default;
@@ -87,7 +107,6 @@ export async function getBridgeStrategy({
     if (bridgeStrategyData.isLargeDeposit) {
       return getAcrossBridgeStrategy();
     } else {
-      // Use OFT bridge if not CCTP
       return getCctpBridgeStrategy();
     }
   }

api/_bridges/oft/strategy.ts

@@ -487,6 +487,7 @@ export function getOftBridgeStrategy(): BridgeStrategy {
         ecosystem: "evm" as const,
       };
     },
+    isRouteSupported,
   };
 }
 

api/_bridges/types.ts

@@ -119,7 +119,7 @@ export type BridgeStrategyDataParams = {
   amountType: "exactInput" | "exactOutput" | "minOutput";
   recipient?: string;
   depositor: string;
-  logger: Logger;
+  logger?: Logger;
 };
 
 export type GetBridgeStrategyParams = {

api/_bridges/utils.ts

@@ -8,18 +8,24 @@ import {
   BridgeStrategyDataParams,
 } from "../_bridges/types";
 
+const ACROSS_THRESHOLD = 10_000; // 10K USD
+const LARGE_DEPOSIT_THRESHOLD = 1_000_000; // 1M USD
+
 export function isFullyUtilized(limits: LimitsResponse): boolean {
   // Check if utilization is high (>80%)
   const { liquidReserves, utilizedReserves } = limits.reserves;
   const _liquidReserves = BigNumber.from(liquidReserves);
   const _utilizedReserves = BigNumber.from(utilizedReserves);
+  const flooredUtilizedReserves = _utilizedReserves.gt(0)
+    ? _utilizedReserves
+    : BigNumber.from(0);
 
   const utilizationThreshold = sdk.utils.fixedPointAdjustment.mul(80).div(100); // 80%
 
   // Calculate current utilization percentage
-  const currentUtilization = _utilizedReserves
+  const currentUtilization = flooredUtilizedReserves
     .mul(sdk.utils.fixedPointAdjustment)
-    .div(_liquidReserves.add(_utilizedReserves));
+    .div(_liquidReserves.add(flooredUtilizedReserves));
 
   return currentUtilization.gt(utilizationThreshold);
 }
@@ -69,15 +75,14 @@ export async function getBridgeStrategyData({
     const depositAmountUsd = parseFloat(
       ethers.utils.formatUnits(amountInInputTokenDecimals, inputToken.decimals)
     );
-    const isInThreshold = depositAmountUsd <= 10_000; // 10K USD
-    const isLargeDeposit = depositAmountUsd > 1_000_000; // 1M USD
+    const isInThreshold = depositAmountUsd <= ACROSS_THRESHOLD;
+    const isLargeDeposit = depositAmountUsd > LARGE_DEPOSIT_THRESHOLD;
 
     // Check if eligible for Fast CCTP (Polygon, BSC, Solana) and deposit > 10K USD
     const fastCctpChains = [CHAIN_IDs.POLYGON, CHAIN_IDs.BSC, CHAIN_IDs.SOLANA];
-    const isFastCctpChain =
-      fastCctpChains.includes(inputToken.chainId) ||
-      fastCctpChains.includes(outputToken.chainId);
-    const isFastCctpEligible = isFastCctpChain && depositAmountUsd > 10_000; // 10K USD
+    const isFastCctpChain = fastCctpChains.includes(inputToken.chainId);
+    const isFastCctpEligible =
+      isFastCctpChain && depositAmountUsd > ACROSS_THRESHOLD;
 
     // Check if Linea is the source chain
     const isLineaSource = inputToken.chainId === CHAIN_IDs.LINEA;
@@ -92,11 +97,13 @@ export async function getBridgeStrategyData({
       isLineaSource,
     };
   } catch (error) {
-    logger.warn({
-      at: "getBridgeStrategyData",
-      message: "Failed to fetch bridge strategy data, using defaults",
-      error: error instanceof Error ? error.message : String(error),
-    });
+    if (logger) {
+      logger.warn({
+        at: "getBridgeStrategyData",
+        message: "Failed to fetch bridge strategy data, using defaults",
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
 
     // Safely return undefined if we can't fetch bridge strategy data
     return undefined;

api/swap/approval/_service.ts

@@ -88,7 +88,6 @@ export async function handleApprovalSwap(
     amountType,
     recipient,
     depositor,
-    logger,
   });
 
   const crossSwapQuotes = await getCrossSwapQuotes(