fix binary search stuck

Author: dglowinski

src/swapService/runner.ts

@@ -67,6 +67,11 @@ export async function runPipeline(
     amountOutMin: finalResult.quotes[0].amountOutMin,
     route: finalResult.quotes[0].route,
   })
+  // console.log(
+  //   finalResult.quotes
+  //     .map((q) => q.route.map((r) => r.providerName).join(" "))
+  //     .join(", "),
+  // )
 
   // console.log('finalResult.quotes: ', JSON.stringify(finalResult.quotes, null, 2));
   return finalResult.quotes

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

@@ -11,6 +11,7 @@ import type {
   QuoteParams,
   QuoteSourceMetadata,
   SourceQuoteResponse,
+  SourceQuoteTransaction,
 } from "@balmy/sdk/dist/services/quotes/quote-sources/types"
 import {
   addQuoteSlippage,

src/swapService/strategies/strategyBalmySDK.ts

@@ -317,13 +317,15 @@ export class StrategyBalmySDK {
       receiver: swapParams.from,
       isRepay: false,
     }
+
     const unitQuotes = await this.#getAllQuotes(
       {
         ...swapParamsExactIn,
         amount: parseUnits("1", swapParams.tokenIn.decimals),
       },
       sourcesFilter,
     )
+
     const unitAmountTo = unitQuotes[0].minBuyAmount.amount
 
     const estimatedAmountIn = calculateEstimatedAmountFrom(
@@ -385,7 +387,6 @@ export class StrategyBalmySDK {
       .filter((q) => q.status === "fulfilled")
       .map((q) => q.value)
     if (bestQuotes.length === 0) throw new Error("Quotes not found")
-
     return bestQuotes
   }
 

src/swapService/strategies/strategyCombinedUniswap.ts

@@ -114,73 +114,76 @@ export class StrategyCombinedUniswap {
         shouldContinue,
       )) as SwapApiResponse[]
 
-      const uniswapSwapParams = {
-        ...swapParams,
-        amount: swapParams.amount - BigInt(exactInputQuotes[0].amountOut),
-        receiver: swapParams.from,
-      }
-      const {
-        protocol,
-        data: path,
-        amountIn: uniswapAmountIn, // assuming exact out trade
-      } = await fetchUniswapQuote(uniswapSwapParams)
-
-      result.quotes = exactInputQuotes.map((exactInputQuote) => {
-        const uniswapSwapMulticallItem = encodeSwapMulticallItem({
-          handler:
-            protocol === "V2"
-              ? SWAPPER_HANDLER_UNISWAP_V2
-              : SWAPPER_HANDLER_UNISWAP_V3,
-          mode: BigInt(SwapperMode.TARGET_DEBT),
-          account: swapParams.accountOut,
-          tokenIn: swapParams.tokenIn.addressInfo,
-          tokenOut: swapParams.tokenOut.addressInfo,
-          vaultIn: swapParams.vaultIn,
-          accountIn: swapParams.accountIn,
-          receiver: swapParams.receiver,
-          amountOut: swapParams.targetDebt,
-          data: path as Hex,
-        })
-
-        const combinedMulticallItems = [
-          ...exactInputQuote.swap.multicallItems,
-          uniswapSwapMulticallItem,
-        ]
-
-        const swap = buildApiResponseSwap(
-          swapParams.from,
-          combinedMulticallItems,
-        )
-
-        const verify = buildApiResponseVerifyDebtMax(
-          swapParams.chainId,
-          swapParams.receiver,
-          swapParams.accountOut,
-          swapParams.targetDebt,
-          swapParams.deadline,
-        )
-
-        const amountIn =
-          BigInt(exactInputQuote.amountIn) + BigInt(uniswapAmountIn)
-        const amountInMax = applySlippage(amountIn, swapParams.slippage, true)
-
-        return {
-          amountIn: String(amountIn),
-          amountInMax: String(amountInMax),
-          amountOut: String(swapParams.amount),
-          amountOutMin: String(swapParams.amount),
-          vaultIn: swapParams.vaultIn,
-          receiver: swapParams.receiver,
-          accountIn: swapParams.accountIn,
-          accountOut: swapParams.accountOut,
-          tokenIn: swapParams.tokenIn,
-          tokenOut: swapParams.tokenOut,
-          slippage: swapParams.slippage,
-          route: [...exactInputQuote.route, { providerName: "Uniswap" }],
-          swap,
-          verify,
-        }
-      })
+      result.quotes = await Promise.all(
+        exactInputQuotes.map(async (exactInputQuote) => {
+          const uniswapSwapParams = {
+            ...swapParams,
+            amount: swapParams.amount - BigInt(exactInputQuote.amountOutMin),
+            receiver: swapParams.from,
+          }
+
+          const {
+            protocol,
+            data: path,
+            amountIn: uniswapAmountIn, // assuming exact out trade
+          } = await fetchUniswapQuote(uniswapSwapParams)
+
+          const uniswapSwapMulticallItem = encodeSwapMulticallItem({
+            handler:
+              protocol === "V2"
+                ? SWAPPER_HANDLER_UNISWAP_V2
+                : SWAPPER_HANDLER_UNISWAP_V3,
+            mode: BigInt(SwapperMode.TARGET_DEBT),
+            account: swapParams.accountOut,
+            tokenIn: swapParams.tokenIn.addressInfo,
+            tokenOut: swapParams.tokenOut.addressInfo,
+            vaultIn: swapParams.vaultIn,
+            accountIn: swapParams.accountIn,
+            receiver: swapParams.receiver,
+            amountOut: swapParams.targetDebt,
+            data: path as Hex,
+          })
+
+          const combinedMulticallItems = [
+            ...exactInputQuote.swap.multicallItems,
+            uniswapSwapMulticallItem,
+          ]
+
+          const swap = buildApiResponseSwap(
+            swapParams.from,
+            combinedMulticallItems,
+          )
+
+          const verify = buildApiResponseVerifyDebtMax(
+            swapParams.chainId,
+            swapParams.receiver,
+            swapParams.accountOut,
+            swapParams.targetDebt,
+            swapParams.deadline,
+          )
+
+          const amountIn =
+            BigInt(exactInputQuote.amountIn) + BigInt(uniswapAmountIn)
+          const amountInMax = applySlippage(amountIn, swapParams.slippage, true)
+
+          return {
+            amountIn: String(amountIn),
+            amountInMax: String(amountInMax),
+            amountOut: String(swapParams.amount),
+            amountOutMin: String(swapParams.amount),
+            vaultIn: swapParams.vaultIn,
+            receiver: swapParams.receiver,
+            accountIn: swapParams.accountIn,
+            accountOut: swapParams.accountOut,
+            tokenIn: swapParams.tokenIn,
+            tokenOut: swapParams.tokenOut,
+            slippage: swapParams.slippage,
+            route: [...exactInputQuote.route, { providerName: "Uniswap" }],
+            swap,
+            verify,
+          }
+        }),
+      )
     } catch (error) {
       result.error = error
     }

src/swapService/strategies/strategyERC4626Wrapper.ts

@@ -253,7 +253,7 @@ export class StrategyERC4626Wrapper {
 
     const vaultData = this.getSupportedVault(swapParams.tokenIn.addressInfo)
     const tokenIn = findToken(swapParams.chainId, vaultData.asset)
-    console.log("vaultData: ", vaultData)
+
     if (!tokenIn) throw new Error("Inner token not found")
     const innerSwapParams = {
       ...swapParams,

src/swapService/utils.ts

@@ -494,6 +494,7 @@ export async function binarySearchQuote(
   let cnt = 0
   let quote
   let amountTo
+  let prevAmountTo
 
   do {
     amountFrom = (amountFrom * percentageChange) / 10000n
@@ -504,6 +505,10 @@ export async function binarySearchQuote(
         amount: amountFrom,
       })))
 
+    if (prevAmountTo && prevAmountTo === amountTo)
+      throw new Error("Binary search quote not improving")
+    prevAmountTo = amountTo
+
     if (amountTo === 0n || targetAmountTo === 0n)
       throw new Error("Quote not found")