@kamino-finance/klend-sdk 5.13.9 → 5.13.11

package/dist/leverage/operations.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getScopeRefreshIx = void 0;
+exports.getScopeRefreshIx = exports.getSetupIxs = void 0;
 exports.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
 exports.getDepositWithLeverageIxs = getDepositWithLeverageIxs;
 exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
@@ -32,18 +32,7 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
     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, classes_1.toJson)(calcs));
-    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 obligationType = checkObligationType(obligationTypeTagOverride, collTokenMint, debtTokenMint, kaminoMarket);
     // Build the repay & withdraw collateral tx to get the number of accounts
     const klendIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
@@ -186,69 +175,20 @@ async function getDepositWithLeverageIxs({ owner, kaminoMarket, debtTokenMint, c
     };
 }
 async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
-    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget ixs
-    let mintsToCreateAtas;
-    if (collIsKtoken) {
-        const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
-            ? strategy.strategy.tokenBMint
-            : strategy.strategy.tokenAMint;
-        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
-            : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-            {
-                mint: secondTokenAta,
-                tokenProgram: secondTokenTokenProgarm,
-            },
-        ];
-    }
-    else {
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-        ];
-    }
-    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const fillWsolAtaIxs = [];
     if (depositTokenIsSol) {
         fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil()));
     }
-    const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
     // 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: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
+        borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -270,44 +210,26 @@ async function buildDepositWithLeverageIxs(market, debtReserve, collReserve, own
     referrer, currentSlot);
     // 4. Swap
     const { swapIxs } = swapQuoteIxs;
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapIxs, []);
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapIxs);
     const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
     const flashLoanInfo = {
         flashBorrowReserve: flashBorrowReserve.address,
         flashLoanFee: flashBorrowReserve.getFlashLoanFee(),
     };
-    if (!collIsKtoken) {
-        return {
-            flashLoanInfo,
-            instructions: [
-                ...scopeRefreshIxn,
-                ...budgetIxs,
-                ...atasAndCreateIxs.map((x) => x.createAtaIx),
-                ...fillWsolAtaIxs,
-                ...[flashBorrowIxn],
-                ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
-                ...swapInstructions,
-                ...[flashRepayIxn],
-            ],
-        };
-    }
-    else {
-        return {
-            flashLoanInfo,
-            instructions: [
-                ...scopeRefreshIxn,
-                ...budgetIxs,
-                ...atasAndCreateIxs.map((x) => x.createAtaIx),
-                ...fillWsolAtaIxs,
-                ...[flashBorrowIxn],
-                ...swapInstructions,
-                ...kaminoDepositAndBorrowAction.setupIxs,
-                ...classes_1.KaminoAction.actionToLendingIxs(kaminoDepositAndBorrowAction),
-                ...kaminoDepositAndBorrowAction.cleanupIxs,
-                ...[flashRepayIxn],
-            ],
-        };
-    }
+    return {
+        flashLoanInfo,
+        instructions: [
+            ...scopeRefreshIx,
+            ...budgetIxs,
+            ...createAtasIxs,
+            ...fillWsolAtaIxs,
+            ...[flashBorrowIx],
+            ...(collIsKtoken ? swapInstructions : []),
+            ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+            ...(collIsKtoken ? [] : swapInstructions),
+            ...[flashRepayIx],
+        ],
+    };
 }
 async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, deposited, borrowed, obligation, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
@@ -316,25 +238,24 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
     const selectedTokenIsCollToken = selectedTokenMint.equals(collTokenMint);
     const collIsKtoken = await isKtoken(collTokenMint);
     const strategy = collIsKtoken ? (await kamino.getStrategyByKTokenMint(collTokenMint)) : undefined;
-    const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const inputTokenIsSol = selectedTokenMint.equals(spl_token_1.NATIVE_MINT);
     const calcs = (0, calcs_1.withdrawLeverageCalcs)(kaminoMarket, collReserve, debtReserve, priceCollToDebt, withdrawAmount, deposited, borrowed, currentSlot, isClosingPosition, selectedTokenIsCollToken, selectedTokenMint, obligation, flashLoanFee, slippagePct);
-    const klendIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
+    const klendIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: [],
         lookupTables: [],
     }, strategy, collIsKtoken, useV2Ixs);
     const uniqueKlendAccounts = (0, utils_1.uniqueAccountsWithProgramIds)(klendIxs.instructions);
-    const swapInputAmount = (0, classes_2.numberToLamportsDecimal)(calcs.collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+    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: new decimal_js_1.default(0), // Only needed for ktokens deposits
+        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 swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.collTokenSwapIn, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
+    const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.collTokenSwapIn, collReserve.getMintDecimals()).ceil();
     return {
         swapInputs: {
             inputAmountLamports: swapInputAmountQuotePrice,
@@ -358,8 +279,7 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
 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, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-    const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
-    const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
+    const inputTokenIsSol = selectedTokenMint.equals(spl_token_1.NATIVE_MINT);
     const { swapInputs, initialInputs } = await getWithdrawWithLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -403,7 +323,7 @@ async function getWithdrawWithLeverageIxs({ owner, kaminoMarket, debtTokenMint,
             console.log('Strategy lookup table not found');
         }
     }
-    const ixs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+    const ixs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, inputTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs,
         lookupTables,
@@ -422,60 +342,12 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
     const debtTokenMint = debtReserve.getLiquidityMint();
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
     // 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)
-            ? strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenBTokenProgram
-            : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-            {
-                mint: secondTokenAta,
-                tokenProgram: secondTokenTokenProgram,
-            },
-        ];
-    }
-    else {
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-        ];
-    }
-    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, market, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     const closeWsolAtaIxs = [];
     if (depositTokenIsSol || debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
         const wsolAta = (0, utils_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, owner, false);
         closeWsolAtaIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
-    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
     // 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 fillWsolAtaIxs = [];
@@ -484,12 +356,11 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
         fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(balanceToWrap, utils_1.SOL_DECIMALS).ceil()));
     }
-    const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
     // 2. Prepare the flash borrow and flash repay amounts and ixs
     // We borrow exactly how much we need to repay
     // and repay that + flash amount fee
-    const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
+        borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -506,21 +377,21 @@ async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, ow
         ? utils_1.U64_MAX
         : (0, classes_2.numberToLamportsDecimal)(calcs.depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, currentSlot, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
     referrer);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapQuoteIxs.swapIxs, []);
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
     return {
         flashLoanInfo: {
             flashLoanFee: debtReserve.getFlashLoanFee(),
             flashBorrowReserve: debtReserve.address,
         },
         instructions: [
-            ...scopeRefreshIxn,
+            ...scopeRefreshIx,
             ...budgetIxs,
-            ...atasAndCreateIxs.map((x) => x.createAtaIx),
+            ...createAtasIxs,
             ...fillWsolAtaIxs,
-            ...[flashBorrowIxn],
+            ...[flashBorrowIx],
             ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
             ...swapInstructions,
-            ...[flashRepayIxn],
+            ...[flashRepayIx],
             ...closeWsolAtaIxs,
         ],
     };
@@ -578,10 +449,10 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             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();
+        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.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.state.liquidity.mintDecimals.toNumber());
+            expectedDebtTokenAtaBalance = await (0, utils_2.getExpectedTokenBalanceAfterBorrow)(kaminoMarket.getConnection(), debtTokenMint, owner, (0, classes_2.numberToLamportsDecimal)(!collIsKtoken ? calcsQuotePrice.borrowAmount : calcsQuotePrice.amountToFlashBorrowDebt, debtReserve.stats.decimals).floor(), debtReserve.getMintDecimals());
         }
         return {
             swapInputs: {
@@ -617,7 +488,7 @@ 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: new decimal_js_1.default(0), // Only needed for ktokens deposits
+            amountDebtAtaBalance: undefined, // Only needed for ktokens deposits
         };
         const swapQuote = await quoter(swapInputsForQuote, uniqueKlendAccounts);
         const { adjustDepositPosition: adjustDepositPositionQuotePrice, adjustBorrowPosition: adjustBorrowPositionQuotePrice, } = (0, calcs_1.calcAdjustAmounts)({
@@ -628,14 +499,14 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             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();
+        const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.getMintDecimals()).ceil();
         return {
             swapInputs: {
                 inputAmountLamports: swapInputAmountQuotePrice,
                 minOutAmountLamports: (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.adjustBorrowPosition.abs(), debtReserve.stats.decimals),
                 inputMint: collTokenMint,
                 outputMint: debtTokenMint,
-                amountDebtAtaBalance: new decimal_js_1.default(0), // Only needed for ktokens deposits
+                amountDebtAtaBalance: undefined, // Only needed for ktokens deposits
             },
             flashLoanInfo: klendIxs.flashLoanInfo,
             initialInputs: {
@@ -733,64 +604,15 @@ 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, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
-    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+    const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
+    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
     const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns
-    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
-    let mintsToCreateAtas;
-    if (collIsKtoken) {
-        const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
-            ? strategy.strategy.tokenBMint
-            : strategy.strategy.tokenAMint;
-        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
-            : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-            {
-                mint: secondTokenAta,
-                tokenProgram: secondTokenTokenProgarm,
-            },
-        ];
-    }
-    else {
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-        ];
-    }
-    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
-    const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs);
     // 2. Create borrow flash loan instruction
-    const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
+    const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
+        borrowIxIndex: budgetIxs.length + createAtasIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -806,28 +628,18 @@ async function buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
     const borrowAction = await classes_1.KaminoAction.buildBorrowTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.borrowAmount, debtReserve.stats.decimals).ceil().toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer, currentSlot);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapQuoteIxs.swapIxs, []);
-    const ixs = !collIsKtoken
-        ? [
-            ...scopeRefreshIxn,
-            ...budgetIxs,
-            ...atasAndCreateIxs.map((x) => x.createAtaIx),
-            ...[flashBorrowIxn],
-            ...classes_1.KaminoAction.actionToIxs(depositAction),
-            ...classes_1.KaminoAction.actionToIxs(borrowAction),
-            ...swapInstructions,
-            ...[flashRepayIxn],
-        ]
-        : [
-            ...scopeRefreshIxn,
-            ...budgetIxs,
-            ...atasAndCreateIxs.map((x) => x.createAtaIx),
-            ...[flashBorrowIxn],
-            ...swapInstructions,
-            ...classes_1.KaminoAction.actionToIxs(depositAction),
-            ...classes_1.KaminoAction.actionToIxs(borrowAction),
-            ...[flashRepayIxn],
-        ];
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
+    const ixs = [
+        ...scopeRefreshIx,
+        ...budgetIxs,
+        ...createAtasIxs,
+        ...[flashBorrowIx],
+        ...(collIsKtoken ? swapInstructions : []),
+        ...classes_1.KaminoAction.actionToIxs(depositAction),
+        ...classes_1.KaminoAction.actionToIxs(borrowAction),
+        ...(collIsKtoken ? [] : swapInstructions),
+        ...[flashRepayIx],
+    ];
     const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
     const res = {
         flashLoanInfo: {
@@ -842,59 +654,11 @@ 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, swapQuoteIxs, budgetAndPriorityFeeIxs, useV2Ixs) {
-    const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-    const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
+    const collReserve = kaminoMarket.getExistingReserveByMint(collTokenMint);
+    const debtReserve = kaminoMarket.getExistingReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns
-    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
-    let mintsToCreateAtas;
-    if (collIsKtoken) {
-        const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
-            ? strategy.strategy.tokenBMint
-            : strategy.strategy.tokenAMint;
-        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
-            : strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
-                ? spl_token_1.TOKEN_PROGRAM_ID
-                : strategy.strategy.tokenATokenProgram;
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-            {
-                mint: secondTokenAta,
-                tokenProgram: secondTokenTokenProgarm,
-            },
-        ];
-    }
-    else {
-        mintsToCreateAtas = [
-            {
-                mint: collTokenMint,
-                tokenProgram: collReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: debtTokenMint,
-                tokenProgram: debtReserve.getLiquidityTokenProgram(),
-            },
-            {
-                mint: collReserve.getCTokenMint(),
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            },
-        ];
-    }
-    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const { budgetIxs, createAtasIxs, scopeRefreshIx } = await (0, exports.getSetupIxs)(owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, 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 = [];
@@ -906,10 +670,9 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
         const balanceToWrap = halfSolBalance < 0.1 ? halfSolBalance : 0.1;
         fillWsolAtaIxs.push(...(0, utils_1.getTransferWsolIxs)(owner, wsolAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil()));
     }
-    const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
     // 3. Flash borrow & repay amount to repay (debt)
-    const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    const { flashBorrowIx, flashRepayIx } = (0, instructions_1.getFlashLoanInstructions)({
+        borrowIxIndex: budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -927,17 +690,17 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     // 6. Withdraw collateral (a little bit more to be able to pay for the slippage on swap)
     const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer, currentSlot);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapQuoteIxs.swapIxs, []);
+    const swapInstructions = (0, utils_1.removeBudgetIxs)(swapQuoteIxs.swapIxs);
     const ixs = [
-        ...scopeRefreshIxn,
+        ...scopeRefreshIx,
         ...budgetIxs,
-        ...atasAndCreateIxs.map((x) => x.createAtaIx),
+        ...createAtasIxs,
         ...fillWsolAtaIxs,
-        ...[flashBorrowIxn],
+        ...[flashBorrowIx],
         ...classes_1.KaminoAction.actionToIxs(repayAction),
         ...classes_1.KaminoAction.actionToIxs(withdrawAction),
         ...swapInstructions,
-        ...[flashRepayIxn],
+        ...[flashRepayIx],
         ...closeWsolAtaIxs,
     ];
     const res = {
@@ -949,6 +712,18 @@ async function buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debt
     };
     return res;
 }
+const getSetupIxs = async (owner, kaminoMarket, obligation, collTokenMint, collReserve, collIsKtoken, debtTokenMint, debtReserve, strategy, scopeRefreshConfig, budgetAndPriorityFeeIxs) => {
+    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
+    const mintsWithTokenPrograms = getTokenMintsWithTokenPrograms(collTokenMint, collReserve, debtTokenMint, debtReserve, collIsKtoken, strategy);
+    const createAtasIxs = (0, utils_1.createAtasIdempotent)(owner, mintsWithTokenPrograms).map((x) => x.createAtaIx);
+    const scopeRefreshIx = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
+    return {
+        budgetIxs,
+        createAtasIxs,
+        scopeRefreshIx,
+    };
+};
+exports.getSetupIxs = getSetupIxs;
 const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, scopeRefreshConfig) => {
     const allReserves = obligation && (0, classes_1.isKaminoObligation)(obligation)
         ? new utils_1.PublicKeySet([
@@ -968,4 +743,56 @@ const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, s
     return scopeRefreshIxs;
 };
 exports.getScopeRefreshIx = getScopeRefreshIx;
+const checkObligationType = (obligationTypeTag, collTokenMint, debtTokenMint, kaminoMarket) => {
+    let obligationType;
+    if (obligationTypeTag === utils_1.ObligationTypeTag.Multiply) {
+        // multiply
+        obligationType = new utils_1.MultiplyObligation(collTokenMint, debtTokenMint, kaminoMarket.programId);
+    }
+    else if (obligationTypeTag === 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');
+    }
+    return obligationType;
+};
+const getTokenMintsWithTokenPrograms = (collTokenMint, collReserve, debtTokenMint, debtReserve, collIsKtoken, strategy) => {
+    const mintsWithTokenPrograms = [
+        {
+            mint: collTokenMint,
+            tokenProgram: collReserve.getLiquidityTokenProgram(),
+        },
+        {
+            mint: debtTokenMint,
+            tokenProgram: debtReserve.getLiquidityTokenProgram(),
+        },
+        {
+            mint: collReserve.getCTokenMint(),
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        },
+    ];
+    if (collIsKtoken) {
+        let kTokenAta;
+        let kTokenTokenProgram;
+        if (strategy.strategy.tokenAMint.equals(debtTokenMint)) {
+            kTokenAta = strategy.strategy.tokenBMint;
+            kTokenTokenProgram = strategy.strategy.tokenBTokenProgram.equals(web3_js_1.PublicKey.default)
+                ? spl_token_1.TOKEN_PROGRAM_ID
+                : strategy.strategy.tokenBTokenProgram;
+        }
+        else {
+            kTokenAta = strategy.strategy.tokenAMint;
+            kTokenTokenProgram = strategy.strategy.tokenATokenProgram.equals(web3_js_1.PublicKey.default)
+                ? spl_token_1.TOKEN_PROGRAM_ID
+                : strategy.strategy.tokenATokenProgram;
+        }
+        mintsWithTokenPrograms.push({
+            mint: kTokenAta,
+            tokenProgram: kTokenTokenProgram,
+        });
+    }
+    return mintsWithTokenPrograms;
+};
 //# sourceMappingURL=operations.js.map