@kamino-finance/klend-sdk 5.13.0 → 5.13.2

package/dist/leverage/operations.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getScopeRefreshIx = void 0;
 exports.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
-exports.getDepositWithLeverageIxns = getDepositWithLeverageIxns;
+exports.getDepositWithLeverageIxs = getDepositWithLeverageIxs;
 exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
-exports.getWithdrawWithLeverageIxns = getWithdrawWithLeverageIxns;
-exports.buildWithdrawWithLeverageIxns = buildWithdrawWithLeverageIxns;
+exports.getWithdrawWithLeverageIxs = getWithdrawWithLeverageIxs;
+exports.buildWithdrawWithLeverageIxs = buildWithdrawWithLeverageIxs;
 exports.getAdjustLeverageSwapInputs = getAdjustLeverageSwapInputs;
-exports.getAdjustLeverageIxns = getAdjustLeverageIxns;
+exports.getAdjustLeverageIxs = getAdjustLeverageIxs;
 const web3_js_1 = require("@solana/web3.js");
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const classes_1 = require("../classes");
@@ -31,7 +31,7 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
     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));
+    console.log('Ops Calcs', (0, classes_1.toJson)(calcs));
     let obligationType;
     if (obligationTypeTagOverride === utils_1.ObligationTypeTag.Multiply) {
         // multiply
@@ -45,7 +45,7 @@ async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtToken
         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, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
+    const klendIxs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: [],
         lookupTables: [],
@@ -124,7 +124,7 @@ async function getDepositWithLeverageCalcs(depositAmount, selectedTokenIsCollTok
     }
     return calcs;
 }
-async function getDepositWithLeverageIxns({ 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, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, elevationGroupOverride, useV2Ixs, }) {
     const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -172,7 +172,7 @@ async function getDepositWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
     const depositTokenIsSol = !solTokenReserve ? false : selectedTokenMint.equals(solTokenReserve.getLiquidityMint());
-    const ixs = await buildDepositWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
+    const ixs = await buildDepositWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: swapIxs,
         lookupTables: lookupTables,
@@ -185,13 +185,13 @@ async function getDepositWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
         initialInputs,
     };
 }
-async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
-    const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+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 ixns
+    // 1. Create atas & budget ixs
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
@@ -239,16 +239,16 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
             },
         ];
     }
-    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
-    const fillWsolAtaIxns = [];
+    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const fillWsolAtaIxs = [];
     if (depositTokenIsSol) {
-        fillWsolAtaIxns.push(...(0, utils_1.getTransferWsolIxns)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(calcs.initDepositInSol, utils_1.SOL_DECIMALS).ceil()));
+        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: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -266,12 +266,11 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
         .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
-    false, // to be checked and created in a setup tx in the UI
-    false, // to be checked and created in a setup tx in the UI
+    { skipInitialization: true, skipLutCreation: true }, // to be checked and created in a setup tx in the UI
     referrer, currentSlot);
     // 4. Swap
     const { swapIxs } = swapQuoteIxs;
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxs, []);
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapIxs, []);
     const flashBorrowReserve = !collIsKtoken ? collReserve : debtReserve;
     const flashLoanInfo = {
         flashBorrowReserve: flashBorrowReserve.address,
@@ -282,9 +281,9 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
             flashLoanInfo,
             instructions: [
                 ...scopeRefreshIxn,
-                ...budgetIxns,
-                ...atasAndCreateIxns.map((x) => x.createAtaIx),
-                ...fillWsolAtaIxns,
+                ...budgetIxs,
+                ...atasAndCreateIxs.map((x) => x.createAtaIx),
+                ...fillWsolAtaIxs,
                 ...[flashBorrowIxn],
                 ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
                 ...swapInstructions,
@@ -297,9 +296,9 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
             flashLoanInfo,
             instructions: [
                 ...scopeRefreshIxn,
-                ...budgetIxns,
-                ...atasAndCreateIxns.map((x) => x.createAtaIx),
-                ...fillWsolAtaIxns,
+                ...budgetIxs,
+                ...atasAndCreateIxs.map((x) => x.createAtaIx),
+                ...fillWsolAtaIxs,
                 ...[flashBorrowIxn],
                 ...swapInstructions,
                 ...kaminoDepositAndBorrowAction.setupIxs,
@@ -320,7 +319,7 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
     const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_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, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
+    const klendIxs = await buildWithdrawWithLeverageIxs(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: [],
         lookupTables: [],
@@ -356,7 +355,7 @@ async function getWithdrawWithLeverageSwapInputs({ owner, kaminoMarket, debtToke
         },
     };
 }
-async function getWithdrawWithLeverageIxns({ 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, 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);
@@ -404,12 +403,12 @@ async function getWithdrawWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
             console.log('Strategy lookup table not found');
         }
     }
-    const ixs = await buildWithdrawWithLeverageIxns(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, depositTokenIsSol, scopeRefreshConfig, initialInputs.calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs,
         lookupTables,
     }, initialInputs.strategy, initialInputs.collIsKtoken, useV2Ixs);
-    // Send ixns and lookup tables
+    // Send ixs and lookup tables
     return {
         ixs: ixs.instructions,
         flashLoanInfo: ixs.flashLoanInfo,
@@ -418,7 +417,7 @@ async function getWithdrawWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
         initialInputs: initialInputs,
     };
 }
-async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs) {
+async function buildWithdrawWithLeverageIxs(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeRefreshConfig, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs) {
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -470,27 +469,27 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
             },
         ];
     }
-    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
-    const closeWsolAtaIxns = [];
+    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const closeWsolAtaIxs = [];
     if (depositTokenIsSol || debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
         const wsolAta = (0, utils_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, owner, false);
-        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
+        closeWsolAtaIxs.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
-    const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+    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 fillWsolAtaIxns = [];
+    const fillWsolAtaIxs = [];
     if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
         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.getTransferWsolIxns)(owner, (0, spl_token_1.getAssociatedTokenAddressSync)(spl_token_1.NATIVE_MINT, owner), (0, classes_2.numberToLamportsDecimal)(balanceToWrap, utils_1.SOL_DECIMALS).ceil()));
+        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 ixns
+    // 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: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -505,10 +504,9 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
     // 3. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
     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, useV2Ixs, undefined, 0, 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)
-    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);
-    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
+        : (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, []);
     return {
         flashLoanInfo: {
             flashLoanFee: debtReserve.getFlashLoanFee(),
@@ -516,14 +514,14 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
         },
         instructions: [
             ...scopeRefreshIxn,
-            ...budgetIxns,
-            ...atasAndCreateIxns.map((x) => x.createAtaIx),
-            ...fillWsolAtaIxns,
+            ...budgetIxs,
+            ...atasAndCreateIxs.map((x) => x.createAtaIx),
+            ...fillWsolAtaIxs,
             ...[flashBorrowIxn],
             ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
             ...swapInstructions,
             ...[flashRepayIxn],
-            ...closeWsolAtaIxns,
+            ...closeWsolAtaIxs,
         ],
     };
 }
@@ -558,7 +556,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     if (isDeposit) {
         const calcs = await (0, calcs_1.adjustDepositLeverageCalcs)(kaminoMarket, owner, debtReserve, adjustDepositPosition, adjustBorrowPosition, priceDebtToColl, flashLoanFee, slippagePct, collIsKtoken);
         // Build the repay & withdraw collateral tx to get the number of accounts
-        const klendIxs = await buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
+        const klendIxs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
             preActionIxs: [],
             swapIxs: [],
             lookupTables: [],
@@ -608,7 +606,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     }
     else {
         const calcs = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPosition, adjustBorrowPosition, flashLoanFee, slippagePct);
-        const klendIxs = await buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
+        const klendIxs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, {
             preActionIxs: [],
             swapIxs: [],
             lookupTables: [],
@@ -653,7 +651,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         };
     }
 }
-async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, }) {
+async function getAdjustLeverageIxs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, }) {
     const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -690,7 +688,7 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
             depositSwapper = swapper;
         }
         const { swapIxs, lookupTables } = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const ixs = await buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const ixs = await buildIncreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
             preActionIxs: [],
             swapIxs,
             lookupTables,
@@ -715,9 +713,9 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
         else {
             withdrawSwapper = swapper;
         }
-        // 5. Get swap ixns
+        // 5. Get swap ixs
         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, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const ixs = await buildDecreaseLeverageIxs(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
             preActionIxs: [],
             swapIxs,
             lookupTables,
@@ -734,13 +732,13 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
 /**
  * Deposit and borrow tokens if leverage increased
  */
-async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns, useV2Ixs) {
+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 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 budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
@@ -788,11 +786,11 @@ async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
             },
         ];
     }
-    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const atasAndCreateIxs = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
     const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(kaminoMarket, collReserve, debtReserve, obligation, scopeRefreshConfig);
     // 2. Create borrow flash loan instruction
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0), // TODO: how about user metadata ixns
+        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -804,19 +802,16 @@ async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
         referrerTokenState: kaminoMarket.programId,
         programId: kaminoMarket.programId,
     });
-    const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(), collTokenMint, owner, obligation, useV2Ixs, 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)
-    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);
+    const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(), collTokenMint, owner, obligation, useV2Ixs, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, referrer, currentSlot);
     // 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, 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)
-    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 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.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapQuoteIxs.swapIxs, []);
     const ixs = !collIsKtoken
         ? [
             ...scopeRefreshIxn,
-            ...budgetIxns,
-            ...atasAndCreateIxns.map((x) => x.createAtaIx),
+            ...budgetIxs,
+            ...atasAndCreateIxs.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
             ...classes_1.KaminoAction.actionToIxs(depositAction),
             ...classes_1.KaminoAction.actionToIxs(borrowAction),
@@ -825,8 +820,8 @@ async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
         ]
         : [
             ...scopeRefreshIxn,
-            ...budgetIxns,
-            ...atasAndCreateIxns.map((x) => x.createAtaIx),
+            ...budgetIxs,
+            ...atasAndCreateIxs.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
             ...swapInstructions,
             ...classes_1.KaminoAction.actionToIxs(depositAction),
@@ -846,12 +841,12 @@ async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
 /**
  * Withdraw and repay tokens if leverage decreased
  */
-async function buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeRefreshConfig, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns, useV2Ixs) {
+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 debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
     // 1. Create atas & budget txns
-    const budgetIxns = budgetAndPriorityFeeIxns || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
+    const budgetIxs = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxs)(3000000);
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
@@ -899,22 +894,22 @@ async function buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
             },
         ];
     }
-    const atasAndCreateIxns = (0, utils_1.createAtasIdempotent)(owner, mintsToCreateAtas);
+    const atasAndCreateIxs = (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 = [];
-    const fillWsolAtaIxns = [];
+    const closeWsolAtaIxs = [];
+    const fillWsolAtaIxs = [];
     if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
         const wsolAta = (0, utils_1.getAssociatedTokenAddress)(spl_token_1.NATIVE_MINT, owner, false);
-        closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
+        closeWsolAtaIxs.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.getTransferWsolIxns)(owner, wsolAta, (0, classes_2.numberToLamportsDecimal)(balanceToWrap, debtReserve.stats.decimals).ceil()));
+        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: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+        borrowIxnIndex: budgetIxs.length + atasAndCreateIxs.length + fillWsolAtaIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -927,32 +922,30 @@ async function buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
         programId: kaminoMarket.programId,
     });
     // 4. Actually do the repay of the flash borrowed amounts
-    const repayAction = await classes_1.KaminoAction.buildRepayTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(decimal_js_1.default.abs(calcs.adjustBorrowPosition), debtReserve.stats.decimals).floor().toString(), debtTokenMint, owner, obligation, useV2Ixs, undefined, currentSlot, undefined, 0, false, false, 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)
-    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, useV2Ixs, undefined, currentSlot, undefined, 0, false, false, { skipInitialization: true, skipLutCreation: true }, // to be checked and create in a setup tx in the UI (won't be the case for adjust anyway as this would be created in deposit)
     referrer);
     // 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, 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)
-    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, 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.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
-    const ixns = [
+    const swapInstructions = (0, utils_1.removeBudgetAndAtaIxs)(swapQuoteIxs.swapIxs, []);
+    const ixs = [
         ...scopeRefreshIxn,
-        ...budgetIxns,
-        ...atasAndCreateIxns.map((x) => x.createAtaIx),
-        ...fillWsolAtaIxns,
+        ...budgetIxs,
+        ...atasAndCreateIxs.map((x) => x.createAtaIx),
+        ...fillWsolAtaIxs,
         ...[flashBorrowIxn],
         ...classes_1.KaminoAction.actionToIxs(repayAction),
         ...classes_1.KaminoAction.actionToIxs(withdrawAction),
         ...swapInstructions,
         ...[flashRepayIxn],
-        ...closeWsolAtaIxns,
+        ...closeWsolAtaIxs,
     ];
     const res = {
         flashLoanInfo: {
             flashBorrowReserve: debtReserve.address,
             flashLoanFee: debtReserve.getFlashLoanFee(),
         },
-        instructions: ixns,
+        instructions: ixs,
     };
     return res;
 }
@@ -966,13 +959,13 @@ const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, s
         ]).toArray()
         : new utils_1.PublicKeySet([collReserve.address, debtReserve.address]).toArray();
     const tokenIds = (0, classes_1.getTokenIdsForScopeRefresh)(market, allReserves);
-    const scopeRefreshIxns = [];
+    const scopeRefreshIxs = [];
     if (tokenIds.length > 0 && scopeRefreshConfig) {
-        scopeRefreshIxns.push(await scopeRefreshConfig.scope.refreshPriceListIx({
+        scopeRefreshIxs.push(await scopeRefreshConfig.scope.refreshPriceListIx({
             feed: scopeRefreshConfig.scopeFeed,
         }, tokenIds));
     }
-    return scopeRefreshIxns;
+    return scopeRefreshIxs;
 };
 exports.getScopeRefreshIx = getScopeRefreshIx;
 //# sourceMappingURL=operations.js.map