@kamino-finance/klend-sdk 7.1.1 → 7.1.3

package/dist/leverage/operations.js

@@ -18,23 +18,27 @@ const instructions_1 = require("./instructions");
 const classes_2 = require("../classes");
 const utils_1 = require("../utils");
 const calcs_1 = require("./calcs");
-const utils_2 = require("./utils");
 const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
 const token_1 = require("@solana-program/token");
 const token_2022_1 = require("@solana-program/token-2022");
 const consts_1 = require("../utils/consts");
-const address_lookup_table_1 = require("@solana-program/address-lookup-table");
 exports.WITHDRAW_SLOT_OFFSET = 150; // Offset for the withdraw slot to underestimate the exchange rate
-async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, useV2Ixs, elevationGroupOverride, }) {
+async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, quoter, useV2Ixs, elevationGroupOverride, }) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
     const flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
     const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
     const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint === 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);
+    const calcs = (0, calcs_1.depositLeverageCalcs)({
+        depositAmount: depositAmount,
+        depositTokenIsCollToken: selectedTokenIsCollToken,
+        depositTokenIsSol,
+        priceDebtToColl,
+        targetLeverage,
+        slippagePct,
+        flashLoanFee,
+    });
     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
@@ -48,82 +52,43 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
                 quoteResponse: undefined,
             },
         },
-    ], strategy, collIsKtoken, useV2Ixs, elevationGroupOverride))[0];
+    ], 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 swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.swapDebtTokenIn, 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 === 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.getRpc(), debtTokenMint, owner.address, (0, classes_2.numberToLamportsDecimal)(futureBalanceInAta.toDecimalPlaces(debtReserve.stats.decimals), debtReserve.stats.decimals), debtReserve.state.liquidity.mintDecimals.toNumber());
-    }
+    const quotePriceCalcs = (0, calcs_1.depositLeverageCalcs)({
+        depositAmount: depositAmount,
+        depositTokenIsCollToken: selectedTokenIsCollToken,
+        depositTokenIsSol,
+        priceDebtToColl: swapQuote.priceAInB,
+        targetLeverage,
+        slippagePct,
+        flashLoanFee,
+    });
+    const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(quotePriceCalcs.swapDebtTokenIn, debtReserve.stats.decimals).ceil();
     return {
         swapInputs: {
             inputAmountLamports: swapInputAmountQuotePrice,
-            minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? quotePriceCalcs.flashBorrowInCollToken : quotePriceCalcs.flashBorrowInDebtTokenKtokenOnly, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
+            minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(quotePriceCalcs.flashBorrowInCollToken, collReserve.stats.decimals),
             inputMint: debtTokenMint,
             outputMint: collTokenMint,
-            amountDebtAtaBalance: expectedDebtTokenAtaBalance,
         },
         flashLoanInfo: klendIxs.flashLoanInfo,
         initialInputs: {
             calcs: quotePriceCalcs,
             swapQuote,
             currentSlot,
-            collIsKtoken,
-            strategy,
             obligation: obligation ? obligation : obligationType,
             klendAccounts: uniqueKlendAccounts,
         },
     };
 }
-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: depositAmount,
-            depositTokenIsCollToken: selectedTokenIsCollToken,
-            depositTokenIsSol,
-            priceDebtToColl,
-            targetLeverage,
-            slippagePct,
-            flashLoanFee,
-            priceAinB,
-        });
-        // Rounding to exact number of decimals so this value is passed through in all calcs without rounding inconsistencies
-        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 getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, elevationGroupOverride, useV2Ixs, }) {
+async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, quoter, swapper, elevationGroupOverride, useV2Ixs, }) {
     const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -137,38 +102,16 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
         currentSlot,
         targetLeverage,
         selectedTokenMint,
-        kamino,
         obligationTypeTagOverride,
         scopeRefreshConfig,
         budgetAndPriorityFeeIxs,
         quoteBufferBps,
-        priceAinB,
-        isKtoken,
         quoter,
         useV2Ixs,
     });
-    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 depositSwapper = swapper;
     const swapsArray = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-    if (initialInputs.collIsKtoken) {
-        if (initialInputs.strategy && initialInputs.strategy.strategy.strategyLookupTable !== utils_1.DEFAULT_PUBLIC_KEY) {
-            const strategyLut = await (0, address_lookup_table_1.fetchAddressLookupTable)(kaminoMarket.getRpc(), initialInputs.strategy.strategy.strategyLookupTable);
-            swapsArray.forEach((swap) => {
-                swap.lookupTables.push(strategyLut);
-            });
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
+    // Strategy lookup table logic removed
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(utils_1.WRAPPED_SOL_MINT);
@@ -180,7 +123,7 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
             lookupTables: swap.lookupTables,
             quote: swap.quote,
         };
-    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs, elevationGroupOverride);
+    }), useV2Ixs, elevationGroupOverride);
     return depositWithLeverageIxs.map((depositWithLeverageIxs, index) => {
         return {
             ixs: depositWithLeverageIxs.instructions,
@@ -192,23 +135,18 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
         };
     });
 }
-async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
+async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, useV2Ixs, elevationGroupOverride) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
-    const [[collTokenAta], [debtTokenAta]] = await Promise.all([
+    const [[collTokenAta]] = await Promise.all([
         (0, token_2022_1.findAssociatedTokenPda)({
             owner: owner.address,
             mint: collTokenMint,
             tokenProgram: collReserve.getLiquidityTokenProgram(),
         }),
-        (0, token_2022_1.findAssociatedTokenPda)({
-            owner: owner.address,
-            mint: debtTokenMint,
-            tokenProgram: debtReserve.getLiquidityTokenProgram(),
-        }),
     ]);
     // 1. Create atas & budget ixs
-    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, debtTokenMint, debtReserve, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const fillWsolAtaIxs = [];
     if (depositTokenIsSol) {
         fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address), (0, kit_1.lamports)(BigInt((0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil().toString()))));
@@ -220,27 +158,23 @@ async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, own
         userTransferAuthority: owner,
         lendingMarketAuthority: await market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
-        reserve: !collIsKtoken ? collReserve : debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.flashBorrowInCollToken : calcs.flashBorrowInDebtTokenKtokenOnly, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
-        destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
+        reserve: collReserve,
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.flashBorrowInCollToken, collReserve.stats.decimals),
+        destinationAta: collTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
         referrerAccount: (0, kit_1.none)(),
         referrerTokenState: (0, kit_1.none)(),
         programId: market.programId,
     });
     // 3. Deposit initial tokens + borrowed tokens into reserve
-    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 : calcs.debtTokenToBorrow, debtReserve.stats.decimals)
-        .ceil()
-        .toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, elevationGroupOverride === 0 ? false : true, // emode
+    const kaminoDepositAndBorrowAction = await classes_1.KaminoAction.buildDepositAndBorrowTxns(market, (0, classes_2.numberToLamportsDecimal)(calcs.collTokenToDeposit, collReserve.stats.decimals).floor().toString(), collTokenMint, (0, classes_2.numberToLamportsDecimal)(calcs.debtTokenToBorrow, debtReserve.stats.decimals).ceil().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);
     return swapQuoteIxsArray.map((swapQuoteIxs) => {
         // 4. Swap
         const { swapIxs } = swapQuoteIxs;
         const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
-        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+        const flashBorrowReserve = collReserve;
         const flashLoanInfo = {
             flashBorrowReserve: flashBorrowReserve.address,
             flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
@@ -253,21 +187,18 @@ async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, own
                 ...createAtasIxs,
                 ...fillWsolAtaIxs,
                 ...[flashBorrowIx],
-                ...(collIsKtoken ? swapInstructions : []),
                 ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
-                ...(collIsKtoken ? [] : swapInstructions),
+                ...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, }) {
+async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, deposited, borrowed, obligation, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, scopeRefreshConfig, quoteBufferBps, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
     const selectedTokenIsCollToken = selectedTokenMint === collTokenMint;
-    const collIsKtoken = await isKtoken(collTokenMint);
-    const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
     const inputTokenIsSol = selectedTokenMint === utils_1.WRAPPED_SOL_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, [
@@ -280,17 +211,16 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
                 quoteResponse: undefined,
             },
         },
-    ], strategy, collIsKtoken, useV2Ixs))[0];
+    ], useV2Ixs))[0];
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
     const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.collTokenSwapIn, collReserve.getMintDecimals()).ceil();
     const swapInputsForQuote = {
         inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
         inputMint: collTokenMint,
         outputMint: debtTokenMint,
-        amountDebtAtaBalance: undefined, // 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 calcsQuotePrice = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, swapQuote.priceAInB, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
     const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.collTokenSwapIn, collReserve.getMintDecimals()).ceil();
     return {
         swapInputs: {
@@ -298,21 +228,18 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
             minOutAmountLamports: calcsQuotePrice.repayAmount,
             inputMint: collTokenMint,
             outputMint: debtTokenMint,
-            amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
         },
         flashLoanInfo: klendIxs.flashLoanInfo,
         initialInputs: {
             calcs: calcsQuotePrice,
             swapQuote,
             currentSlot,
-            collIsKtoken,
-            strategy,
             obligation,
             klendAccounts: uniqueKlendAccounts,
         },
     };
 }
-async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, swapper, useV2Ixs, }) {
+async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, scopeRefreshConfig, quoteBufferBps, quoter, swapper, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const inputTokenIsSol = selectedTokenMint === utils_1.WRAPPED_SOL_MINT;
@@ -332,35 +259,14 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
         isClosingPosition,
         selectedTokenMint,
         budgetAndPriorityFeeIxs,
-        kamino,
         scopeRefreshConfig,
         quoteBufferBps,
-        isKtoken,
         quoter,
         useV2Ixs,
     });
-    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;
-    }
+    const withdrawSwapper = swapper;
     const swapsArray = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-    if (initialInputs.collIsKtoken) {
-        if (initialInputs.strategy?.strategy.strategyLookupTable) {
-            const strategyLut = await (0, address_lookup_table_1.fetchAddressLookupTable)(kaminoMarket.getRpc(), initialInputs.strategy.strategy.strategyLookupTable);
-            swapsArray.forEach((swap) => {
-                swap.lookupTables.push(strategyLut);
-            });
-        }
-        else {
-            console.log('Strategy lookup table not found');
-        }
-    }
+    // Strategy lookup table logic removed
     const withdrawWithLeverageIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, swapsArray.map((swap) => {
         return {
             preActionIxs: [],
@@ -368,7 +274,7 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
             lookupTables: swap.lookupTables,
             quote: swap.quote,
         };
-    }), initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
+    }), useV2Ixs);
     // Send ixs and lookup tables
     return withdrawWithLeverageIxs.map((ixs, index) => {
         return {
@@ -381,12 +287,12 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
         };
     });
 }
-async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, strategy, collIsKtoken, useV2Ixs) {
+async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxsArray, useV2Ixs) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const debtTokenAta = await (0, utils_1.getAssociatedTokenAddress)(debtTokenMint, owner.address, debtReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns & user metadata
-    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, debtTokenMint, debtReserve, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const closeWsolAtaIxs = [];
     if (depositTokenIsSol || debtTokenMint === utils_1.WRAPPED_SOL_MINT) {
         const wsolAta = await (0, utils_1.getAssociatedTokenAddress)(utils_1.WRAPPED_SOL_MINT, owner.address);
@@ -446,13 +352,11 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
         };
     });
 }
-async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, withdrawSlotOffset, }) {
+async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, scopeRefreshConfig, quoteBufferBps, quoter, useV2Ixs, withdrawSlotOffset, }) {
     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 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));
@@ -475,9 +379,9 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         throw new Error('Invalid target leverage');
     }
     if (isDeposit) {
-        const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner.address, debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct, collIsKtoken);
+        const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct);
         // 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, [
+        const klendIxs = (await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, scopeRefreshConfig, [
             {
                 preActionIxs: [],
                 swapIxs: [],
@@ -489,12 +393,11 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             },
         ], 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 swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.borrowAmount, 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 { adjustDepositPosition: adjustDepositPositionQuotePrice, adjustBorrowPosition: adjustBorrowPositionQuotePrice, } = (0, calcs_1.calcAdjustAmounts)({
@@ -504,27 +407,20 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             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.address, debtReserve, adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, swapQuote.priceAInB, flashLoanFee, slippagePct, collIsKtoken);
-        const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.getMintDecimals()).ceil();
-        let expectedDebtTokenAtaBalance = new decimal_js_1.default(0);
-        if (collIsKtoken) {
-            expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getRpc(), debtTokenMint, owner.address, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.getMintDecimals());
-        }
+        const calcsQuotePrice = await (0, calcs_1.adjustDepositLeverageCalcs)(debtReserve, adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, swapQuote.priceAInB, flashLoanFee, slippagePct);
+        const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.borrowAmount, debtReserve.getMintDecimals()).ceil();
         return {
             swapInputs: {
                 inputAmountLamports: swapInputAmountQuotePrice,
-                minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.adjustDepositPosition : calcsQuotePrice.amountToFlashBorrowDebt, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
+                minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.adjustDepositPosition, collReserve.stats.decimals),
                 inputMint: debtTokenMint,
                 outputMint: collTokenMint,
-                amountDebtAtaBalance: expectedDebtTokenAtaBalance,
             },
             flashLoanInfo: klendIxs.flashLoanInfo,
             initialInputs: {
                 calcs: calcsQuotePrice,
                 swapQuote,
                 currentSlot,
-                collIsKtoken,
-                strategy,
                 obligation: obligation,
                 klendAccounts: uniqueKlendAccounts,
                 isDeposit: isDeposit,
@@ -533,7 +429,7 @@ 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, [
+        const klendIxs = (await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, scopeRefreshConfig, [
             {
                 preActionIxs: [],
                 swapIxs: [],
@@ -550,7 +446,6 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             inputAmountLamports: swapInputAmount.mul(new decimal_js_1.default(1).add(quoteBufferBps.div(CreationParameters_1.FullBPS))),
             inputMint: collTokenMint,
             outputMint: debtTokenMint,
-            amountDebtAtaBalance: undefined, // Only needed for ktokens deposits
         };
         const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
         const { adjustDepositPosition: adjustDepositPositionQuotePrice, adjustBorrowPosition: adjustBorrowPositionQuotePrice, } = (0, calcs_1.calcAdjustAmounts)({
@@ -568,15 +463,12 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
                 minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.adjustBorrowPosition.abs(), debtReserve.stats.decimals),
                 inputMint: collTokenMint,
                 outputMint: debtTokenMint,
-                amountDebtAtaBalance: undefined, // Only needed for ktokens deposits
             },
             flashLoanInfo: klendIxs.flashLoanInfo,
             initialInputs: {
                 calcs: calcsQuotePrice,
                 swapQuote,
                 currentSlot,
-                collIsKtoken,
-                strategy,
                 obligation,
                 klendAccounts: uniqueKlendAccounts,
                 isDeposit,
@@ -584,7 +476,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         };
     }
 }
-async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, withdrawSlotOffset, }) {
+async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, scopeRefreshConfig, quoteBufferBps, quoter, swapper, useV2Ixs, withdrawSlotOffset, }) {
     const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -600,28 +492,16 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
         priceDebtToColl,
         slippagePct,
         budgetAndPriorityFeeIxs,
-        kamino,
         scopeRefreshConfig,
         quoteBufferBps,
-        priceAinB,
-        isKtoken,
         quoter,
         useV2Ixs,
     });
     // leverage increased so we need to deposit and borrow more
     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 depositSwapper = swapper;
         const swapsArray = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const increaseLeverageIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
+        const increaseLeverageIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, scopeRefreshConfig, swapsArray.map((swap) => {
             return {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
@@ -642,19 +522,10 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
     }
     else {
         console.log('Decreasing leverage');
-        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;
-        }
+        const withdrawSwapper = swapper;
         // 5. Get swap ixs
         const swapsArray = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const decreaseLeverageIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, swapsArray.map((swap) => {
+        const decreaseLeverageIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, scopeRefreshConfig, swapsArray.map((swap) => {
             return {
                 preActionIxs: [],
                 swapIxs: swap.swapIxs,
@@ -677,24 +548,21 @@ async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTo
 /**
  * Deposit and borrow tokens if leverage increased
  */
-async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs) {
+async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, scopeRefreshConfig, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
-    const [debtTokenAta, collTokenAta] = await Promise.all([
-        (0, utils_1.getAssociatedTokenAddress)(debtTokenMint, owner.address, debtReserve.getLiquidityTokenProgram()),
-        (0, utils_1.getAssociatedTokenAddress)(collTokenMint, owner.address, collReserve.getLiquidityTokenProgram()),
-    ]);
+    const collTokenAta = await (0, utils_1.getAssociatedTokenAddress)(collTokenMint, owner.address, collReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns
-    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, debtTokenMint, debtReserve, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     // 2. Create borrow flash loan instruction
     const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
         borrowIxIndex: budgetIxs.length + createAtasIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
         userTransferAuthority: owner,
         lendingMarketAuthority: await kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
-        reserve: !collIsKtoken ? collReserve : debtReserve,
-        amountLamports: (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcs.adjustDepositPosition : calcs.amountToFlashBorrowDebt, !collIsKtoken ? collReserve.stats.decimals : debtReserve.stats.decimals),
-        destinationAta: !collIsKtoken ? collTokenAta : debtTokenAta,
+        reserve: collReserve,
+        amountLamports: (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals),
+        destinationAta: collTokenAta,
         // TODO(referrals): once we support referrals, we will have to replace the placeholder args below:
         referrerAccount: (0, kit_1.none)(),
         referrerTokenState: (0, kit_1.none)(),
@@ -711,13 +579,12 @@ async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
             ...budgetIxs,
             ...createAtasIxs,
             ...[flashBorrowIx],
-            ...(collIsKtoken ? swapInstructions : []),
             ...classes_1.KaminoAction.actionToIxs(depositAction),
             ...classes_1.KaminoAction.actionToIxs(borrowAction),
-            ...(collIsKtoken ? [] : swapInstructions),
+            ...swapInstructions,
             ...[flashRepayIx],
         ];
-        const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
+        const flashBorrowReserve = collReserve;
         const res = {
             flashLoanInfo: {
                 flashBorrowReserve: flashBorrowReserve.address,
@@ -731,7 +598,7 @@ async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
 /**
  * Withdraw and repay tokens if leverage decreased
  */
-async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs, withdrawSlotOffset = exports.WITHDRAW_SLOT_OFFSET) {
+async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, scopeRefreshConfig, swapQuoteIxsArray, budgetAndPriorityFeeIxs, useV2Ixs, withdrawSlotOffset = exports.WITHDRAW_SLOT_OFFSET) {
     const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const [debtTokenAta] = await (0, token_2022_1.findAssociatedTokenPda)({
@@ -740,7 +607,7 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
         tokenProgram: debtReserve.getLiquidityTokenProgram(),
     });
     // 1. Create atas & budget txns
-    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, debtTokenMint, debtReserve, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     // 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 closeWsolAtaIxs = [];
@@ -803,9 +670,9 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
         return res;
     });
 }
-const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs) => {
+const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collReserve, debtTokenMint, debtReserve, scopeRefreshConfig, budgetAndPriorityFeeIxs) => {
     const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
-    const mintsWithTokenPrograms = getTokenMintsWithTokenPrograms(collTokenMint, collReserve, debtTokenMint, debtReserve, collIsKtoken, strategy);
+    const mintsWithTokenPrograms = getTokenMintsWithTokenPrograms(collTokenMint, collReserve, debtTokenMint, debtReserve);
     const createAtasIxs = (await (0, utils_1.createAtasIdempotent)(owner, mintsWithTokenPrograms)).map((x) => x.createAtaIx);
     const scopeRefreshIx = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
     return {
@@ -857,8 +724,8 @@ const checkObligationType = (obligationTypeTag, collTokenMint, debtTokenMint, ka
     }
     return obligationType;
 };
-const getTokenMintsWithTokenPrograms = (collTokenMint, collReserve, debtTokenMint, debtReserve, collIsKtoken, strategy) => {
-    const mintsWithTokenPrograms = [
+const getTokenMintsWithTokenPrograms = (collTokenMint, collReserve, debtTokenMint, debtReserve) => {
+    return [
         {
             mint: collTokenMint,
             tokenProgram: collReserve.getLiquidityTokenProgram(),
@@ -872,28 +739,5 @@ const getTokenMintsWithTokenPrograms = (collTokenMint, collReserve, debtTokenMin
             tokenProgram: token_1.TOKEN_PROGRAM_ADDRESS,
         },
     ];
-    if (collIsKtoken) {
-        let kTokenAta;
-        let kTokenTokenProgram;
-        if (strategy.strategy.tokenAMint === debtTokenMint) {
-            kTokenAta = strategy.strategy.tokenBMint;
-            kTokenTokenProgram =
-                strategy.strategy.tokenBTokenProgram === utils_1.DEFAULT_PUBLIC_KEY
-                    ? token_1.TOKEN_PROGRAM_ADDRESS
-                    : strategy.strategy.tokenBTokenProgram;
-        }
-        else {
-            kTokenAta = strategy.strategy.tokenAMint;
-            kTokenTokenProgram =
-                strategy.strategy.tokenATokenProgram === utils_1.DEFAULT_PUBLIC_KEY
-                    ? token_1.TOKEN_PROGRAM_ADDRESS
-                    : strategy.strategy.tokenATokenProgram;
-        }
-        mintsWithTokenPrograms.push({
-            mint: kTokenAta,
-            tokenProgram: kTokenTokenProgram,
-        });
-    }
-    return mintsWithTokenPrograms;
 };
 //# sourceMappingURL=operations.js.map