@kamino-finance/klend-sdk 6.0.5-beta.2 → 6.0.5-beta.20

package/dist/leverage/operations.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScopeRefreshIx = exports.getSetupIxs = void 0;
+exports.getScopeRefreshIx = exports.getSetupIxs = exports.WITHDRAW_SLOT_OFFSET = void 0;
 exports.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
 exports.getDepositWithLeverageIxs = getDepositWithLeverageIxs;
 exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
@@ -21,6 +21,7 @@ const calcs_1 = require("./calcs");
 const spl_token_1 = require("@solana/spl-token");
 const utils_2 = require("./utils");
 const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
+exports.WITHDRAW_SLOT_OFFSET = 150; // Offset for the withdraw slot to ensure it is after the deposit slot
 async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, useV2Ixs, elevationGroupOverride, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -34,15 +35,17 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
     console.log('Ops Calcs', (0, classes_1.toJson)(calcs));
     const obligationType = checkObligationType(obligationTypeTagOverride, collTokenMint, debtTokenMint, kaminoMarket);
     // Build the repay & withdraw collateral tx to get the number of accounts
-    const klendIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
-        preActionIxs: [],
-        swapIxs: [],
-        lookupTables: [],
-        quote: {
-            priceAInB: new decimal_js_1.default(0), // not used
-            quoteResponse: undefined,
+    const klendIxs = (await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, [
+        {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+            quote: {
+                priceAInB: new decimal_js_1.default(0), // not used
+                quoteResponse: undefined,
+            },
         },
-    }, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride);
+    ], strategy, collIsKtoken, useV2Ixs, elevationGroupOverride))[0];
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
     const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcs.singleSidedDepositKtokenOnly, debtReserve.stats.decimals).ceil();
     const swapInputsForQuote = {
@@ -167,24 +170,26 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
     const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    return Promise.all(swapsArray.map(async (swap) => {
-        const ixs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+    const depositWithLeverageIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, swapsArray.map((swap) => {
+        return {
             preActionIxs: [],
             swapIxs: swap.swapIxs,
             lookupTables: swap.lookupTables,
             quote: swap.quote,
-        }, initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs, elevationGroupOverride);
+        };
+    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs, elevationGroupOverride);
+    return depositWithLeverageIxs.map((depositWithLeverageIxs, index) => {
         return {
-            ixs: ixs.instructions,
-            flashLoanInfo: ixs.flashLoanInfo,
-            lookupTables: swap.lookupTables,
+            ixs: depositWithLeverageIxs.instructions,
+            flashLoanInfo: depositWithLeverageIxs.flashLoanInfo,
+            lookupTables: swapsArray[index].lookupTables,
             swapInputs,
             initialInputs,
-            quote: swap.quote.quoteResponse,
+            quote: swapsArray[index].quote.quoteResponse,
         };
-    }));
+    });
 }
-async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
+async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
@@ -218,28 +223,30 @@ async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, own
         .toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, elevationGroupOverride === 0 ? false : true, // emode
     { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI
     referrer, currentSlot);
-    // 4. Swap
-    const { swapIxs } = swapQuoteIxs;
-    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
-    const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
-    const flashLoanInfo = {
-        flashBorrowReserve: flashBorrowReserve.address,
-        flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
-    };
-    return {
-        flashLoanInfo,
-        instructions: [
-            ...scopeRefreshIx,
-            ...budgetIxs,
-            ...createAtasIxs,
-            ...fillWsolAtaIxs,
-            ...[flashBorrowIx],
-            ...(collIsKtoken ? swapInstructions : []),
-            ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
-            ...(collIsKtoken ? [] : swapInstructions),
-            ...[flashRepayIx],
-        ],
-    };
+    return swapQuoteIxsArray.map((swapQuoteIxs) => {
+        // 4. Swap
+        const { swapIxs } = swapQuoteIxs;
+        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
+        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+        const flashLoanInfo = {
+            flashBorrowReserve: flashBorrowReserve.address,
+            flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
+        };
+        return {
+            flashLoanInfo,
+            instructions: [
+                ...scopeRefreshIx,
+                ...budgetIxs,
+                ...createAtasIxs,
+                ...fillWsolAtaIxs,
+                ...[flashBorrowIx],
+                ...(collIsKtoken ? swapInstructions : []),
+                ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+                ...(collIsKtoken ? [] : swapInstructions),
+                ...[flashRepayIx],
+            ],
+        };
+    });
 }
 async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, deposited, borrowed, obligation, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
@@ -250,15 +257,17 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
     const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
     const inputTokenIsSol = selectedTokenMint.equals(spl_token_1.NATIVE_MINT);
     const calcs = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, priceCollToDebt, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
-    const klendIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
-        preActionIxs: [],
-        swapIxs: [],
-        lookupTables: [],
-        quote: {
-            priceAInB: new decimal_js_1.default(0), // not used
-            quoteResponse: undefined,
+    const klendIxs = (await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, [
+        {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+            quote: {
+                priceAInB: new decimal_js_1.default(0), // not used
+                quoteResponse: undefined,
+            },
         },
-    }, strategy, collIsKtoken, useV2Ixs);
+    ], strategy, collIsKtoken, useV2Ixs))[0];
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
     const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.collTokenSwapIn, collReserve.getMintDecimals()).ceil();
     const swapInputsForQuote = {
@@ -339,25 +348,27 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
             console.log('Strategy lookup table not found');
         }
     }
-    return Promise.all(swapsArray.map(async (swap) => {
-        const ixs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+    const withdrawWithLeverageIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, swapsArray.map((swap) => {
+        return {
             preActionIxs: [],
             swapIxs: swap.swapIxs,
             lookupTables: swap.lookupTables,
             quote: swap.quote,
-        }, initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
-        // Send ixs and lookup tables
+        };
+    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
+    // Send ixs and lookup tables
+    return withdrawWithLeverageIxs.map((ixs, index) => {
         return {
             ixs: ixs.instructions,
             flashLoanInfo: ixs.flashLoanInfo,
-            lookupTables: swap.lookupTables,
+            lookupTables: swapsArray[index].lookupTables,
             swapInputs,
             initialInputs: initialInputs,
-            quote: swap.quote.quoteResponse,
+            quote: swapsArray[index].quote.quoteResponse,
         };
-    }));
+    });
 }
-async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs) {
+async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -397,26 +408,28 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
         ? utils_1.U64_MAX
         : (0, classes_2.numberToLamportsDecimal)(calcs.depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, currentSlot, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     referrer);
-    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-    return {
-        flashLoanInfo: {
-            flashLoanFee: debtReserve.getFlashLoanFee(),
-            flashBorrowReserve: debtReserve.address,
-        },
-        instructions: [
-            ...scopeRefreshIx,
-            ...budgetIxs,
-            ...createAtasIxs,
-            ...fillWsolAtaIxs,
-            ...[flashBorrowIx],
-            ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
-            ...swapInstructions,
-            ...[flashRepayIx],
-            ...closeWsolAtaIxs,
-        ],
-    };
+    return swapQuoteIxsArray.map((swapQuoteIxs) => {
+        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+        return {
+            flashLoanInfo: {
+                flashLoanFee: debtReserve.getFlashLoanFee(),
+                flashBorrowReserve: debtReserve.address,
+            },
+            instructions: [
+                ...scopeRefreshIx,
+                ...budgetIxs,
+                ...createAtasIxs,
+                ...fillWsolAtaIxs,
+                ...[flashBorrowIx],
+                ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
+                ...swapInstructions,
+                ...[flashRepayIx],
+                ...closeWsolAtaIxs,
+            ],
+        };
+    });
 }
-async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
+async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, withdrawSlotOffset, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const deposited = (0, classes_1.lamportsToNumberDecimal)(depositedLamports, collReserve.stats.decimals);
@@ -447,15 +460,17 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     if (isDeposit) {
         const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner, debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct, collIsKtoken);
         // Build the repay & withdraw collateral tx to get the number of accounts
-        const klendIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
-            preActionIxs: [],
-            swapIxs: [],
-            lookupTables: [],
-            quote: {
-                priceAInB: new decimal_js_1.default(0), // not used
-                quoteResponse: undefined,
+        const klendIxs = (await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, [
+            {
+                preActionIxs: [],
+                swapIxs: [],
+                lookupTables: [],
+                quote: {
+                    priceAInB: new decimal_js_1.default(0), // not used
+                    quoteResponse: undefined,
+                },
             },
-        }, budgetAndPriorityFeeIxs, useV2Ixs);
+        ], budgetAndPriorityFeeIxs, useV2Ixs))[0];
         const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
         const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.borrowAmount : calcs.amountToFlashBorrowDebt, debtReserve.stats.decimals).ceil();
         const swapInputsForQuote = {
@@ -501,15 +516,17 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     }
     else {
         const calcs = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPosition, adjustBorrowPosition, flashLoanFee, slippagePct);
-        const klendIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
-            preActionIxs: [],
-            swapIxs: [],
-            lookupTables: [],
-            quote: {
-                priceAInB: new decimal_js_1.default(0), // not used
-                quoteResponse: undefined,
+        const klendIxs = (await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, [
+            {
+                preActionIxs: [],
+                swapIxs: [],
+                lookupTables: [],
+                quote: {
+                    priceAInB: new decimal_js_1.default(0), // not used
+                    quoteResponse: undefined,
+                },
             },
-        }, budgetAndPriorityFeeIxs, useV2Ixs);
+        ], budgetAndPriorityFeeIxs, useV2Ixs, withdrawSlotOffset))[0];
         const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
         const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
         const swapInputsForQuote = {
@@ -550,7 +567,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         };
     }
 }
-async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, }) {
+async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, withdrawSlotOffset, }) {
     const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -587,22 +604,24 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
             depositSwapper = swapper;
         }
         const swapsArray = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        return Promise.all(swapsArray.map(async (swap) => {
-            const ixs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const increaseLeverageIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
+            return {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
                 lookupTables: swap.lookupTables,
                 quote: swap.quote,
-            }, budgetAndPriorityFeeIxs, useV2Ixs);
+            };
+        }), budgetAndPriorityFeeIxs, useV2Ixs);
+        return increaseLeverageIxs.map((ixs, index) => {
             return {
                 ixs: ixs.instructions,
                 flashLoanInfo: ixs.flashLoanInfo,
-                lookupTables: swap.lookupTables,
+                lookupTables: swapsArray[index].lookupTables,
                 swapInputs,
                 initialInputs,
-                quote: swap.quote.quoteResponse,
+                quote: swapsArray[index].quote.quoteResponse,
             };
-        }));
+        });
     }
     else {
         console.log('Decreasing leverage');
@@ -618,28 +637,30 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
         }
         // 5. Get swap ixs
         const swapsArray = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        return Promise.all(swapsArray.map(async (swap) => {
-            const ixs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const decreaseLeverageIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
+            return {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
                 lookupTables: swap.lookupTables,
                 quote: swap.quote,
-            }, budgetAndPriorityFeeIxs, useV2Ixs);
+            };
+        }), budgetAndPriorityFeeIxs, useV2Ixs, withdrawSlotOffset);
+        return decreaseLeverageIxs.map((ixs, index) => {
             return {
                 ixs: ixs.instructions,
                 flashLoanInfo: ixs.flashLoanInfo,
-                lookupTables: swap.lookupTables,
+                lookupTables: swapsArray[index].lookupTables,
                 swapInputs,
                 initialInputs,
-                quote: swap.quote.quoteResponse,
+                quote: swapsArray[index].quote.quoteResponse,
             };
-        }));
+        });
     }
 }
 /**
  * Deposit and borrow tokens if leverage increased
  */
-async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
+async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -664,32 +685,34 @@ async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
     const borrowAction = await classes_1.KaminoAction.buildBorrowTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.borrowAmount, debtReserve.stats.decimals).ceil().toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer, currentSlot);
-    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-    const ixs = [
-        ...scopeRefreshIx,
-        ...budgetIxs,
-        ...createAtasIxs,
-        ...[flashBorrowIx],
-        ...(collIsKtoken ? swapInstructions : []),
-        ...classes_1.KaminoAction.actionToIxs(depositAction),
-        ...classes_1.KaminoAction.actionToIxs(borrowAction),
-        ...(collIsKtoken ? [] : swapInstructions),
-        ...[flashRepayIx],
-    ];
-    const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
-    const res = {
-        flashLoanInfo: {
-            flashBorrowReserve: flashBorrowReserve.address,
-            flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
-        },
-        instructions: ixs,
-    };
-    return res;
+    return swapQuoteIxsArray.map((swapQuoteIxs) => {
+        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+        const ixs = [
+            ...scopeRefreshIx,
+            ...budgetIxs,
+            ...createAtasIxs,
+            ...[flashBorrowIx],
+            ...(collIsKtoken ? swapInstructions : []),
+            ...classes_1.KaminoAction.actionToIxs(depositAction),
+            ...classes_1.KaminoAction.actionToIxs(borrowAction),
+            ...(collIsKtoken ? [] : swapInstructions),
+            ...[flashRepayIx],
+        ];
+        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+        const res = {
+            flashLoanInfo: {
+                flashBorrowReserve: flashBorrowReserve.address,
+                flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
+            },
+            instructions: ixs,
+        };
+        return res;
+    });
 }
 /**
  * Withdraw and repay tokens if leverage decreased
  */
-async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
+async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs, withdrawSlotOffset = exports.WITHDRAW_SLOT_OFFSET) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -723,30 +746,33 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 4. Actually do the repay of the flash borrowed amounts
     const repayAction = await classes_1.KaminoAction.buildRepayTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(decimal_js_1.default.abs(calcs.adjustBorrowPosition), debtReserve.stats.decimals).floor().toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, currentSlot, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer);
+    const withdrawSlot = currentSlot - withdrawSlotOffset;
     // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
     const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
-    referrer, currentSlot);
-    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
-    const ixs = [
-        ...scopeRefreshIx,
-        ...budgetIxs,
-        ...createAtasIxs,
-        ...fillWsolAtaIxs,
-        ...[flashBorrowIx],
-        ...classes_1.KaminoAction.actionToIxs(repayAction),
-        ...classes_1.KaminoAction.actionToIxs(withdrawAction),
-        ...swapInstructions,
-        ...[flashRepayIx],
-        ...closeWsolAtaIxs,
-    ];
-    const res = {
-        flashLoanInfo: {
-            flashBorrowReserve: debtReserve.address,
-            flashLoanFee: debtReserve.getFlashLoanFee(),
-        },
-        instructions: ixs,
-    };
-    return res;
+    referrer, withdrawSlot);
+    return swapQuoteIxsArray.map((swapQuoteIxs) => {
+        const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+        const ixs = [
+            ...scopeRefreshIx,
+            ...budgetIxs,
+            ...createAtasIxs,
+            ...fillWsolAtaIxs,
+            ...[flashBorrowIx],
+            ...classes_1.KaminoAction.actionToIxs(repayAction),
+            ...classes_1.KaminoAction.actionToIxs(withdrawAction),
+            ...swapInstructions,
+            ...[flashRepayIx],
+            ...closeWsolAtaIxs,
+        ];
+        const res = {
+            flashLoanInfo: {
+                flashBorrowReserve: debtReserve.address,
+                flashLoanFee: debtReserve.getFlashLoanFee(),
+            },
+            instructions: ixs,
+        };
+        return res;
+    });
 }
 const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs) => {
     const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
@@ -769,12 +795,18 @@ const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, s
             debtReserve.address,
         ]).toArray()
         : new utils_1.PublicKeySet([collReserve.address, debtReserve.address]).toArray();
-    const tokenIds = (0, classes_1.getTokenIdsForScopeRefresh)(market, allReserves);
     const scopeRefreshIxs = [];
-    if (tokenIds.length > 0 && scopeRefreshConfig) {
-        scopeRefreshIxs.push(await scopeRefreshConfig.scope.refreshPriceListIx({
-            feed: scopeRefreshConfig.scopeFeed,
-        }, tokenIds));
+    const scopeTokensMap = (0, classes_1.getTokenIdsForScopeRefresh)(market, allReserves);
+    if (scopeTokensMap.size > 0 && scopeRefreshConfig) {
+        for (const [configPubkey, config] of scopeRefreshConfig.scopeConfigurations) {
+            const tokenIds = scopeTokensMap.get(config.oraclePrices);
+            if (tokenIds && tokenIds.length > 0) {
+                const refreshIx = await scopeRefreshConfig.scope.refreshPriceListIx({ config: configPubkey }, tokenIds);
+                if (refreshIx) {
+                    scopeRefreshIxs.push(refreshIx);
+                }
+            }
+        }
     }
     return scopeRefreshIxs;
 };