@0dotxyz/p0-ts-sdk 2.5.5-alpha.5 → 2.5.5-alpha.7

package/dist/index.cjs

@@ -65603,6 +65603,34 @@ async function getTitanExactOutViaHttpProxy(params) {
 }
 
 // src/services/account/utils/swap.utils.ts
+function resolvePinnedSwapRoute(swapIxs, expectedInAmountNative) {
+  const { quoteResponse } = swapIxs;
+  const expectedIn = new BN9__default.default(expectedInAmountNative);
+  let minOut;
+  try {
+    minOut = new BN9__default.default(quoteResponse.otherAmountThreshold);
+  } catch {
+    minOut = new BN9__default.default(0);
+  }
+  if (minOut.lten(0)) {
+    throw new Error(
+      `Pinned swap route (swapOpts.swapIxs) has no usable min-out: quoteResponse.otherAmountThreshold is "${quoteResponse.otherAmountThreshold}". The min-out sizes the follow-up amount (e.g. the loop's deposit) \u2014 without it the flow would deposit zero collateral and fail init health.`
+    );
+  }
+  const pinnedIn = new BN9__default.default(quoteResponse.inAmount);
+  if (!pinnedIn.eq(expectedIn)) {
+    throw new Error(
+      `Pinned swap route (swapOpts.swapIxs) was quoted for a different input amount than the flow will swap: quote inAmount=${pinnedIn.toString()}, flow swap input=${expectedIn.toString()} (native units). Re-quote the pinned route for the exact flow amount.`
+    );
+  }
+  return {
+    swapInstructions: swapIxs.instructions,
+    setupInstructions: [],
+    lookupTables: swapIxs.lookupTables,
+    quoteResponse,
+    outputAmountNative: minOut
+  };
+}
 function getSwapProviderFn({
   attemptProvider,
   maxSwapTotalAccounts,
@@ -65709,16 +65737,12 @@ var getSwapIxsForFlashloan = async (params) => {
     maxSwapTotalAccounts
   } = params;
   if (swapOpts.swapIxs) {
+    const pinned = resolvePinnedSwapRoute(swapOpts.swapIxs, amount);
     return {
-      swapInstructions: swapOpts.swapIxs.instructions,
-      setupInstructions: [],
-      addressLookupTableAddresses: swapOpts.swapIxs.lookupTables,
-      quoteResponse: {
-        inAmount: String(amount),
-        outAmount: "0",
-        otherAmountThreshold: "0",
-        slippageBps: 0
-      }
+      swapInstructions: pinned.swapInstructions,
+      setupInstructions: pinned.setupInstructions,
+      addressLookupTableAddresses: pinned.lookupTables,
+      quoteResponse: pinned.quoteResponse
     };
   }
   const provider = swapOpts.swapConfig?.provider ?? "JUPITER" /* JUPITER */;
@@ -68770,6 +68794,7 @@ async function makeBridgedSwapDebtTx(params) {
     return await makeSwapDebtTx(directParams);
   } catch (directError) {
     if (!isDecomposableSwapError(directError)) throw directError;
+    if (directParams.swapOpts.swapIxs) throw directError;
     const bridged = await tryBridgedDebtSwap(directParams, bridgeOpts);
     if (bridged) return bridged;
     throw directError;
@@ -69187,17 +69212,13 @@ async function buildDepositIxs(params, amountUi) {
 async function runLoopSwapEngine(descriptor, params) {
   const { connection, swapOpts, marginfiAccount, swapEngineRunner } = params;
   if (swapOpts.swapIxs) {
+    const pinned = resolvePinnedSwapRoute(swapOpts.swapIxs, descriptor.inAmountNative);
     return {
-      swapInstructions: swapOpts.swapIxs.instructions,
-      setupInstructions: [],
-      swapLuts: swapOpts.swapIxs.lookupTables,
-      quoteResponse: {
-        inAmount: String(descriptor.inAmountNative),
-        outAmount: "0",
-        otherAmountThreshold: "0",
-        slippageBps: 0
-      },
-      outputAmountNative: new BN9__default.default(0)
+      swapInstructions: pinned.swapInstructions,
+      setupInstructions: pinned.setupInstructions,
+      swapLuts: pinned.lookupTables,
+      quoteResponse: pinned.quoteResponse,
+      outputAmountNative: pinned.outputAmountNative
     };
   }
   const runEngine = swapEngineRunner ?? runSwapEngine;
@@ -69272,6 +69293,7 @@ async function makeBridgedLoopTx(params) {
     return await makeLoopTx(loopParams);
   } catch (directError) {
     if (!isDecomposableSwapError(directError)) throw directError;
+    if (loopParams.swapOpts.swapIxs) throw directError;
     const bridged = await tryBridgedLoop(loopParams, bridgeOpts);
     if (bridged) return bridged;
     throw directError;
@@ -69290,7 +69312,7 @@ async function tryBridgedLoop(params, bridgeOpts) {
   });
   const oraclePriceOf = (bank) => params.oraclePrices.get(bank.address.toBase58())?.priceRealtime.price.toNumber() ?? 0;
   const borrowBankPrice = oraclePriceOf(borrowBank);
-  if (borrowBankPrice) return null;
+  if (borrowBankPrice <= 0) return null;
   const tokenProgramCache = new Map(bridgeOpts?.tokenProgramByMint);
   return tryBridgeCandidates({
     usableBridgeBanks,
@@ -69298,9 +69320,9 @@ async function tryBridgedLoop(params, bridgeOpts) {
     bridgeTokenSide: "borrow",
     abortSignal: bridgeOpts?.abortSignal,
     buildBundleThroughBridge: async (bridgeBank) => {
-      const birdgeBankPrice = oraclePriceOf(bridgeBank);
-      if (birdgeBankPrice <= 0) return null;
-      const bridgeBorrowUi = params.borrowOpts.borrowAmount * borrowBankPrice / birdgeBankPrice;
+      const bridgeBankPrice = oraclePriceOf(bridgeBank);
+      if (bridgeBankPrice <= 0) return null;
+      const bridgeBorrowUi = params.borrowOpts.borrowAmount * borrowBankPrice / bridgeBankPrice;
       if (bridgeBorrowUi <= 0) return null;
       const bridgeTokenProgram = await resolveTokenProgramForMint(
         bridgeBank.mint,
@@ -69317,7 +69339,7 @@ async function tryBridgedLoop(params, bridgeOpts) {
           borrowAmount: bridgeBorrowUi,
           borrowBank: bridgeBank,
           tokenProgram: bridgeTokenProgram,
-          marketPrice: birdgeBankPrice
+          marketPrice: bridgeBankPrice
         }
       });
       if (!firstLeg.quoteResponse) return null;
@@ -69333,7 +69355,7 @@ async function tryBridgedLoop(params, bridgeOpts) {
             repayAmount: bridgeBorrowUi,
             repayBank: bridgeBank,
             tokenProgram: bridgeTokenProgram,
-            marketPrice: birdgeBankPrice
+            marketPrice: bridgeBankPrice
           },
           borrowOpts: {
             borrowBank,
@@ -69789,6 +69811,7 @@ async function makeBridgedSwapCollateralTx(params) {
     return await makeSwapCollateralTx(directParams);
   } catch (directError) {
     if (!isDecomposableSwapError(directError)) throw directError;
+    if (directParams.swapOpts.swapIxs) throw directError;
     const bridged = await tryBridgedCollateralSwap(directParams, bridgeOpts);
     if (bridged) return bridged;
     throw directError;
@@ -71774,6 +71797,10 @@ async function tryBridgeCandidates(args) {
       if (result) return result;
     } catch (e) {
       if (isAbortError(e)) throw e;
+      console.warn(
+        `[bridge-routing] candidate ${bridgeBank.tokenSymbol ?? bridgeBank.mint.toBase58()} failed:`,
+        e instanceof Error ? e.message : e
+      );
     }
   }
   if (args.usableBridgeBanks.length === 0 && args.conflictingBridgeBanks.length > 0) {
@@ -76918,6 +76945,7 @@ exports.requireBank = requireBank;
 exports.requireTokenProgram = requireTokenProgram;
 exports.resolveAmount = resolveAmount;
 exports.resolveBridgeCandidateBanks = resolveBridgeCandidateBanks;
+exports.resolvePinnedSwapRoute = resolvePinnedSwapRoute;
 exports.resolveTokenProgramForMint = resolveTokenProgramForMint;
 exports.runSwapEngine = runSwapEngine;
 exports.selectLutsForAccountAction = selectLutsForAccountAction;