update config, improve binary search

Author: dglowinski

src/swapService/config/base.ts

@@ -5,8 +5,6 @@ import {
   StrategyRepayWrapper,
 } from "../strategies"
 
-const CBBTC_BASE = "0xcbB7C0000aB88B473b1f5aFd9ef808440eed33Bf"
-
 const baseRoutingConfig: ChainRoutingConfig = [
   // WRAPPERS
   {
@@ -21,27 +19,6 @@ const baseRoutingConfig: ChainRoutingConfig = [
     strategy: StrategyMidas.name(),
     match: {}, // supports function will match mTokens
   },
-  {
-    strategy: StrategyBalmySDK.name(),
-    config: {
-      sourcesFilter: {
-        includeSources: ["pendle", "li-fi", "open-ocean"],
-      },
-    },
-    match: { isPendlePT: true },
-  },
-  // avoid 1inch because of InvalidatedOrder error. Kyberswap and li.fi also route through 1inch
-  {
-    strategy: StrategyBalmySDK.name(),
-    config: {
-      sourcesFilter: {
-        includeSources: ["odos", "uniswap", "open-ocean"],
-      },
-    },
-    match: {
-      tokensInOrOut: [CBBTC_BASE],
-    },
-  },
   // DEFAULTS
   {
     strategy: StrategyBalmySDK.name(),
@@ -54,10 +31,9 @@ const baseRoutingConfig: ChainRoutingConfig = [
           "1inch",
           "li-fi",
           "open-ocean",
-          // "conveyor",
           "uniswap",
           "magpie",
-          "enso",
+          "pendle",
         ],
       },
     },

src/swapService/config/mainnet.ts

@@ -59,15 +59,6 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
       excludeTokensInOrOut: [PT_WSTUSR_27MAR2025_MAINNET],
     },
   },
-  {
-    strategy: StrategyBalmySDK.name(),
-    config: {
-      sourcesFilter: {
-        includeSources: ["pendle", "li-fi", "open-ocean"],
-      },
-    },
-    match: { isPendlePT: true },
-  },
   // WUSDL with paraswap
   {
     strategy: StrategyBalmySDK.name(),
@@ -80,7 +71,6 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
           "1inch",
           "li-fi",
           "open-ocean",
-          "uniswap",
           "magpie",
           "0x",
         ],
@@ -114,10 +104,10 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
           "1inch",
           "li-fi",
           "open-ocean",
-          "uniswap",
           "magpie",
           "0x",
           "enso",
+          "pendle",
         ],
       },
     },
@@ -130,6 +120,7 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
     match: {
       swapperModes: [SwapperMode.TARGET_DEBT],
       excludeTokensInOrOut: [RLP_MAINNET, SUSDS_MAINNET, WUSDL_MAINNET],
+      notPendlePT: true,
     },
   },
   // FALLBACKS
@@ -152,9 +143,10 @@ const mainnetRoutingConfig: ChainRoutingConfig = [
           "1inch",
           "li-fi",
           "open-ocean",
-          "uniswap",
           "magpie",
           "0x",
+          "enso",
+          "pendle",
         ],
       },
     },

src/swapService/interface.ts

@@ -69,6 +69,7 @@ export interface StrategyMatchConfig {
   swapperModes?: SwapperMode[]
   isRepay?: boolean
   isPendlePT?: boolean
+  notPendlePT?: boolean
   tokensInOrOut?: Address[]
   excludeTokensInOrOut?: Address[]
   repayVaults?: Address[]

src/swapService/strategies/balmySDK/sources/pendleQuoteSource.ts

@@ -116,7 +116,9 @@ export class CustomPendleQuoteSource
     const tokenIn = findToken(chainId, getAddress(sellToken))
     const tokenOut = findToken(chainId, getAddress(buyToken))
     if (!tokenIn || !tokenOut) throw new Error("Missing token in or out")
-
+    if (!tokenIn.meta?.isPendlePT && !tokenOut.meta?.isPendlePT) {
+      failed(PENDLE_METADATA, chainId, sellToken, buyToken, "Not PT tokens")
+    }
     let url
     if (tokenIn.meta?.isPendlePT && tokenOut.meta?.isPendlePT) {
       // rollover

src/swapService/utils.ts

@@ -83,6 +83,13 @@ export function matchParams(
     )
       return false
   }
+  if (match.notPendlePT) {
+    if (
+      swapParams.tokenIn.meta?.isPendlePT ||
+      swapParams.tokenOut.meta?.isPendlePT
+    )
+      return false
+  }
   if (match.repayVaults) {
     if (
       !swapParams.isRepay ||
@@ -495,6 +502,7 @@ export async function binarySearchQuote(
   let quote
   let amountTo
   let prevAmountTo
+  const initialAmountFrom = amountFrom
 
   do {
     amountFrom = (amountFrom * percentageChange) / 10000n
@@ -524,6 +532,11 @@ export async function binarySearchQuote(
 
     if (cnt++ === 15)
       throw new Error("Binary search not completed in 15 iterations")
+    if (amountFrom > 2n * initialAmountFrom)
+      // TODO fix, this is assuming estimated amount is provided
+      throw new Error(
+        "Amount from already 2x estimated, probably no liquidity to reach target",
+      )
   } while (shouldContinue(amountTo))
 
   return quote