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

package/dist/leverage/operations.js

@@ -3,7 +3,6 @@ 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.getDepositWithLeverageSwapInputs = getDepositWithLeverageSwapInputs;
 exports.getDepositWithLeverageIxns = getDepositWithLeverageIxns;
 exports.getWithdrawWithLeverageSwapInputs = getWithdrawWithLeverageSwapInputs;
@@ -21,7 +20,7 @@ const calcs_1 = require("./calcs");
 const spl_token_1 = require("@solana/spl-token");
 const utils_2 = require("./utils");
 const CreationParameters_1 = require("@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters");
-async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeRefreshConfig, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, useV2Ixs, elevationGroupOverride, }) {
+async function getDepositWithLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeFeed, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, useV2Ixs, elevationGroupOverride, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
@@ -45,7 +44,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 buildDepositWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation ? obligation : obligationType, referrer, currentSlot, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: [],
         lookupTables: [],
@@ -123,7 +122,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 getDepositWithLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, depositAmount, priceDebtToColl, slippagePct, obligation, referrer, currentSlot, targetLeverage, selectedTokenMint, kamino, obligationTypeTagOverride, scopeFeed, budgetAndPriorityFeeIxs, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, elevationGroupOverride, useV2Ixs, }) {
     const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -139,7 +138,7 @@ async function getDepositWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
         selectedTokenMint,
         kamino,
         obligationTypeTagOverride,
-        scopeRefreshConfig,
+        scopeFeed,
         budgetAndPriorityFeeIxs,
         quoteBufferBps,
         priceAinB,
@@ -171,7 +170,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 buildDepositWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, initialInputs.obligation, referrer, currentSlot, depositTokenIsSol, scopeFeed, initialInputs.calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: swapIxs,
         lookupTables: lookupTables,
@@ -183,13 +182,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) {
+async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, swapQuoteIxs, strategy, collIsKtoken, useV2Ixs, elevationGroupOverride) {
     const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
     const collTokenMint = collReserve.getLiquidityMint();
     const debtTokenMint = debtReserve.getLiquidityMint();
     const collTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(collTokenMint, owner, false, collReserve.getLiquidityTokenProgram());
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
-    // 1. Create atas & budget ixns
+    // 1. Create atas & budget txns
     let mintsToCreateAtas;
     if (collIsKtoken) {
         const secondTokenAta = strategy.strategy.tokenAMint.equals(debtTokenMint)
@@ -242,11 +241,10 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
     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()));
     }
-    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: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -259,32 +257,33 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
         programId: market.programId,
     });
     // 3. Deposit initial tokens + borrowed tokens into reserve
+    const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
     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
+        .toString(), debtTokenMint, owner, obligation, useV2Ixs, 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
-    referrer, currentSlot);
+    referrer, currentSlot, scopeRefresh);
     // 4. Swap
     const { swapIxs } = swapQuoteIxs;
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapIxs, []);
     if (!collIsKtoken) {
         return [
-            ...scopeRefreshIxn,
             ...budgetIxns,
             ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...fillWsolAtaIxns,
             ...[flashBorrowIxn],
-            ...classes_1.KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+            ...kaminoDepositAndBorrowAction.setupIxs,
+            ...classes_1.KaminoAction.actionToLendingIxs(kaminoDepositAndBorrowAction),
+            ...kaminoDepositAndBorrowAction.cleanupIxs,
             ...swapInstructions,
             ...[flashRepayIxn],
         ];
     }
     else {
         return [
-            ...scopeRefreshIxn,
             ...budgetIxns,
             ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...fillWsolAtaIxns,
@@ -297,7 +296,7 @@ async function buildDepositWithLeverageIxns(market, debtReserve, collReserve, ow
         ];
     }
 }
-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, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
@@ -307,7 +306,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 buildWithdrawWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs: [],
         lookupTables: [],
@@ -342,7 +341,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 getWithdrawWithLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, deposited, borrowed, referrer, currentSlot, withdrawAmount, priceCollToDebt, slippagePct, isClosingPosition, selectedTokenMint, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, swapper, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const solTokenReserve = kaminoMarket.getReserveByMint(spl_token_1.NATIVE_MINT);
@@ -364,7 +363,7 @@ async function getWithdrawWithLeverageIxns({ owner, kaminoMarket, debtTokenMint,
         selectedTokenMint,
         budgetAndPriorityFeeIxs,
         kamino,
-        scopeRefreshConfig,
+        scopeFeed,
         quoteBufferBps,
         isKtoken,
         quoter,
@@ -390,7 +389,7 @@ 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 buildWithdrawWithLeverageIxns(kaminoMarket, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, initialInputs.calcs, budgetAndPriorityFeeIxs, {
         preActionIxs: [],
         swapIxs,
         lookupTables,
@@ -403,7 +402,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 buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, owner, obligation, referrer, currentSlot, isClosingPosition, depositTokenIsSol, scopeFeed, 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());
@@ -462,7 +461,7 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
         closeWsolAtaIxns.push((0, spl_token_1.createCloseAccountInstruction)(wsolAta, owner, owner, [], spl_token_1.TOKEN_PROGRAM_ID));
     }
     const budgetIxns = budgetAndPriorityFeeIxs || (0, utils_1.getComputeBudgetAndPriorityFeeIxns)(3000000);
-    // TODO: Mihai/Marius check if we can improve this logic and not convert any SOL
+    // TODO: Might be worth removing as it's only needed for Ktokens
     // This is here so that we have enough wsol to repay in case the kAB swapped to sol after estimates is not enough
     const fillWsolAtaIxns = [];
     if (debtTokenMint.equals(spl_token_1.NATIVE_MINT)) {
@@ -470,12 +469,11 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
         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()));
     }
-    const scopeRefreshIxn = await (0, exports.getScopeRefreshIx)(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
     // 2. Prepare the flash borrow and flash repay amounts and ixns
     // We borrow exactly how much we need to repay
     // and repay that + flash amount fee
     const { flashBorrowIxn, flashRepayIxn } = (0, instructions_1.getFlashLoanInstructions)({
-        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+        borrowIxnIndex: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
         walletPublicKey: owner,
         lendingMarketAuthority: market.getLendingMarketAuthority(),
         lendingMarketAddress: market.getAddress(),
@@ -487,26 +485,27 @@ async function buildWithdrawWithLeverageIxns(market, debtReserve, collReserve, o
         referrerTokenState: market.programId,
         programId: market.programId,
     });
-    // 3. Repay borrowed tokens and Withdraw tokens from reserve that will be swapped to repay flash loan
+    // 6. 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)
+        : (0, classes_2.numberToLamportsDecimal)(calcs.depositTokenWithdrawAmount, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, currentSlot, obligation, useV2Ixs, 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);
+    isClosingPosition, referrer, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
     return [
-        ...scopeRefreshIxn,
         ...budgetIxns,
         ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
-        ...classes_1.KaminoAction.actionToIxs(repayAndWithdrawAction),
+        ...repayAndWithdrawAction.setupIxs,
+        ...classes_1.KaminoAction.actionToLendingIxs(repayAndWithdrawAction),
+        ...repayAndWithdrawAction.cleanupIxs,
         ...swapInstructions,
         ...[flashRepayIxn],
         ...closeWsolAtaIxns,
     ];
 }
-async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeRefreshConfig, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
+async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, isKtoken, quoter, useV2Ixs, }) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const deposited = (0, classes_1.lamportsToNumberDecimal)(depositedLamports, collReserve.stats.decimals);
@@ -517,11 +516,14 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
     const currentLeverage = obligation.refreshedStats.leverage;
     const isDepositViaLeverage = targetLeverage.gte(new decimal_js_1.default(currentLeverage));
     let flashLoanFee;
+    let borrowFee;
     if (isDepositViaLeverage) {
         flashLoanFee = collReserve.getFlashLoanFee() || new decimal_js_1.default(0);
+        borrowFee = collReserve.getBorrowFee() || new decimal_js_1.default(0);
     }
     else {
         flashLoanFee = debtReserve.getFlashLoanFee() || new decimal_js_1.default(0);
+        borrowFee = debtReserve.getBorrowFee() || new decimal_js_1.default(0);
     }
     const { adjustDepositPosition, adjustBorrowPosition } = (0, calcs_1.calcAdjustAmounts)({
         currentDepositPosition: deposited,
@@ -529,6 +531,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
         targetLeverage: targetLeverage,
         priceCollToDebt: priceCollToDebt,
         flashLoanFee: new decimal_js_1.default(flashLoanFee),
+        borrowFee,
     });
     const isDeposit = adjustDepositPosition.gte(0) && adjustBorrowPosition.gte(0);
     if (isDepositViaLeverage !== isDeposit) {
@@ -537,7 +540,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 buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, {
             preActionIxs: [],
             swapIxs: [],
             lookupTables: [],
@@ -557,6 +560,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             targetLeverage: targetLeverage,
             priceCollToDebt: new decimal_js_1.default(1).div(swapQuote.priceAInB),
             flashLoanFee: new decimal_js_1.default(flashLoanFee),
+            borrowFee,
         });
         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();
@@ -586,7 +590,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 buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, {
             preActionIxs: [],
             swapIxs: [],
             lookupTables: [],
@@ -606,6 +610,7 @@ async function getAdjustLeverageSwapInputs({ owner, kaminoMarket, debtTokenMint,
             targetLeverage: targetLeverage,
             priceCollToDebt: swapQuote.priceAInB,
             flashLoanFee: new decimal_js_1.default(flashLoanFee),
+            borrowFee,
         });
         const calcsQuotePrice = (0, calcs_1.adjustWithdrawLeverageCalcs)(adjustDepositPositionQuotePrice, adjustBorrowPositionQuotePrice, flashLoanFee, slippagePct);
         const swapInputAmountQuotePrice = (0, classes_2.numberToLamportsDecimal)(calcsQuotePrice.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.state.liquidity.mintDecimals.toNumber()).ceil();
@@ -630,7 +635,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 getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collTokenMint, obligation, depositedLamports, borrowedLamports, referrer, currentSlot, targetLeverage, priceCollToDebt, priceDebtToColl, slippagePct, budgetAndPriorityFeeIxs, kamino, scopeFeed, quoteBufferBps, priceAinB, isKtoken, quoter, swapper, useV2Ixs, }) {
     const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
         owner,
         kaminoMarket,
@@ -647,7 +652,7 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
         slippagePct,
         budgetAndPriorityFeeIxs,
         kamino,
-        scopeRefreshConfig,
+        scopeFeed,
         quoteBufferBps,
         priceAinB,
         isKtoken,
@@ -668,7 +673,7 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
         }
         const { swapIxs, lookupTables } = await depositSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
         // TODO: marius why are we not using both adjustDepositPosition & adjustBorrowPosition
-        const ixs = await buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const ixs = await buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeFeed, initialInputs.collIsKtoken, {
             preActionIxs: [],
             swapIxs,
             lookupTables,
@@ -694,7 +699,7 @@ async function getAdjustLeverageIxns({ owner, kaminoMarket, debtTokenMint, collT
         }
         // 5. Get swap ixns
         const { swapIxs, lookupTables } = await withdrawSwapper(swapInputs, initialInputs.klendAccounts, initialInputs.swapQuote);
-        const ixs = await buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeRefreshConfig, initialInputs.collIsKtoken, {
+        const ixs = await buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, initialInputs.calcs, initialInputs.strategy, scopeFeed, initialInputs.collIsKtoken, {
             preActionIxs: [],
             swapIxs,
             lookupTables,
@@ -710,7 +715,7 @@ 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 buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns, useV2Ixs) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -765,10 +770,9 @@ async function buildIncreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
         ];
     }
     const atasAndCreateIxns = (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: budgetIxns.length + atasAndCreateIxns.length, // TODO: how about user metadata ixns
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -780,33 +784,39 @@ 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)
+    const depositAction = await classes_1.KaminoAction.buildDepositTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.adjustDepositPosition, collReserve.stats.decimals).floor().toString(), collTokenMint, owner, obligation, useV2Ixs, 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);
+    referrer, currentSlot, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     // 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)
+    const borrowAction = await classes_1.KaminoAction.buildBorrowTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.borrowAmount, debtReserve.stats.decimals).ceil().toString(), debtTokenMint, owner, obligation, useV2Ixs, 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);
+    referrer, currentSlot, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
     const ixs = !collIsKtoken
         ? [
-            ...scopeRefreshIxn,
             ...budgetIxns,
             ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
-            ...classes_1.KaminoAction.actionToIxs(depositAction),
-            ...classes_1.KaminoAction.actionToIxs(borrowAction),
+            ...depositAction.setupIxs,
+            ...depositAction.lendingIxs,
+            ...depositAction.cleanupIxs,
+            ...borrowAction.setupIxs,
+            ...borrowAction.lendingIxs,
+            ...borrowAction.cleanupIxs,
             ...swapInstructions,
             ...[flashRepayIxn],
         ]
         : [
-            ...scopeRefreshIxn,
             ...budgetIxns,
             ...atasAndCreateIxns.map((x) => x.createAtaIx),
             ...[flashBorrowIxn],
             ...swapInstructions,
-            ...classes_1.KaminoAction.actionToIxs(depositAction),
-            ...classes_1.KaminoAction.actionToIxs(borrowAction),
+            ...depositAction.setupIxs,
+            ...depositAction.lendingIxs,
+            ...depositAction.cleanupIxs,
+            ...borrowAction.setupIxs,
+            ...borrowAction.lendingIxs,
+            ...borrowAction.cleanupIxs,
             ...[flashRepayIxn],
         ];
     return ixs;
@@ -814,7 +824,7 @@ 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 buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, debtTokenMint, obligation, referrer, currentSlot, calcs, strategy, scopeFeed, collIsKtoken, swapQuoteIxs, budgetAndPriorityFeeIxns, useV2Ixs) {
     const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
     const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
     const debtTokenAta = (0, spl_token_1.getAssociatedTokenAddressSync)(debtTokenMint, owner, false, debtReserve.getLiquidityTokenProgram());
@@ -879,10 +889,9 @@ async function buildDecreaseLeverageIxns(owner, kaminoMarket, collTokenMint, deb
         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()));
     }
-    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: budgetIxns.length + atasAndCreateIxns.length + fillWsolAtaIxns.length,
         walletPublicKey: owner,
         lendingMarketAuthority: kaminoMarket.getLendingMarketAuthority(),
         lendingMarketAddress: kaminoMarket.getAddress(),
@@ -895,45 +904,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)
+    const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
+    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, 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)
-    referrer);
+    referrer, scopeRefresh);
     // 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)
+    const withdrawAction = await classes_1.KaminoAction.buildWithdrawTxns(kaminoMarket, (0, classes_2.numberToLamportsDecimal)(calcs.withdrawAmountWithSlippageAndFlashLoanFee, collReserve.stats.decimals).ceil().toString(), collTokenMint, owner, obligation, useV2Ixs, 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);
+    referrer, currentSlot, { includeScopeRefresh: true, scopeFeed: scopeFeed });
     const swapInstructions = (0, utils_1.removeBudgetAndAtaIxns)(swapQuoteIxs.swapIxs, []);
     const ixns = [
-        ...scopeRefreshIxn,
         ...budgetIxns,
         ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...fillWsolAtaIxns,
         ...[flashBorrowIxn],
-        ...classes_1.KaminoAction.actionToIxs(repayAction),
-        ...classes_1.KaminoAction.actionToIxs(withdrawAction),
+        ...repayAction.setupIxs,
+        ...repayAction.lendingIxs,
+        ...repayAction.cleanupIxs,
+        ...withdrawAction.setupIxs,
+        ...withdrawAction.lendingIxs,
+        ...withdrawAction.cleanupIxs,
         ...swapInstructions,
         ...[flashRepayIxn],
         ...closeWsolAtaIxns,
     ];
     return ixns;
 }
-const getScopeRefreshIx = async (market, collReserve, debtReserve, obligation, scopeRefreshConfig) => {
-    const allReserves = obligation && (0, classes_1.isKaminoObligation)(obligation)
-        ? new utils_1.PublicKeySet([
-            ...obligation.getDeposits().map((x) => x.reserveAddress),
-            ...obligation.getBorrows().map((x) => x.reserveAddress),
-            collReserve.address,
-            debtReserve.address,
-        ]).toArray()
-        : new utils_1.PublicKeySet([collReserve.address, debtReserve.address]).toArray();
-    const tokenIds = (0, classes_1.getTokenIdsForScopeRefresh)(market, allReserves);
-    const scopeRefreshIxns = [];
-    if (tokenIds.length > 0 && scopeRefreshConfig) {
-        scopeRefreshIxns.push(await scopeRefreshConfig.scope.refreshPriceListIx({
-            feed: scopeRefreshConfig.scopeFeed,
-        }, tokenIds));
-    }
-    return scopeRefreshIxns;
-};
-exports.getScopeRefreshIx = getScopeRefreshIx;
 //# sourceMappingURL=operations.js.map