@kamino-finance/klend-sdk 6.0.5-beta.1 → 6.1.0-beta.0

package/dist/leverage/operations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/leverage/operations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"operations.d.ts","sourceRoot":"","sources":["../../src/leverage/operations.ts"],"names":[],"mappings":"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"}

package/dist/leverage/operations.js

@@ -34,15 +34,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 +169,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 +222,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 +256,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 +347,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,24 +407,26 @@ 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, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
@@ -447,15 +459,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 +515,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))[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 = {
@@ -587,22 +603,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 +636,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);
+        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 +684,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) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -726,27 +748,29 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 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;
+    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);