@kamino-finance/klend-sdk 5.0.2 → 5.0.4

package/dist/leverage/operations.js

@@ -3,7 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDecreaseLeverageIxns = exports.getIncreaseLeverageIxns = exports.getAdjustLeverageIxns = exports.getAdjustLeverageSwapInputs = exports.getWithdrawWithLeverageIxns = exports.getWithdrawWithLeverageSwapInputs = exports.getDepositWithLeverageIxns = exports.getDepositWithLeverageSwapInputs = exports.depositLeverageKtokenCalcs = exports.depositLeverageCalcs = void 0;
+exports.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
+exports.getDepositWithLeverageIxns = getDepositWithLeverageIxns;
+exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
+exports.getWithdrawWithLeverageIxns = getWithdrawWithLeverageIxns;
+exports.buildWithdrawWithLeverageIxns = buildWithdrawWithLeverageIxns;
+exports.getAdjustLeverageSwapInputs = getAdjustLeverageSwapInputs;
+exports.getAdjustLeverageIxns = getAdjustLeverageIxns;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const classes_1 = require("../classes");
@@ -13,157 +19,93 @@ const utils_1 = require("../utils");
 const calcs_1 = require("./calcs");
 const spl_token_1 = require("@solana/spl-token");
 const utils_2 = require("./utils");
-const depositLeverageCalcs = (props) => {
-    // Initialize local variables from the props object
-    const { depositAmount, depositTokenIsCollToken, depositTokenIsSol, priceDebtToColl, targetLeverage, slippagePct, flashLoanFee, } = props;
-    const slippage = slippagePct.div('100');
-    const initDepositInSol = depositTokenIsSol ? depositAmount : new decimal_js_1.default(0);
-    // Core logic
-    if (depositTokenIsCollToken) {
-        const y = targetLeverage.mul(priceDebtToColl);
-        const x = flashLoanFee.add('1').mul(slippage.add('1')).div(priceDebtToColl);
-        const finalColl = depositAmount.mul(x).div(x.sub(targetLeverage.sub('1').div(y)));
-        const debt = finalColl.sub(depositAmount).mul(x);
-        const flashBorrowColl = finalColl.sub(depositAmount).mul(flashLoanFee.add('1'));
-        return {
-            flashBorrowInCollToken: flashBorrowColl,
-            initDepositInSol,
-            debtTokenToBorrow: debt,
-            collTokenToDeposit: finalColl,
-            swapDebtTokenIn: debt,
-            swapCollTokenExpectedOut: finalColl.sub(depositAmount),
-        };
-    }
-    else {
-        const y = targetLeverage.mul(priceDebtToColl);
-        const x = flashLoanFee.add('1').mul(slippage.add('1')).div(priceDebtToColl);
-        const finalColl = depositAmount.div(x.sub(targetLeverage.sub('1').div(y)));
-        const flashBorrowColl = finalColl.mul(flashLoanFee.add('1'));
-        const debt = targetLeverage.sub('1').mul(finalColl).div(y);
-        return {
-            flashBorrowInCollToken: flashBorrowColl,
-            initDepositInSol,
-            debtTokenToBorrow: debt,
-            collTokenToDeposit: finalColl,
-            swapDebtTokenIn: debt.add(depositAmount),
-            swapCollTokenExpectedOut: finalColl,
-        };
+const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
+async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeFeed, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, }) {
+    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
+    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
+    const flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
+    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
+    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const collIsKtoken = await isKtoken(collTokenMint);
+    const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
+    const calcs = await getDepositWithLeverageCalcs(depositAmount, selectedTokenIsCollToken, collIsKtoken, depositTokenIsSol, priceDebtToColl, targetLeverage, slippagePct, flashLoanFee, kamino, strategy, debtTokenMint, priceAinB, debtReserve);
+    console.log('Ops Calcs', (0, calcs_1.toJson)(calcs));
+    let obligationType;
+    if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Multiply) {
+        // multiply
+        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
     }
-};
-exports.depositLeverageCalcs = depositLeverageCalcs;
-const depositLeverageKtokenCalcs = async (props) => {
-    const { kamino, strategy, debtTokenMint, depositAmount, depositTokenIsCollToken, depositTokenIsSol, priceDebtToColl, targetLeverage, slippagePct, flashLoanFee, priceAinB, strategyHoldings, } = props;
-    const initDepositInSol = depositTokenIsSol ? depositAmount : new decimal_js_1.default(0);
-    const slippage = slippagePct.div('100');
-    let flashBorrowInDebtToken;
-    let collTokenToDeposit;
-    let debtTokenToBorrow;
-    if (depositTokenIsCollToken) {
-        const x = slippage.add('1').div(priceDebtToColl);
-        const y = flashLoanFee.add('1').mul(priceDebtToColl);
-        const z = targetLeverage.mul(y).div(targetLeverage.sub(1));
-        flashBorrowInDebtToken = depositAmount.div(z.minus(new decimal_js_1.default(1).div(x)));
-        collTokenToDeposit = depositAmount.add(flashBorrowInDebtToken.div(x));
-        debtTokenToBorrow = flashBorrowInDebtToken.mul(new decimal_js_1.default(1).add(flashLoanFee));
-        return {
-            flashBorrowInDebtToken,
-            initDepositInSol,
-            collTokenToDeposit,
-            debtTokenToBorrow,
-            requiredCollateral: collTokenToDeposit.sub(depositAmount), // Assuming netValue is requiredCollateral, adjust as needed
-            singleSidedDeposit: flashBorrowInDebtToken,
-        };
+    else if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Leverage) {
+        // leverage
+        obligationType = new utils_1.LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
     }
     else {
-        const y = targetLeverage.mul(priceDebtToColl);
-        // although we will only swap ~half of the debt token, we account for the slippage on the entire amount as we are working backwards from the minimum collateral and do not know the exact swap proportion in advance
-        // This also allows for some variation in the pool ratios between calculation + submitting the tx
-        const x = flashLoanFee.add('1').mul(slippage.add('1')).div(priceDebtToColl);
-        // Calculate the amount of collateral tokens we will deposit in order to achieve the desired leverage after swapping a portion of the debt token and flash loan fees
-        const finalColl = depositAmount.div(x.sub(targetLeverage.sub('1').div(y)));
-        // Calculate how many A and B tokens we will need to actually mint the desired amount of ktoken collateral
-        // The actual amount of ktokens received may be less than the finalColl due to smart proportional contract logic
-        // So we use the actualColl as the amount we will deposit
-        const [estimatedA, estimatedB, actualColl] = await (0, calcs_1.simulateMintKToken)(kamino, strategy, finalColl, strategyHoldings);
-        const pxAinB = await priceAinB(strategy.strategy.tokenAMint, strategy.strategy.tokenBMint);
-        const isTokenADeposit = strategy.strategy.tokenAMint.equals(debtTokenMint);
-        // Calculate the amount we need to flash borrow by combining value of A and B into the debt token
-        const singleSidedDepositAmount = isTokenADeposit
-            ? estimatedA.add(estimatedB.div(pxAinB))
-            : estimatedB.add(estimatedA.mul(pxAinB));
-        // Add slippage to the entire amount, add flash loan fee to part we will flash borrow
-        flashBorrowInDebtToken = singleSidedDepositAmount
-            .div(new decimal_js_1.default('1').sub(slippage))
-            .sub(depositAmount)
-            .div(new decimal_js_1.default('1').sub(flashLoanFee));
-        // Deposit the min ktoken amount we calculated at the beginning
-        // Any slippage will be left in the user's wallet as ktokens
-        collTokenToDeposit = actualColl;
-        debtTokenToBorrow = flashBorrowInDebtToken.div(new decimal_js_1.default('1').sub(flashLoanFee));
-        // Add slippage to ensure we try to swap/deposit as much as possible after flash loan fees
-        const singleSidedDeposit = singleSidedDepositAmount.div(new decimal_js_1.default('1').sub(slippage));
-        return {
-            flashBorrowInDebtToken,
-            initDepositInSol,
-            collTokenToDeposit,
-            debtTokenToBorrow,
-            requiredCollateral: collTokenToDeposit, // Assuming collTokenToDeposit is requiredCollateral, adjust as needed
-            singleSidedDeposit,
-        };
+        throw Error('Obligation type tag not supported for leverage, please use 1 - multiply or 3 - leverage');
+    }
+    // Build the repay & withdraw collateral tx to get the number of accounts
+    const klendIxs = await buildDepositWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs: [],
+        lookupTables: [],
+    }, strategy, collIsKtoken);
+    const uniqueKlendAccounts = (0, utils_1.uniqueAccounts)(klendIxs);
+    const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcs.singleSidedDepositKtokenOnly, debtReserve.stats.decimals).ceil();
+    const swapInputsForQuote = {
+        inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
+        inputMint: debtTokenMint,
+        outputMint: collTokenMint,
+        amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens swaps
+    };
+    const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
+    const quotePriceCalcs = await getDepositWithLeverageCalcs(depositAmount, selectedTokenIsCollToken, collIsKtoken, depositTokenIsSol, swapQuote.priceAInB, targetLeverage, slippagePct, flashLoanFee, kamino, strategy, debtTokenMint, priceAinB, debtReserve);
+    const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? quotePriceCalcs.swapDebtTokenIn : quotePriceCalcs.singleSidedDepositKtokenOnly, debtReserve.stats.decimals).ceil();
+    let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
+    if (collIsKtoken) {
+        let futureBalanceInAta = new decimal_js_1.default(0);
+        if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
+            futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? quotePriceCalcs.initDepositInSol : quotePriceCalcs.initDepositInSol);
+        }
+        futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? quotePriceCalcs.debtTokenToBorrow : quotePriceCalcs.flashBorrowInDebtTokenKtokenOnly);
+        expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
     }
-};
-exports.depositLeverageKtokenCalcs = depositLeverageKtokenCalcs;
-const getDepositWithLeverageSwapInputs = (props) => {
-    const { depositAmount, priceDebtToColl, slippagePct, targetLeverage, kaminoMarket, selectedTokenMint, debtTokenMint, collTokenMint, } = props;
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
-    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    const flashLoanFee = debtReserve?.getFlashLoanFee() || new decimal_js_1.default(0);
-    const calcs = (0, exports.depositLeverageCalcs)({
-        depositAmount,
-        depositTokenIsCollToken: selectedTokenIsCollToken,
-        depositTokenIsSol,
-        priceDebtToColl,
-        targetLeverage,
-        slippagePct,
-        flashLoanFee,
-    });
     return {
         swapInputs: {
-            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.swapDebtTokenIn, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
+            inputAmountLamports: swapInputAmountQuotePrice,
             inputMint: debtTokenMint,
             outputMint: collTokenMint,
+            amountDebtAtaBalance: expectedDebtTokenAtaBalance,
+        },
+        initialInputs: {
+            calcs: quotePriceCalcs,
+            swapQuote,
+            currentSlot,
+            collIsKtoken,
+            strategy,
+            obligation: obligation ? obligation : obligationType,
+            klendAccounts: uniqueKlendAccounts,
         },
     };
-};
-exports.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
-const getDepositWithLeverageIxns = async (props) => {
-    const { connection, budgetAndPriorityFeeIxns, user, amount, selectedTokenMint, collTokenMint, debtTokenMint, targetLeverage, kaminoMarket, slippagePct, priceDebtToColl, swapper, referrer, isKtoken, priceAinB, kamino, obligationTypeTagOverride = 1, obligation, currentSlot, getTotalKlendAccountsOnly, scopeFeed, } = props;
-    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
-    const flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    const collIsKtoken = await isKtoken(collTokenMint);
-    const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
-    const calcs = (0, exports.depositLeverageCalcs)({
-        depositAmount: amount,
-        depositTokenIsCollToken: selectedTokenIsCollToken,
-        depositTokenIsSol,
-        priceDebtToColl,
-        targetLeverage,
-        slippagePct,
-        flashLoanFee,
-    });
-    let calcsKtoken;
-    if (collIsKtoken) {
-        calcsKtoken = await (0, exports.depositLeverageKtokenCalcs)({
+}
+async function getDepositWithLeverageCalcs(depositAmount, selectedTokenIsCollToken, collIsKtoken, depositTokenIsSol, priceDebtToColl, targetLeverage, slippagePct, flashLoanFee, kamino, strategy, debtTokenMint, priceAinB, debtReserve) {
+    let calcs;
+    if (!collIsKtoken) {
+        calcs = (0, calcs_1.depositLeverageCalcs)({
+            depositAmount: depositAmount,
+            depositTokenIsCollToken: selectedTokenIsCollToken,
+            depositTokenIsSol,
+            priceDebtToColl,
+            targetLeverage,
+            slippagePct,
+            flashLoanFee,
+        });
+    }
+    else {
+        calcs = await (0, calcs_1.depositLeverageKtokenCalcs)({
             kamino: kamino,
             strategy: strategy,
             debtTokenMint,
-            depositAmount: amount,
+            depositAmount: depositAmount,
             depositTokenIsCollToken: selectedTokenIsCollToken,
             depositTokenIsSol,
             priceDebtToColl,
@@ -173,23 +115,84 @@ const getDepositWithLeverageIxns = async (props) => {
             priceAinB,
         });
         // Rounding to exact number of decimals so this value is passed through in all calcs without rounding inconsistencies
-        calcsKtoken.flashBorrowInDebtToken = calcsKtoken.flashBorrowInDebtToken.toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-        calcsKtoken.debtTokenToBorrow = calcsKtoken.debtTokenToBorrow.toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-        calcsKtoken.singleSidedDeposit = calcsKtoken.singleSidedDeposit.toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
+        calcs.flashBorrowInDebtTokenKtokenOnly = calcs.flashBorrowInDebtTokenKtokenOnly.toDecimalPlaces(debtReserve.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
+        calcs.debtTokenToBorrow = calcs.debtTokenToBorrow.toDecimalPlaces(debtReserve.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
+        calcs.singleSidedDepositKtokenOnly = calcs.singleSidedDepositKtokenOnly.toDecimalPlaces(debtReserve.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
+    }
+    return calcs;
+}
+async function getDepositWithLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeFeed, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, }) {
+    const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
+        owner,
+        kaminoMarket,
+        debtTokenMint,
+        collTokenMint,
+        depositAmount,
+        priceDebtToColl,
+        slippagePct,
+        obligation,
+        referrer,
+        currentSlot,
+        targetLeverage,
+        selectedTokenMint,
+        kamino,
+        obligationTypeTagOverride,
+        scopeFeed,
+        budgetAndPriorityFeeIxs,
+        quoteBufferBps,
+        priceAinB,
+        isKtoken,
+        quoter,
+    });
+    let depositSwapper;
+    if (!initialInputs.collIsKtoken) {
+        depositSwapper = swapper;
+    }
+    else {
+        if (kamino === undefined) {
+            throw Error('Ktoken use as collateral for leverage without Kamino instance');
+        }
+        depositSwapper = await (0, utils_2.getTokenToKtokenSwapper)(kaminoMarket, kamino, owner, slippagePct, swapper, priceAinB, false);
+    }
+    const { swapIxs, lookupTables } = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
+    if (initialInputs.collIsKtoken) {
+        if (initialInputs.strategy.strategy.strategyLookupTable) {
+            const strategyLut = await (0, utils_1.getLookupTableAccount)(kaminoMarket.getConnection(), initialInputs.strategy.strategy.strategyLookupTable);
+            lookupTables.push(strategyLut);
+        }
+        else {
+            console.log('Strategy lookup table not found');
+        }
     }
-    console.log('Ops Calcs', (0, calcs_1.toJson)(!collIsKtoken ? calcs : calcsKtoken));
-    console.log('Infos', (0, calcs_1.toJson)({
-        depositTokenIsSol,
-        selectedTokenIsCollToken,
-        initDepositInSol: calcs.initDepositInSol,
-    }));
+    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
+    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
+    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const ixs = await buildDepositWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeFeed, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs: swapIxs,
+        lookupTables: lookupTables,
+    }, initialInputs.strategy, initialInputs.collIsKtoken);
+    return {
+        ixs,
+        lookupTables,
+        swapInputs,
+        initialInputs,
+    };
+}
+async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken) {
+    const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+    const collTokenMint = collReserve.getLiquidityMint();
+    const debtTokenMint = debtReserve.getLiquidityMint();
+    const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner);
+    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner);
     // 1. Create atas & budget txns
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
             : strategy.strategy.tokenAMint;
-        const secondTokenTokenProgarm = strategy?.strategy.tokenAMint.equals(debtTokenMint)
+        const secondTokenTokenProgarm = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenBTokenProgram
@@ -231,269 +234,183 @@ const getDepositWithLeverageIxns = async (props) => {
             },
         ];
     }
-    const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    const { atas: [collTokenAta, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
-    // TODO: this needs to work the other way around also
-    // TODO: marius test this with shorting leverage and with leverage looping
+    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
     const fillWsolAtaIxns = [];
     if (depositTokenIsSol) {
-        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(user, selectedTokenIsCollToken ? collTokenAta : debtTokenAta, (0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, solTokenReserve.stats.decimals).ceil()));
+        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(utils_1.WRAPPED_SOL_MINT, owner), (0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil()));
     }
-    // 1. Flash borrow & repay the collateral amount needed for given leverage
+    // 2. Flash borrow & repay the collateral amount needed for given leverage
     // if user deposits coll, then we borrow the diff, else we borrow the entire amount
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
-        walletPublicKey: user,
-        lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
-        lendingMarketAddress: kaminoMarket.getAddress(),
+        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
+        walletPublicKey: owner,
+        lendingMarketAuthority: market.getLendingMarketAuthority(),
+        lendingMarketAddress: market.getAddress(),
         reserve: !collIsKtoken ? collReserve : debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.flashBorrowInCollToken : calcsKtoken.flashBorrowInDebtToken, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.flashBorrowInCollToken : calcs.flashBorrowInDebtTokenKtokenOnly, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
         destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
-        referrerAccount: kaminoMarket.programId,
-        referrerTokenState: kaminoMarket.programId,
-        programId: kaminoMarket.programId,
+        referrerAccount: market.programId,
+        referrerTokenState: market.programId,
+        programId: market.programId,
     });
-    console.log('Borrowing: ', (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.debtTokenToBorrow : calcsKtoken.debtTokenToBorrow, debtReserve.stats.decimals)
-        .ceil()
-        .toString());
     // 3. Deposit initial tokens + borrowed tokens into reserve
-    let obligationType;
-    if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Multiply) {
-        // multiply
-        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Leverage) {
-        // leverage
-        obligationType = new utils_1.LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else {
-        throw Error('Obligation type tag not supported for leverage, please use 1 - multiply or 3 - leverage');
-    }
     const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
-    const kaminoDepositAndBorrowAction = await classes_1.KaminoAction.buildDepositAndBorrowTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.collTokenToDeposit : calcsKtoken.collTokenToDeposit, collReserve.stats.decimals)
+    const kaminoDepositAndBorrowAction = await classes_1.KaminoAction.buildDepositAndBorrowTxns(market, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.collTokenToDeposit : calcs.collTokenToDeposit, collReserve.stats.decimals)
         .floor()
-        .toString(), collTokenMint, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.debtTokenToBorrow : calcsKtoken.debtTokenToBorrow, debtReserve.stats.decimals)
+        .toString(), collTokenMint, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.debtTokenToBorrow : calcs.debtTokenToBorrow, debtReserve.stats.decimals)
         .ceil()
-        .toString(), debtTokenMint, user, obligation ? obligation : obligationType, 0, false, true, // emode
+        .toString(), debtTokenMint, owner, obligation, 0, false, true, // emode
     false, // to be checked and created in a setup tx in the UI
     referrer, currentSlot, scopeRefresh);
-    console.log('Expected to swap in', !collIsKtoken ? calcs.swapDebtTokenIn.toNumber().toString() : calcsKtoken.singleSidedDeposit.toNumber().toString(), 'debt for', !collIsKtoken ? calcs.swapCollTokenExpectedOut.toString() : calcsKtoken.requiredCollateral.toNumber().toString(), 'coll');
-    const ixns = [
-        ...budgetIxns,
-        ...createAtaIxs,
-        ...fillWsolAtaIxns,
-        ...[flashBorrowIxn],
-        ...kaminoDepositAndBorrowAction.setupIxs,
-        ...[kaminoDepositAndBorrowAction.lendingIxs[0]],
-        ...kaminoDepositAndBorrowAction.inBetweenIxs,
-        ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
-        ...kaminoDepositAndBorrowAction.cleanupIxs,
-        ...[flashRepayIxn],
-    ];
-    const uniqueAccounts = new utils_1.PublicKeySet([]);
-    ixns.forEach((ixn) => {
-        ixn.keys.forEach((key) => {
-            uniqueAccounts.add(key.pubkey);
-        });
-    });
-    const totalKlendAccounts = uniqueAccounts.toArray().length;
-    // return early to avoid extra swapper calls
-    if (getTotalKlendAccountsOnly) {
-        return {
-            ixns: [],
-            lookupTablesAddresses: [],
-            swapInputs: {
-                inputAmountLamports: new decimal_js_1.default('0'),
-                inputMint: web3_js_1.PublicKey.default,
-                outputMint: web3_js_1.PublicKey.default,
-            },
-            totalKlendAccounts: totalKlendAccounts,
-        };
-    }
-    let depositSwapper;
-    let expectedDebtTokenAtaBalance = new decimal_js_1.default(0); // only needed for kTokens
+    // 4. Swap
+    const { swapIxs } = swapQuoteIxs;
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxs, []);
     if (!collIsKtoken) {
-        depositSwapper = swapper;
-    }
-    else {
-        if (kamino === undefined) {
-            throw Error('Ktoken use as collateral for leverage without Kamino instance');
-        }
-        depositSwapper = await (0, utils_2.getTokenToKtokenSwapper)(connection, kaminoMarket, kamino, user, swapper, priceAinB, false);
-        let futureBalanceInAta = new decimal_js_1.default(0);
-        if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
-            futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? calcs.initDepositInSol : calcsKtoken.initDepositInSol);
-        }
-        futureBalanceInAta = futureBalanceInAta.add(!collIsKtoken ? calcs.debtTokenToBorrow : calcsKtoken.flashBorrowInDebtToken);
-        expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(connection, debtTokenMint, user, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
-    }
-    const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.swapDebtTokenIn : calcsKtoken.singleSidedDeposit, debtReserve.stats.decimals).ceil(),
-        inputMint: debtTokenMint,
-        outputMint: collTokenMint,
-    };
-    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct.toNumber(), expectedDebtTokenAtaBalance);
-    if (collIsKtoken) {
-        if (strategy?.strategy.strategyLookupTable) {
-            lookupTablesAddresses.push(strategy?.strategy.strategyLookupTable);
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
-    if (!collIsKtoken) {
-        return {
-            ixns: [
-                ...budgetIxns,
-                ...createAtaIxs,
-                ...fillWsolAtaIxns,
-                ...[flashBorrowIxn],
-                ...kaminoDepositAndBorrowAction.setupIxs,
-                ...[kaminoDepositAndBorrowAction.lendingIxs[0]],
-                ...kaminoDepositAndBorrowAction.inBetweenIxs,
-                ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
-                ...kaminoDepositAndBorrowAction.cleanupIxs,
-                ...swapInstructions,
-                ...[flashRepayIxn],
-            ],
-            lookupTablesAddresses,
-            swapInputs,
-            totalKlendAccounts: totalKlendAccounts,
-        };
+        return [
+            ...budgetIxns,
+            ...atasAndCreateIxns.map((x) => x.createAtaIx),
+            ...fillWsolAtaIxns,
+            ...[flashBorrowIxn],
+            ...kaminoDepositAndBorrowAction.setupIxs,
+            ...[kaminoDepositAndBorrowAction.lendingIxs[0]],
+            ...kaminoDepositAndBorrowAction.inBetweenIxs,
+            ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
+            ...kaminoDepositAndBorrowAction.cleanupIxs,
+            ...swapInstructions,
+            ...[flashRepayIxn],
+        ];
     }
     else {
-        return {
-            ixns: [
-                ...budgetIxns,
-                ...createAtaIxs,
-                ...fillWsolAtaIxns,
-                ...[flashBorrowIxn],
-                ...swapInstructions,
-                ...kaminoDepositAndBorrowAction.setupIxs,
-                ...[kaminoDepositAndBorrowAction.lendingIxs[0]],
-                ...kaminoDepositAndBorrowAction.inBetweenIxs,
-                ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
-                ...kaminoDepositAndBorrowAction.cleanupIxs,
-                ...[flashRepayIxn],
-            ],
-            lookupTablesAddresses,
-            swapInputs,
-            totalKlendAccounts: totalKlendAccounts,
-        };
+        return [
+            ...budgetIxns,
+            ...atasAndCreateIxns.map((x) => x.createAtaIx),
+            ...fillWsolAtaIxns,
+            ...[flashBorrowIxn],
+            ...swapInstructions,
+            ...kaminoDepositAndBorrowAction.setupIxs,
+            ...[kaminoDepositAndBorrowAction.lendingIxs[0]],
+            ...kaminoDepositAndBorrowAction.inBetweenIxs,
+            ...[kaminoDepositAndBorrowAction.lendingIxs[1]],
+            ...kaminoDepositAndBorrowAction.cleanupIxs,
+            ...[flashRepayIxn],
+        ];
     }
-};
-exports.getDepositWithLeverageIxns = getDepositWithLeverageIxns;
-const getWithdrawWithLeverageSwapInputs = (props) => {
-    const { amount, deposited, borrowed, priceCollToDebt, slippagePct, isClosingPosition, kaminoMarket, selectedTokenMint, debtTokenMint, collTokenMint, userObligation, currentSlot, } = props;
+}
+async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, deposited, borrowed, obligation, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const flashLoanFee = debtReserve?.getFlashLoanFee() || new decimal_js_1.default(0);
+    const flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
     const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
-    const { adjustDepositPosition: withdrawAmount, adjustBorrowPosition: initialRepayAmount } = isClosingPosition
-        ? { adjustDepositPosition: deposited, adjustBorrowPosition: borrowed }
-        : (0, calcs_1.calcWithdrawAmounts)({
-            collTokenMint: collTokenMint,
-            priceCollToDebt: new decimal_js_1.default(priceCollToDebt),
-            currentDepositPosition: deposited,
-            currentBorrowPosition: borrowed,
-            withdrawAmount: new decimal_js_1.default(amount),
-            selectedTokenMint: selectedTokenMint,
-        });
-    const irSlippageBpsForDebt = userObligation
-        .estimateObligationInterestRate(kaminoMarket, debtReserve, userObligation.state.borrows[0], currentSlot)
-        .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-    const repayAmount = initialRepayAmount
-        .mul(irSlippageBpsForDebt.add('0.1').div('10_000').add('1'))
-        .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-    const swapAmountIfWithdrawingColl = repayAmount
-        .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-        .mul(new decimal_js_1.default(1 + slippagePct / 100))
-        .div(priceCollToDebt);
-    const swapAmountIfWithdrawingDebt = withdrawAmount;
-    const collTokenSwapIn = selectedTokenIsCollToken ? swapAmountIfWithdrawingColl : swapAmountIfWithdrawingDebt;
+    const collIsKtoken = await isKtoken(collTokenMint);
+    const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
+    const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
+    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const calcs = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, priceCollToDebt, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
+    const klendIxs = await buildWithdrawWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs: [],
+        lookupTables: [],
+    }, strategy, collIsKtoken);
+    const uniqueKlendAccounts = (0, utils_1.uniqueAccounts)(klendIxs);
+    const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+    const swapInputsForQuote = {
+        inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
+        inputMint: collTokenMint,
+        outputMint: debtTokenMint,
+        amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
+    };
+    const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
+    const calcsQuotePrice = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, collIsKtoken ? swapQuote.priceAInB : priceCollToDebt, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
+    const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
     return {
         swapInputs: {
-            inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
+            inputAmountLamports: swapInputAmountQuotePrice,
             inputMint: collTokenMint,
             outputMint: debtTokenMint,
+            amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
+        },
+        initialInputs: {
+            calcs: calcsQuotePrice,
+            swapQuote,
+            currentSlot,
+            collIsKtoken,
+            strategy,
+            obligation,
+            klendAccounts: uniqueKlendAccounts,
         },
     };
-};
-exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
-const getWithdrawWithLeverageIxns = async (props) => {
-    const { connection, budgetAndPriorityFeeIxns, user, amount, deposited, borrowed, collTokenMint, debtTokenMint, priceCollToDebt, selectedTokenMint, isClosingPosition, kaminoMarket, slippagePct, swapper, referrer, isKtoken, kamino, obligationTypeTagOverride, obligation, currentSlot, getTotalKlendAccountsOnly, scopeFeed, } = props;
+}
+async function getWithdrawWithLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, swapper, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const flashLoanFee = debtReserve?.getFlashLoanFee() || new decimal_js_1.default(0);
-    const collIsKtoken = await isKtoken(collTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
-    const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
     const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    let obligationType;
-    if (obligationTypeTagOverride == utils_1.ObligationTypeTag.Multiply) {
-        // multiply
-        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else if (obligationTypeTagOverride == utils_1.ObligationTypeTag.Leverage) {
-        // leverage
-        obligationType = new utils_1.LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
+    const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
+        owner,
+        kaminoMarket,
+        debtTokenMint,
+        collTokenMint,
+        deposited,
+        borrowed,
+        obligation,
+        referrer,
+        currentSlot,
+        withdrawAmount,
+        priceCollToDebt,
+        slippagePct,
+        isClosingPosition,
+        selectedTokenMint,
+        budgetAndPriorityFeeIxs,
+        kamino,
+        scopeFeed,
+        quoteBufferBps,
+        isKtoken,
+        quoter,
+    });
+    let withdrawSwapper;
+    if (initialInputs.collIsKtoken) {
+        if (kamino === undefined) {
+            throw Error('Ktoken use as collateral for leverage without Kamino instance');
+        }
+        withdrawSwapper = await (0, utils_2.getKtokenToTokenSwapper)(kaminoMarket, kamino, owner, swapper);
     }
     else {
-        throw Error(`Obligation type tag ${obligationTypeTagOverride} not supported for leverage, please use multiply (1) or leverage (3) obligation type`);
+        withdrawSwapper = swapper;
     }
-    // 1. Calculate coll_amount and debt_amount to repay such that we maintain leverage and we withdraw to
-    // the wallet `amountInDepositTokenToWithdrawToWallet` amount of collateral token
-    // We need to withdraw withdrawAmountInDepositToken coll tokens
-    // and repay repayAmountInBorrowToken debt tokens
-    // TODO marius: do the same in useDeposit
-    const { adjustDepositPosition: withdrawAmount, adjustBorrowPosition: initialRepayAmount } = isClosingPosition
-        ? { adjustDepositPosition: deposited, adjustBorrowPosition: borrowed }
-        : (0, calcs_1.calcWithdrawAmounts)({
-            collTokenMint: collTokenMint,
-            priceCollToDebt: new decimal_js_1.default(priceCollToDebt),
-            currentDepositPosition: deposited,
-            currentBorrowPosition: borrowed,
-            withdrawAmount: new decimal_js_1.default(amount),
-            selectedTokenMint: selectedTokenMint,
-        });
-    // Add slippage for the accrued interest rate amount
-    const userObligation = obligation
-        ? obligation
-        : await kaminoMarket.getObligationByAddress(obligationType.toPda(kaminoMarket.getAddress(), user));
-    const irSlippageBpsForDebt = userObligation
-        .estimateObligationInterestRate(kaminoMarket, debtReserve, userObligation?.state.borrows[0], currentSlot)
-        .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-    // add 0.1 to irSlippageBpsForDebt because we don't want to estimate slightly less than SC and end up not reapying enough
-    const repayAmount = initialRepayAmount
-        .mul(irSlippageBpsForDebt.add('0.1').div('10_000').add('1'))
-        .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber(), decimal_js_1.default.ROUND_CEIL);
-    // 6. Get swap ixns
-    // 5. Get swap estimations to understand how much we need to borrow from borrow reserve
-    // prevent withdrawing more then deposited if we close position
-    const depositTokenWithdrawAmount = !isClosingPosition
-        ? withdrawAmount.mul(new decimal_js_1.default(1).plus(flashLoanFee))
-        : withdrawAmount;
-    // We are swapping debt token
-    // When withdrawing coll, it means we just need to swap enough to pay for the flash borrow
-    const swapAmountIfWithdrawingColl = repayAmount
-        .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-        .mul(new decimal_js_1.default(1 + slippagePct / 100))
-        .div(priceCollToDebt);
-    // When withdrawing debt, it means we need to swap just the collateral we are withdrwaing
-    // enough to cover the debt we are repaying, leaving the remaining in the wallet
-    const swapAmountIfWithdrawingDebt = withdrawAmount;
-    const collTokenSwapIn = selectedTokenIsCollToken ? swapAmountIfWithdrawingColl : swapAmountIfWithdrawingDebt;
-    const debtTokenExpectedSwapOut = collTokenSwapIn.mul(priceCollToDebt).div(new decimal_js_1.default(1 + slippagePct / 100));
-    const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
-    console.log('Expecting to swap', collTokenSwapIn.toString(), 'coll for', debtTokenExpectedSwapOut.toString(), 'debt');
+    const { swapIxs, lookupTables } = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
+    if (initialInputs.collIsKtoken) {
+        if (initialInputs.strategy.strategy.strategyLookupTable) {
+            const strategyLut = await (0, utils_1.getLookupTableAccount)(kaminoMarket.getConnection(), initialInputs.strategy.strategy.strategyLookupTable);
+            lookupTables.push(strategyLut);
+        }
+        else {
+            console.log('Strategy lookup table not found');
+        }
+    }
+    const ixs = await buildWithdrawWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+        preActionIxs: [],
+        swapIxs,
+        lookupTables,
+    }, initialInputs.strategy, initialInputs.collIsKtoken);
+    // Send ixns and lookup tables
+    return {
+        ixs,
+        lookupTables,
+        swapInputs,
+        initialInputs: initialInputs,
+    };
+}
+async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken) {
+    const collTokenMint = collReserve.getLiquidityMint();
+    const debtTokenMint = debtReserve.getLiquidityMint();
+    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner);
     // 1. Create atas & budget txns & user metadata
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBMint
             : strategy.strategy.tokenAMint;
-        const secondTokenTokenProgram = strategy?.strategy.tokenAMint.equals(debtTokenMint)
+        const secondTokenTokenProgram = strategy.strategy.tokenAMint.equals(debtTokenMint)
             ? strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
                 ? spl_token_1.TOKEN_PROGRAM_ID
                 : strategy.strategy.tokenBTokenProgram
@@ -535,96 +452,45 @@ const getWithdrawWithLeverageIxns = async (props) => {
             },
         ];
     }
-    const { atas: [, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
+    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
     const closeWsolAtaIxns = [];
     if (depositTokenIsSol || debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
-        const wsolAta = (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, user, false);
-        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, user, user, [], spl_token_1.TOKEN_PROGRAM_ID));
+        const wsolAta = (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner, false);
+        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
-    const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    // TODO: marius test this with shorting leverage and with leverage looping
+    const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+    // TODO: Might be worth removing as it's only needed for Ktokens
     // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
     const fillWsolAtaIxns = [];
     if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
-        const halfSolBalance = (await connection.getBalance(user)) / web3_js_1.LAMPORTS_PER_SOL / 2;
+        const halfSolBalance = (await market.getConnection().getBalance(owner)) / web3_js_1.LAMPORTS_PER_SOL / 2;
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
-        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(user, debtTokenAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, solTokenReserve.stats.decimals).ceil()));
+        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(utils_1.WRAPPED_SOL_MINT, owner), (0, classes_2.numberToLamportsDecimal)(balanceToWrap, utils_1.SOL_DECIMALS).ceil()));
     }
     // 2. Prepare the flash borrow and flash repay amounts and ixns
     // We borrow exactly how much we need to repay
     // and repay that + flash amount fee
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
-        walletPublicKey: user,
-        lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
-        lendingMarketAddress: kaminoMarket.getAddress(),
+        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
+        walletPublicKey: owner,
+        lendingMarketAuthority: market.getLendingMarketAuthority(),
+        lendingMarketAddress: market.getAddress(),
         reserve: debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(repayAmount, debtReserve.stats.decimals),
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.repayAmount, debtReserve.stats.decimals),
         destinationAta: debtTokenAta,
-        referrerAccount: kaminoMarket.programId,
-        referrerTokenState: kaminoMarket.programId,
-        programId: kaminoMarket.programId,
+        referrerAccount: market.programId,
+        referrerTokenState: market.programId,
+        programId: market.programId,
     });
     // 6. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
-    const repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawTxns(kaminoMarket, isClosingPosition ? utils_1.U64_MAX : (0, classes_2.numberToLamportsDecimal)(repayAmount, debtReserve.stats.decimals).floor().toString(), debtTokenMint, isClosingPosition ? utils_1.U64_MAX : (0, classes_2.numberToLamportsDecimal)(depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, user, currentSlot, userObligation ? userObligation : obligationType, 0, false, false, false, // 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)
+    const repayAndWithdrawAction = await classes_1.KaminoAction.buildRepayAndWithdrawTxns(market, isClosingPosition ? utils_1.U64_MAX : (0, classes_2.numberToLamportsDecimal)(calcs.repayAmount, debtReserve.stats.decimals).floor().toString(), debtTokenMint, isClosingPosition
+        ? utils_1.U64_MAX
+        : (0, classes_2.numberToLamportsDecimal)(calcs.depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, currentSlot, obligation, 0, false, false, false, // 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)
     isClosingPosition, referrer, { includeScopeRefresh: true, scopeFeed: scopeFeed });
-    const klendIxns = [
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
+    return [
         ...budgetIxns,
-        ...createAtaIxs,
-        ...fillWsolAtaIxns,
-        ...[flashBorrowIxn],
-        ...repayAndWithdrawAction.setupIxs,
-        ...[repayAndWithdrawAction.lendingIxs[0]],
-        ...repayAndWithdrawAction.inBetweenIxs,
-        ...[repayAndWithdrawAction.lendingIxs[1]],
-        ...repayAndWithdrawAction.cleanupIxs,
-        ...[flashRepayIxn],
-        ...closeWsolAtaIxns,
-    ];
-    const uniqueAccs = (0, utils_1.uniqueAccounts)(klendIxns);
-    const totalKlendAccounts = uniqueAccs.length;
-    // return early to avoid extra swapper calls
-    if (getTotalKlendAccountsOnly) {
-        return {
-            ixns: [],
-            lookupTablesAddresses: [],
-            swapInputs: {
-                inputAmountLamports: new decimal_js_1.default('0'),
-                inputMint: web3_js_1.PublicKey.default,
-                outputMint: web3_js_1.PublicKey.default,
-            },
-            totalKlendAccounts: totalKlendAccounts,
-        };
-    }
-    let withdrawSwapper;
-    if (collIsKtoken) {
-        if (kamino === undefined) {
-            throw Error('Ktoken use as collateral for leverage without Kamino instance');
-        }
-        withdrawSwapper = await (0, utils_2.getKtokenToTokenSwapper)(kaminoMarket, kamino, user, swapper);
-    }
-    else {
-        withdrawSwapper = swapper;
-    }
-    const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(collTokenSwapIn, collReserve.stats.decimals).ceil(),
-        inputMint: collTokenMint,
-        outputMint: debtTokenMint,
-    };
-    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct);
-    // TODO MARIUS: remove first instruction that is setBudget ixn
-    if (collIsKtoken) {
-        if (strategy?.strategy.strategyLookupTable) {
-            lookupTablesAddresses.push(strategy?.strategy.strategyLookupTable);
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
-    const ixns = [
-        ...budgetIxns,
-        ...createAtaIxs,
+        ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAndWithdrawAction.setupIxs,
@@ -636,20 +502,24 @@ const getWithdrawWithLeverageIxns = async (props) => {
         ...[flashRepayIxn],
         ...closeWsolAtaIxns,
     ];
-    // Send ixns and lookup tables
-    return {
-        ixns,
-        lookupTablesAddresses,
-        swapInputs,
-        totalKlendAccounts: totalKlendAccounts,
-    };
-};
-exports.getWithdrawWithLeverageIxns = getWithdrawWithLeverageIxns;
-const getAdjustLeverageSwapInputs = (props) => {
-    const { deposited, borrowed, priceCollToDebt, priceDebtToColl, slippagePct, targetLeverage, kaminoMarket, debtTokenMint, collTokenMint, } = props;
+}
+async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const flashLoanFee = debtReserve?.getFlashLoanFee() || new decimal_js_1.default(0);
+    const deposited = (0, classes_1.lamportsToNumberDecimal)(depositedLamports, collReserve.stats.decimals);
+    const borrowed = (0, classes_1.lamportsToNumberDecimal)(borrowedLamports, debtReserve.stats.decimals);
+    const collIsKtoken = await isKtoken(collTokenMint);
+    const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
+    // Getting current flash loan fee
+    const currentLeverage = obligation.refreshedStats.leverage;
+    const isDepositViaLeverage = targetLeverage.gte(new decimal_js_1.default(currentLeverage));
+    let flashLoanFee;
+    if (isDepositViaLeverage) {
+        flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
+    }
+    else {
+        flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
+    }
     const { adjustDepositPosition, adjustBorrowPosition } = (0, calcs_1.calcAdjustAmounts)({
         currentDepositPosition: deposited,
         currentBorrowPosition: borrowed,
@@ -658,147 +528,187 @@ const getAdjustLeverageSwapInputs = (props) => {
         flashLoanFee: new decimal_js_1.default(flashLoanFee),
     });
     const isDeposit = adjustDepositPosition.gte(0) && adjustBorrowPosition.gte(0);
+    if (isDepositViaLeverage !== isDeposit) {
+        throw new Error('Invalid target leverage');
+    }
     if (isDeposit) {
-        const borrowAmount = adjustDepositPosition
-            .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-            .mul(new decimal_js_1.default(1 + slippagePct / 100))
-            .div(priceDebtToColl);
+        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 buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+        }, budgetAndPriorityFeeIxs);
+        const uniqueKlendAccounts = (0, utils_1.uniqueAccounts)(klendIxs);
+        const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.borrowAmount : calcs.amountToFlashBorrowDebt, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+        const swapInputsForQuote = {
+            inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
+            inputMint: debtTokenMint,
+            outputMint: collTokenMint,
+            amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens swaps
+        };
+        const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
+        const { adjustDepositPosition: adjustDepositPositionQuotePrice, adjustBorrowPosition: adjustBorrowPositionQuotePrice, } = (0, calcs_1.calcAdjustAmounts)({
+            currentDepositPosition: deposited,
+            currentBorrowPosition: borrowed,
+            targetLeverage: targetLeverage,
+            priceCollToDebt: new decimal_js_1.default(1).div(swapQuote.priceAInB),
+            flashLoanFee: new decimal_js_1.default(flashLoanFee),
+        });
+        const calcsQuotePrice = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner, debtReserve, adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, swapQuote.priceAInB, flashLoanFee, slippagePct, collIsKtoken);
+        const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+        let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
+        if (collIsKtoken) {
+            expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.state.liquidity.mintDecimals.toNumber());
+        }
         return {
             swapInputs: {
-                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(borrowAmount, debtReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
+                inputAmountLamports: swapInputAmountQuotePrice,
                 inputMint: debtTokenMint,
                 outputMint: collTokenMint,
+                amountDebtAtaBalance: expectedDebtTokenAtaBalance,
+            },
+            initialInputs: {
+                calcs: calcsQuotePrice,
+                swapQuote,
+                currentSlot,
+                collIsKtoken,
+                strategy,
+                obligation: obligation,
+                klendAccounts: uniqueKlendAccounts,
+                isDeposit: isDeposit,
             },
         };
     }
     else {
-        const withdrawAmountWithSlippageAndFlashLoanFee = decimal_js_1.default.abs(adjustDepositPosition)
-            .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-            .mul(1 + slippagePct / 100);
+        const calcs = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPosition, adjustBorrowPosition, flashLoanFee, slippagePct);
+        const klendIxs = await buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, {
+            preActionIxs: [],
+            swapIxs: [],
+            lookupTables: [],
+        }, budgetAndPriorityFeeIxs);
+        const uniqueKlendAccounts = (0, utils_1.uniqueAccounts)(klendIxs);
+        const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+        const swapInputsForQuote = {
+            inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
+            inputMint: collTokenMint,
+            outputMint: debtTokenMint,
+            amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
+        };
+        const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
+        const { adjustDepositPosition: adjustDepositPositionQuotePrice, adjustBorrowPosition: adjustBorrowPositionQuotePrice, } = (0, calcs_1.calcAdjustAmounts)({
+            currentDepositPosition: deposited,
+            currentBorrowPosition: borrowed,
+            targetLeverage: targetLeverage,
+            priceCollToDebt: swapQuote.priceAInB,
+            flashLoanFee: new decimal_js_1.default(flashLoanFee),
+        });
+        const calcsQuotePrice = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, flashLoanFee, slippagePct);
+        const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
         return {
             swapInputs: {
-                inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil(),
+                inputAmountLamports: swapInputAmountQuotePrice,
                 inputMint: collTokenMint,
                 outputMint: debtTokenMint,
+                amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
+            },
+            initialInputs: {
+                calcs: calcsQuotePrice,
+                swapQuote,
+                currentSlot,
+                collIsKtoken,
+                strategy,
+                obligation,
+                klendAccounts: uniqueKlendAccounts,
+                isDeposit,
             },
         };
     }
-};
-exports.getAdjustLeverageSwapInputs = getAdjustLeverageSwapInputs;
-const getAdjustLeverageIxns = async (props) => {
-    const { connection, budgetAndPriorityFeeIxns, user, kaminoMarket, priceDebtToColl, priceCollToDebt, targetLeverage, slippagePct, depositedLamports, borrowedLamports, collTokenMint, debtTokenMint, swapper, referrer, isKtoken, priceAinB, kamino, obligationTypeTagOverride, obligation, currentSlot, getTotalKlendAccountsOnly, scopeFeed, } = props;
-    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const deposited = (0, classes_1.lamportsToNumberDecimal)(depositedLamports, collReserve.stats.decimals);
-    const borrowed = (0, classes_1.lamportsToNumberDecimal)(borrowedLamports, debtReserve.stats.decimals);
-    const userObligation = obligation
-        ? obligation
-        : (await kaminoMarket.getUserObligationsByTag(obligationTypeTagOverride, user)).filter((obligation) => obligation.getBorrowByMint(debtReserve.getLiquidityMint()) !== undefined &&
-            obligation.getDepositByMint(collReserve.getLiquidityMint()) !== undefined)[0];
-    const currentLeverage = userObligation.refreshedStats.leverage;
-    const isDepositViaLeverage = targetLeverage.gte(new decimal_js_1.default(currentLeverage));
-    let flashLoanFee;
-    if (isDepositViaLeverage) {
-        flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    }
-    else {
-        flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    }
-    const { adjustDepositPosition, adjustBorrowPosition } = (0, calcs_1.calcAdjustAmounts)({
-        currentDepositPosition: deposited,
-        currentBorrowPosition: borrowed,
-        targetLeverage: targetLeverage,
-        priceCollToDebt: priceCollToDebt,
-        flashLoanFee: new decimal_js_1.default(flashLoanFee),
+}
+async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, }) {
+    const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
+        owner,
+        kaminoMarket,
+        debtTokenMint,
+        collTokenMint,
+        obligation,
+        depositedLamports,
+        borrowedLamports,
+        referrer,
+        currentSlot,
+        targetLeverage,
+        priceCollToDebt,
+        priceDebtToColl,
+        slippagePct,
+        budgetAndPriorityFeeIxs,
+        kamino,
+        scopeFeed,
+        quoteBufferBps,
+        priceAinB,
+        isKtoken,
+        quoter,
     });
-    let ixns = [];
-    let lookupTablesAddresses = [];
-    let swapInputs;
-    let totalKlendAccounts = 0;
-    const isDeposit = adjustDepositPosition.gte(0) && adjustBorrowPosition.gte(0);
-    if (isDepositViaLeverage !== isDeposit) {
-        throw new Error('Invalid target leverage');
-    }
     // leverage increased so we need to deposit and borrow more
-    if (isDeposit) {
-        console.log('Increasing leaverage');
+    if (initialInputs.isDeposit) {
+        let depositSwapper;
+        if (initialInputs.collIsKtoken) {
+            if (kamino === undefined) {
+                throw Error('Ktoken use as collateral for leverage without Kamino instance');
+            }
+            depositSwapper = await (0, utils_2.getTokenToKtokenSwapper)(kaminoMarket, kamino, owner, slippagePct, swapper, priceAinB, false);
+        }
+        else {
+            depositSwapper = swapper;
+        }
+        const { swapIxs, lookupTables } = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
         // TODO: marius why are we not using both adjustDepositPosition & adjustBorrowPosition
-        const res = await (0, exports.getIncreaseLeverageIxns)({
-            connection,
-            budgetAndPriorityFeeIxns,
-            user,
-            kaminoMarket,
-            depositAmount: adjustDepositPosition,
-            collTokenMint,
-            debtTokenMint,
-            slippagePct,
-            priceDebtToColl,
-            priceCollToDebt,
-            swapper,
-            referrer,
-            isKtoken,
-            priceAinB,
-            kamino,
-            obligationTypeTagOverride,
-            obligation: userObligation,
-            currentSlot,
-            getTotalKlendAccountsOnly,
-            scopeFeed,
-        });
-        ixns = res.ixns;
-        lookupTablesAddresses = res.lookupTablesAddresses;
-        swapInputs = res.swapInputs;
-        totalKlendAccounts = res.totalKlendAccounts;
+        const ixs = await buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeFeed, initialInputs.collIsKtoken, {
+            preActionIxs: [],
+            swapIxs,
+            lookupTables,
+        }, budgetAndPriorityFeeIxs);
+        return {
+            ixs,
+            lookupTables,
+            swapInputs,
+            initialInputs,
+        };
     }
     else {
         console.log('Decreasing leverage');
-        const res = await (0, exports.getDecreaseLeverageIxns)({
-            connection,
-            budgetAndPriorityFeeIxns,
-            user,
-            kaminoMarket,
-            withdrawAmount: decimal_js_1.default.abs(adjustDepositPosition),
-            repayAmount: decimal_js_1.default.abs(adjustBorrowPosition),
-            collTokenMint,
-            debtTokenMint,
-            slippagePct,
-            swapper,
-            referrer,
-            isKtoken,
-            kamino,
-            obligationTypeTagOverride,
-            obligation: userObligation,
-            currentSlot,
-            getTotalKlendAccountsOnly,
-            scopeFeed,
-        });
-        ixns = res.ixns;
-        lookupTablesAddresses = res.lookupTablesAddresses;
-        swapInputs = res.swapInputs;
-        totalKlendAccounts = res.totalKlendAccounts;
+        let withdrawSwapper;
+        if (initialInputs.collIsKtoken) {
+            if (kamino === undefined) {
+                throw Error('Ktoken use as collateral for leverage without Kamino instance');
+            }
+            withdrawSwapper = await (0, utils_2.getKtokenToTokenSwapper)(kaminoMarket, kamino, owner, swapper);
+        }
+        else {
+            withdrawSwapper = swapper;
+        }
+        // 5. Get swap ixns
+        const { swapIxs, lookupTables } = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
+        const ixs = await buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeFeed, initialInputs.collIsKtoken, {
+            preActionIxs: [],
+            swapIxs,
+            lookupTables,
+        }, budgetAndPriorityFeeIxs);
+        return {
+            ixs,
+            lookupTables,
+            swapInputs,
+            initialInputs,
+        };
     }
-    return {
-        ixns,
-        lookupTablesAddresses,
-        swapInputs,
-        totalKlendAccounts,
-    };
-};
-exports.getAdjustLeverageIxns = getAdjustLeverageIxns;
+}
 /**
  * Deposit and borrow tokens if leverage increased
  */
-const getIncreaseLeverageIxns = async (props) => {
-    const { connection, budgetAndPriorityFeeIxns, user, kaminoMarket, depositAmount, collTokenMint, debtTokenMint, slippagePct, priceDebtToColl, priceCollToDebt, swapper, referrer, isKtoken, priceAinB, kamino, obligationTypeTagOverride = 1, obligation, currentSlot, getTotalKlendAccountsOnly, scopeFeed, } = props;
+async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const collIsKtoken = await isKtoken(collTokenMint);
-    const flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
-    if (!priceDebtToColl || !priceCollToDebt) {
-        throw new Error('Price is not loaded. Please, reload the page and try again');
-    }
-    // TODO: why are we recalculating here again
-    const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
+    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner);
+    const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner);
     // 1. Create atas & budget txns
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
     let mintsToCreateAtas;
@@ -848,105 +758,30 @@ const getIncreaseLeverageIxns = async (props) => {
             },
         ];
     }
-    const { atas: [collTokenAta, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
+    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
     // 2. Create borrow flash loan instruction
-    // used if coll is Ktoken and we borrow debt token instead
-    const amountToFashBorrowDebt = depositAmount
-        .div(priceDebtToColl)
-        .mul(new decimal_js_1.default(1 + slippagePct / 100))
-        .toDecimalPlaces(debtReserve.stats.decimals, decimal_js_1.default.ROUND_UP);
-    // .toDecimalPlaces(debtReserve?.state.liquidity.mintDecimals.toNumber());
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtaIxs.length, // TODO: how about user metadata ixns
-        walletPublicKey: user,
+        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length, // TODO: how about user metadata ixns
+        walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
         reserve: !collIsKtoken ? collReserve : debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? depositAmount : amountToFashBorrowDebt, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.adjustDepositPosition : calcs.amountToFlashBorrowDebt, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
         destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
         referrerAccount: kaminoMarket.programId,
         referrerTokenState: kaminoMarket.programId,
         programId: kaminoMarket.programId,
     });
-    // 3. Deposit initial tokens +  borrowed tokens into reserve
-    let obligationType;
-    if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Multiply) {
-        // multiply
-        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Leverage) {
-        // leverage
-        obligationType = new utils_1.LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else {
-        throw Error('Obligation type tag not supported for leverage, please use 1 - multiply or 3 - leverage');
-    }
-    const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(depositAmount, collReserve.stats.decimals).floor().toString(), collTokenMint, user, obligation ? obligation : obligationType, 0, false, false, false, // 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)
+    const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(), collTokenMint, owner, obligation, 0, false, false, false, // 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, { includeScopeRefresh: true, scopeFeed: scopeFeed });
-    // 4. Get swap estimations to understand how much we need to borrow from borrow reserve
-    const borrowAmount = depositAmount
-        .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-        .mul(new decimal_js_1.default(1 + slippagePct / 100))
-        .div(priceDebtToColl);
-    const _collTokenExpectedSwapOut = depositAmount.mul(new decimal_js_1.default(1).plus(flashLoanFee));
-    // 5. 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)(borrowAmount, debtReserve.stats.decimals).ceil().toString(), debtTokenMint, user, obligation ? obligation : obligationType, 0, false, false, false, // 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)
+    // 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, 0, false, false, false, // 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, { includeScopeRefresh: true, scopeFeed: scopeFeed });
-    const klendIxns = [
-        ...budgetIxns,
-        ...createAtaIxs,
-        ...[flashBorrowIxn],
-        ...depositAction.setupIxs,
-        ...depositAction.lendingIxs,
-        ...depositAction.cleanupIxs,
-        ...borrowAction.setupIxs,
-        ...borrowAction.lendingIxs,
-        ...borrowAction.cleanupIxs,
-        ...[flashRepayIxn],
-    ];
-    const uniqueAccounts = new utils_1.PublicKeySet([]);
-    klendIxns.forEach((ixn) => {
-        ixn.keys.forEach((key) => {
-            uniqueAccounts.add(key.pubkey);
-        });
-    });
-    const totalKlendAccounts = uniqueAccounts.toArray().length;
-    // return early to avoid extra swapper calls
-    if (getTotalKlendAccountsOnly) {
-        return {
-            ixns: [],
-            lookupTablesAddresses: [],
-            swapInputs: {
-                inputAmountLamports: new decimal_js_1.default('0'),
-                inputMint: web3_js_1.PublicKey.default,
-                outputMint: web3_js_1.PublicKey.default,
-            },
-            totalKlendAccounts: totalKlendAccounts,
-        };
-    }
-    let depositSwapper;
-    let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
-    if (collIsKtoken) {
-        if (kamino === undefined) {
-            throw Error('Ktoken use as collateral for leverage without Kamino instance');
-        }
-        depositSwapper = await (0, utils_2.getTokenToKtokenSwapper)(connection, kaminoMarket, kamino, user, swapper, priceAinB, false);
-        expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(connection, debtTokenMint, user, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.state.liquidity.mintDecimals.toNumber());
-    }
-    else {
-        depositSwapper = swapper;
-    }
-    const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? borrowAmount : amountToFashBorrowDebt, debtReserve.stats.decimals).ceil(),
-        inputMint: debtTokenMint,
-        outputMint: collTokenMint,
-    };
-    const [swapIxns, lookupTablesAddresses] = await depositSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct, expectedDebtTokenAtaBalance);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
-    const ixns = !collIsKtoken
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
+    const ixs = !collIsKtoken
         ? [
             ...budgetIxns,
-            ...createAtaIxs,
+            ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
             ...depositAction.setupIxs,
             ...depositAction.lendingIxs,
@@ -959,7 +794,7 @@ const getIncreaseLeverageIxns = async (props) => {
         ]
         : [
             ...budgetIxns,
-            ...createAtaIxs,
+            ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
             ...swapInstructions,
             ...depositAction.setupIxs,
@@ -970,37 +805,15 @@ const getIncreaseLeverageIxns = async (props) => {
             ...borrowAction.cleanupIxs,
             ...[flashRepayIxn],
         ];
-    ixns.forEach((ixn, i) => {
-        console.log(`ixn ${i + 1}: ${ixn.programId.toString()}`);
-    });
-    // Create and send transaction
-    if (collIsKtoken) {
-        if (strategy?.strategy.strategyLookupTable) {
-            lookupTablesAddresses.push(strategy?.strategy.strategyLookupTable);
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
-    return {
-        ixns,
-        lookupTablesAddresses,
-        swapInputs,
-        totalKlendAccounts,
-    };
-};
-exports.getIncreaseLeverageIxns = getIncreaseLeverageIxns;
+    return ixs;
+}
 /**
  * Withdraw and repay tokens if leverage decreased
  */
-const getDecreaseLeverageIxns = async (props) => {
-    const { connection, budgetAndPriorityFeeIxns, user, kaminoMarket, withdrawAmount, repayAmount, collTokenMint, debtTokenMint, slippagePct, swapper, referrer, isKtoken, kamino, obligationTypeTagOverride = 1, obligation, currentSlot, getTotalKlendAccountsOnly, scopeFeed, } = props;
-    console.log('getDecreaseLeverageIxns', (0, calcs_1.toJson)({ withdrawAmount, repayAmount, collTokenMint, debtTokenMint, slippagePct }));
+async function buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const collIsKtoken = await isKtoken(collTokenMint);
-    const flashLoanFee = debtReserve?.getFlashLoanFee() || new decimal_js_1.default(0);
-    const strategy = collIsKtoken ? await kamino?.getStrategyByKTokenMint(collTokenMint) : undefined;
+    const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner);
     // 1. Create atas & budget txns
     const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
     let mintsToCreateAtas;
@@ -1050,105 +863,42 @@ const getDecreaseLeverageIxns = async (props) => {
             },
         ];
     }
-    const { atas: [, debtTokenAta], createAtaIxs, } = await (0, utils_1.getAtasWithCreateIxnsIfMissing)(connection, user, mintsToCreateAtas);
+    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
     // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
     // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
     const closeWsolAtaIxns = [];
-    if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
-        const wsolAta = await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, user, false);
-        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, user, user, [], spl_token_1.TOKEN_PROGRAM_ID));
-    }
     const fillWsolAtaIxns = [];
     if (debtTokenMint.equals(utils_1.WRAPPED_SOL_MINT)) {
-        const halfSolBalance = (await connection.getBalance(user)) / web3_js_1.LAMPORTS_PER_SOL / 2;
+        const wsolAta = (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner, false);
+        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
+        const halfSolBalance = (await kaminoMarket.getConnection().getBalance(owner)) / web3_js_1.LAMPORTS_PER_SOL / 2;
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
-        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(user, debtTokenAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil()));
+        fillWsolAtaIxns.push(...(0, utils_1.getDepositWsolIxns)(owner, wsolAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil()));
     }
     // 3. Flash borrow & repay amount to repay (debt)
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + createAtaIxs.length + fillWsolAtaIxns.length,
-        walletPublicKey: user,
+        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
+        walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
         reserve: debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(repayAmount, debtReserve.stats.decimals),
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(decimal_js_1.default.abs(calcs.adjustBorrowPosition), debtReserve.stats.decimals),
         destinationAta: debtTokenAta,
         referrerAccount: kaminoMarket.programId,
         referrerTokenState: kaminoMarket.programId,
         programId: kaminoMarket.programId,
     });
     // 4. Actually do the repay of the flash borrowed amounts
-    let obligationType;
-    if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Multiply) {
-        // multiply
-        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Leverage) {
-        // leverage
-        obligationType = new utils_1.LeverageObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
-    }
-    else {
-        throw Error('Obligation type tag not supported for leverage, please use 1 - multiply or 3 - leverage');
-    }
     const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
-    const repayAction = await classes_1.KaminoAction.buildRepayTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(repayAmount, debtReserve.stats.decimals).floor().toString(), debtTokenMint, user, obligation ? obligation : obligationType, currentSlot, undefined, 0, false, false, false, // 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)
+    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, currentSlot, undefined, 0, false, false, false, // 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, scopeRefresh);
     // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
-    const withdrawAmountWithSlippageAndFlashLoanFee = withdrawAmount
-        .mul(new decimal_js_1.default(1).plus(flashLoanFee))
-        .mul(1 + slippagePct / 100);
-    const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, user, obligation ? obligation : obligationType, 0, false, false, false, // 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)
+    const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, obligation, 0, false, false, false, // 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, { includeScopeRefresh: true, scopeFeed: scopeFeed });
-    const klendIxns = [
-        ...budgetIxns,
-        ...createAtaIxs,
-        ...fillWsolAtaIxns,
-        ...[flashBorrowIxn],
-        ...repayAction.setupIxs,
-        ...repayAction.lendingIxs,
-        ...repayAction.cleanupIxs,
-        ...withdrawAction.setupIxs,
-        ...withdrawAction.lendingIxs,
-        ...withdrawAction.cleanupIxs,
-        ...[flashRepayIxn],
-        ...closeWsolAtaIxns,
-    ];
-    const uniqueAccs = (0, utils_1.uniqueAccounts)(klendIxns);
-    const totalKlendAccounts = uniqueAccs.length;
-    // return early to avoid extra swapper calls
-    if (getTotalKlendAccountsOnly) {
-        return {
-            ixns: [],
-            lookupTablesAddresses: [],
-            swapInputs: {
-                inputAmountLamports: new decimal_js_1.default('0'),
-                inputMint: web3_js_1.PublicKey.default,
-                outputMint: web3_js_1.PublicKey.default,
-            },
-            totalKlendAccounts: totalKlendAccounts,
-        };
-    }
-    let withdrawSwapper;
-    if (collIsKtoken) {
-        if (kamino === undefined) {
-            throw Error('Ktoken use as collateral for leverage without Kamino instance');
-        }
-        withdrawSwapper = await (0, utils_2.getKtokenToTokenSwapper)(kaminoMarket, kamino, user, swapper);
-    }
-    else {
-        withdrawSwapper = swapper;
-    }
-    const swapInputs = {
-        inputAmountLamports: (0, classes_2.numberToLamportsDecimal)(withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil(),
-        inputMint: collTokenMint,
-        outputMint: debtTokenMint,
-    };
-    // 5. Get swap ixns
-    const [swapIxns, lookupTablesAddresses] = await withdrawSwapper(swapInputs.inputAmountLamports.toNumber(), swapInputs.inputMint, swapInputs.outputMint, slippagePct);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxns, []);
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
     const ixns = [
         ...budgetIxns,
-        ...createAtaIxs,
+        ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
         ...repayAction.setupIxs,
@@ -1161,24 +911,6 @@ const getDecreaseLeverageIxns = async (props) => {
         ...[flashRepayIxn],
         ...closeWsolAtaIxns,
     ];
-    ixns.forEach((ixn, i) => {
-        console.log(`ixn ${i + 1}: ${ixn.programId.toString()}`);
-    });
-    if (collIsKtoken) {
-        if (strategy?.strategy.strategyLookupTable) {
-            lookupTablesAddresses.push(strategy?.strategy.strategyLookupTable);
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
-    // Create and send transaction
-    return {
-        ixns,
-        lookupTablesAddresses,
-        swapInputs,
-        totalKlendAccounts,
-    };
-};
-exports.getDecreaseLeverageIxns = getDecreaseLeverageIxns;
+    return ixns;
+}
 //# sourceMappingURL=operations.js.map