@0dotxyz/p0-ts-sdk 1.2.0 → 1.2.2

package/dist/index.cjs

@@ -43353,8 +43353,22 @@ async function buildSwapCollateralFlashloanTx({
   overrideInferAccounts,
   blockhash
 }) {
-  const { withdrawBank, tokenProgram: withdrawTokenProgram, totalPositionAmount } = withdrawOpts;
+  const {
+    withdrawBank,
+    tokenProgram: withdrawTokenProgram,
+    totalPositionAmount,
+    withdrawAmount
+  } = withdrawOpts;
   const { depositBank, tokenProgram: depositTokenProgram } = depositOpts;
+  if (withdrawAmount !== void 0 && withdrawAmount <= 0) {
+    throw new Error("withdrawAmount must be greater than 0");
+  }
+  const actualWithdrawAmount = Math.min(withdrawAmount ?? totalPositionAmount, totalPositionAmount);
+  const isFullWithdraw = isWholePosition(
+    { amount: totalPositionAmount, isLending: true },
+    actualWithdrawAmount,
+    withdrawBank.mintDecimals
+  );
   const swapResult = [];
   const cuRequestIxs = [
     web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 12e5 }),
@@ -43371,7 +43385,7 @@ async function buildSwapCollateralFlashloanTx({
           withdrawOpts.withdrawBank.tokenSymbol
         );
       }
-      const adjustedAmount = new BigNumber10.BigNumber(totalPositionAmount).div(withdrawOpts.withdrawBank.assetShareValue).times(1.0001).toNumber();
+      const adjustedAmount = new BigNumber10.BigNumber(actualWithdrawAmount).div(withdrawOpts.withdrawBank.assetShareValue).times(1.0001).toNumber();
       withdrawIxs = await makeKaminoWithdrawIx3({
         program,
         bank: withdrawBank,
@@ -43381,7 +43395,7 @@ async function buildSwapCollateralFlashloanTx({
         marginfiAccount,
         authority: marginfiAccount.authority,
         reserve,
-        withdrawAll: true,
+        withdrawAll: isFullWithdraw,
         isSync: true,
         opts: {
           createAtas: false,
@@ -43405,12 +43419,12 @@ async function buildSwapCollateralFlashloanTx({
         bank: withdrawOpts.withdrawBank,
         bankMap,
         tokenProgram: withdrawOpts.tokenProgram,
-        amount: totalPositionAmount,
+        amount: actualWithdrawAmount,
         marginfiAccount,
         authority: marginfiAccount.authority,
         driftSpotMarket: driftState.spotMarketState,
         userRewards: driftState.userRewards,
-        withdrawAll: true,
+        withdrawAll: isFullWithdraw,
         isSync: false,
         opts: {
           createAtas: false,
@@ -43426,10 +43440,10 @@ async function buildSwapCollateralFlashloanTx({
         bank: withdrawBank,
         bankMap,
         tokenProgram: withdrawTokenProgram,
-        amount: totalPositionAmount,
+        amount: actualWithdrawAmount,
         marginfiAccount,
         authority: marginfiAccount.authority,
-        withdrawAll: true,
+        withdrawAll: isFullWithdraw,
         isSync: true,
         opts: {
           createAtas: false,
@@ -43442,7 +43456,7 @@ async function buildSwapCollateralFlashloanTx({
   }
   if (depositBank.mint.equals(withdrawBank.mint)) {
     swapResult.push({
-      amountToDeposit: totalPositionAmount,
+      amountToDeposit: actualWithdrawAmount,
       swapInstructions: [],
       setupInstructions: [],
       swapLookupTables: []
@@ -43458,7 +43472,7 @@ async function buildSwapCollateralFlashloanTx({
       quoteParams: {
         inputMint: withdrawBank.mint.toBase58(),
         outputMint: depositBank.mint.toBase58(),
-        amount: uiToNative(totalPositionAmount, withdrawBank.mintDecimals).toNumber(),
+        amount: uiToNative(actualWithdrawAmount, withdrawBank.mintDecimals).toNumber(),
         dynamicSlippage: swapOpts.jupiterOptions ? swapOpts.jupiterOptions.slippageMode === "DYNAMIC" : true,
         slippageBps: swapOpts.jupiterOptions?.slippageBps,
         swapMode: "ExactIn",
@@ -43725,56 +43739,74 @@ async function buildSwapDebtFlashloanTx({
   overrideInferAccounts,
   blockhash
 }) {
-  const { repayBank, tokenProgram: repayTokenProgram, totalPositionAmount } = repayOpts;
+  const {
+    repayBank,
+    tokenProgram: repayTokenProgram,
+    totalPositionAmount,
+    repayAmount
+  } = repayOpts;
   const { borrowBank, tokenProgram: borrowTokenProgram } = borrowOpts;
+  if (repayAmount !== void 0 && repayAmount <= 0) {
+    throw new Error("repayAmount must be greater than 0");
+  }
+  const actualRepayAmount = Math.min(repayAmount ?? totalPositionAmount, totalPositionAmount);
   const swapResult = [];
   const cuRequestIxs = [
     web3_js.ComputeBudgetProgram.setComputeUnitLimit({ units: 12e5 }),
     web3_js.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1 })
   ];
-  if (borrowBank.mint.equals(repayBank.mint)) {
-    swapResult.push({
-      amountToRepay: totalPositionAmount,
-      borrowAmount: totalPositionAmount,
-      swapInstructions: [],
-      setupInstructions: [],
-      swapLookupTables: []
-    });
-  } else {
-    const destinationTokenAccount = getAssociatedTokenAddressSync(
-      repayBank.mint,
-      marginfiAccount.authority,
-      true,
-      repayTokenProgram.equals(TOKEN_2022_PROGRAM_ID) ? TOKEN_2022_PROGRAM_ID : void 0
+  const destinationTokenAccount = getAssociatedTokenAddressSync(
+    repayBank.mint,
+    marginfiAccount.authority,
+    true,
+    repayTokenProgram.equals(TOKEN_2022_PROGRAM_ID) ? TOKEN_2022_PROGRAM_ID : void 0
+  );
+  const jupiterApiClient = swapOpts.jupiterOptions?.configParams?.basePath ? new api.SwapApi(new api.Configuration(swapOpts.jupiterOptions.configParams)) : api.createJupiterApiClient(swapOpts.jupiterOptions?.configParams);
+  const estimateQuote = await jupiterApiClient.quoteGet({
+    inputMint: borrowBank.mint.toBase58(),
+    outputMint: repayBank.mint.toBase58(),
+    amount: uiToNative(actualRepayAmount, repayBank.mintDecimals).toNumber(),
+    swapMode: "ExactOut",
+    dynamicSlippage: swapOpts.jupiterOptions ? swapOpts.jupiterOptions.slippageMode === "DYNAMIC" : true,
+    slippageBps: swapOpts.jupiterOptions?.slippageBps
+  });
+  const estimatedBorrowAmount = nativeToUi(
+    estimateQuote.otherAmountThreshold,
+    borrowBank.mintDecimals
+  );
+  const swapResponses = await getJupiterSwapIxsForFlashloan({
+    quoteParams: {
+      inputMint: borrowBank.mint.toBase58(),
+      outputMint: repayBank.mint.toBase58(),
+      amount: uiToNative(estimatedBorrowAmount, borrowBank.mintDecimals).toNumber(),
+      dynamicSlippage: swapOpts.jupiterOptions ? swapOpts.jupiterOptions.slippageMode === "DYNAMIC" : true,
+      slippageBps: swapOpts.jupiterOptions?.slippageBps,
+      swapMode: "ExactIn",
+      platformFeeBps: swapOpts.jupiterOptions?.platformFeeBps,
+      onlyDirectRoutes: swapOpts.jupiterOptions?.directRoutesOnly ?? false
+    },
+    authority: marginfiAccount.authority,
+    connection,
+    destinationTokenAccount,
+    configParams: swapOpts.jupiterOptions?.configParams
+  });
+  swapResponses.forEach((response) => {
+    const outAmount = nativeToUi(response.quoteResponse.outAmount, repayBank.mintDecimals);
+    const outAmountThreshold = nativeToUi(
+      response.quoteResponse.otherAmountThreshold,
+      repayBank.mintDecimals
     );
-    const swapResponses = await getJupiterSwapIxsForFlashloan({
-      quoteParams: {
-        inputMint: borrowBank.mint.toBase58(),
-        outputMint: repayBank.mint.toBase58(),
-        amount: uiToNative(totalPositionAmount, repayBank.mintDecimals).toNumber(),
-        dynamicSlippage: swapOpts.jupiterOptions ? swapOpts.jupiterOptions.slippageMode === "DYNAMIC" : true,
-        slippageBps: swapOpts.jupiterOptions?.slippageBps,
-        swapMode: "ExactOut",
-        platformFeeBps: swapOpts.jupiterOptions?.platformFeeBps,
-        onlyDirectRoutes: swapOpts.jupiterOptions?.directRoutesOnly ?? false
-      },
-      authority: marginfiAccount.authority,
-      connection,
-      destinationTokenAccount,
-      configParams: swapOpts.jupiterOptions?.configParams
-    });
-    swapResponses.forEach((response) => {
-      const borrowAmount = nativeToUi(response.quoteResponse.inAmount, borrowBank.mintDecimals);
-      swapResult.push({
-        amountToRepay: totalPositionAmount,
-        borrowAmount,
-        swapInstructions: [response.swapInstruction],
-        setupInstructions: response.setupInstructions,
-        swapLookupTables: response.addressLookupTableAddresses,
-        quoteResponse: response.quoteResponse
-      });
+    const amountToRepay = outAmount > totalPositionAmount ? totalPositionAmount : outAmountThreshold;
+    const borrowAmount = nativeToUi(response.quoteResponse.inAmount, borrowBank.mintDecimals);
+    swapResult.push({
+      amountToRepay,
+      borrowAmount,
+      swapInstructions: [response.swapInstruction],
+      setupInstructions: response.setupInstructions,
+      swapLookupTables: response.addressLookupTableAddresses,
+      quoteResponse: response.quoteResponse
     });
-  }
+  });
   if (swapResult.length === 0) {
     throw new Error(
       `No swap routes found for ${borrowBank.mint.toBase58()} -> ${repayBank.mint.toBase58()}`
@@ -44748,7 +44780,9 @@ async function computeSmartCrank({
   };
 }
 async function makeSmartCrankSwbFeedIx(params) {
+  console.log("[makeSmartCrankSwbFeedIx] Called");
   const crankResult = await computeSmartCrank(params);
+  console.log("[makeSmartCrankSwbFeedIx] Crank result:", crankResult);
   if (crankResult.uncrankableLiabilities.length > 0) {
     console.log(
       "Uncrankable liability details:",
@@ -44784,6 +44818,7 @@ async function makeSmartCrankSwbFeedIx(params) {
     );
   }
   const oraclesToCrank = crankResult.requiredOracles;
+  console.log("[makeSmartCrankSwbFeedIx] Oracles to crank:", oraclesToCrank);
   const { instructions: instructions2, luts } = await makeUpdateSwbFeedIx({
     swbPullOracles: oraclesToCrank,
     feePayer: params.marginfiAccount.authority,
@@ -44820,6 +44855,9 @@ async function makeCrankSwbFeedIx(marginfiAccount, bankMap, newBanksPk, provider
   }
 }
 async function makeUpdateSwbFeedIx(props) {
+  console.log(
+    `[makeUpdateSwbFeedIx] Called with ${props.swbPullOracles.length} oracles, feePayer: ${props.feePayer.toBase58()}`
+  );
   const seen = /* @__PURE__ */ new Set();
   const uniqueOracles = props.swbPullOracles.filter((oracle) => {
     const key = oracle.key.toBase58();
@@ -44827,6 +44865,14 @@ async function makeUpdateSwbFeedIx(props) {
     seen.add(key);
     return true;
   });
+  console.log(
+    `[makeUpdateSwbFeedIx] ${uniqueOracles.length} unique oracles after dedup (removed ${props.swbPullOracles.length - uniqueOracles.length})`
+  );
+  uniqueOracles.forEach(
+    (o) => console.log(
+      `[makeUpdateSwbFeedIx]   - ${o.key.toBase58()} (hasSwitchboardData: ${!!o.price?.switchboardData})`
+    )
+  );
   const swbProgram = await onDemand.AnchorUtils.loadProgramFromConnection(props.connection);
   const pullFeedInstances = uniqueOracles.map((oracle) => {
     const pullFeed = new onDemand.PullFeed(swbProgram, oracle.key);
@@ -44842,6 +44888,7 @@ async function makeUpdateSwbFeedIx(props) {
     return pullFeed;
   });
   if (pullFeedInstances.length === 0) {
+    console.log(`[makeUpdateSwbFeedIx] No pull feed instances, returning early`);
     return { instructions: [], luts: [] };
   }
   const crossbarClient = new common.CrossbarClient(
@@ -44851,11 +44898,19 @@ async function makeUpdateSwbFeedIx(props) {
   if (!gatewayUrls || gatewayUrls.length === 0) {
     throw new Error(`No gateways available for mainnet`);
   }
+  console.log(`[makeUpdateSwbFeedIx] Fetched ${gatewayUrls.length} gateways`);
   const gatewayUrl = gatewayUrls[0];
   if (!gatewayUrl) {
     throw new Error(`Invalid gateway URL received formainnet`);
   }
   const gateway = new onDemand.Gateway(swbProgram, gatewayUrl);
+  console.log(
+    `[makeUpdateSwbFeedIx] Fetching update ix for ${pullFeedInstances.length} feeds via gateway: ${gateway.gatewayUrl}`
+  );
+  console.log(
+    `[makeUpdateSwbFeedIx] pullFeedInstances:`,
+    pullFeedInstances.map((f) => ({ key: f.pubkey.toBase58(), hasData: !!f.data }))
+  );
   const [pullIx, luts] = await onDemand.PullFeed.fetchUpdateManyIx(swbProgram, {
     feeds: pullFeedInstances,
     gateway: gateway.gatewayUrl,
@@ -44863,6 +44918,7 @@ async function makeUpdateSwbFeedIx(props) {
     payer: props.feePayer,
     crossbarClient
   });
+  console.log(`[makeUpdateSwbFeedIx] Got ${pullIx.length} instructions, ${luts.length} LUTs`);
   return { instructions: pullIx, luts };
 }