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

package/src/leverage/calcs.ts

@@ -35,6 +35,7 @@ export interface LeverageFormsCalcsArgs {
   targetLeverage: Decimal;
   activeTab: FormTabs;
   flashBorrowReserveFlashLoanFeePercentage: Decimal;
+  borrowFee: Decimal;
   debtBorrowFactorPct: Decimal;
   priceCollToDebt: Decimal;
   priceDebtToColl: Decimal;
@@ -62,6 +63,7 @@ export async function calculateMultiplyEffects(
     targetLeverage,
     activeTab,
     flashBorrowReserveFlashLoanFeePercentage,
+    borrowFee,
     debtBorrowFactorPct,
     priceCollToDebt,
     priceDebtToColl,
@@ -80,6 +82,7 @@ export async function calculateMultiplyEffects(
     selectedTokenMint,
     collTokenMint: collTokenMint,
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage,
+    borrowFee,
   });
 
   // calculate estimations for withdraw operation
@@ -106,6 +109,7 @@ export async function calculateMultiplyEffects(
     totalDeposited: new Decimal(deposited),
     totalBorrowed: new Decimal(borrowed),
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage, // TODO: is this the right flash borrow?
+    borrowFee,
   });
 
   if (logEstimations) {
@@ -191,11 +195,13 @@ export const calcBorrowAmount = ({
   targetLeverage,
   priceCollToDebt,
   flashBorrowFee,
+  borrowFee,
 }: {
   depositTokenAmount: Decimal;
   targetLeverage: Decimal;
   priceCollToDebt: Decimal;
   flashBorrowFee: Decimal;
+  borrowFee: Decimal;
 }) => {
   const initialCollAmountInCollToken = depositTokenAmount;
 
@@ -204,7 +210,8 @@ export const calcBorrowAmount = ({
   const finalDebtAmountInDebtToken = finalDebtAmountInCollToken.mul(priceCollToDebt);
 
   const flashFeeFactor = new Decimal(1).add(flashBorrowFee);
-  const debtTokenToBorrow = finalDebtAmountInDebtToken.mul(flashFeeFactor);
+  const borrowFeeFactor = new Decimal(1).add(borrowFee);
+  const debtTokenToBorrow = finalDebtAmountInDebtToken.mul(flashFeeFactor).mul(borrowFeeFactor);
 
   return debtTokenToBorrow;
 };
@@ -274,6 +281,7 @@ export function calcWithdrawAmounts(params: WithdrawParams): WithdrawResult {
     priceCollToDebt: new Decimal(priceCollToDebt),
     targetLeverage: new Decimal(targetLeverage),
     flashBorrowFee: new Decimal(0),
+    borrowFee: new Decimal(0),
   });
 
   const adjustDepositPosition = currentDepositPosition.minus(targetDeposit);
@@ -293,6 +301,7 @@ interface UseEstimateAdjustAmountsProps {
   totalDeposited: Decimal;
   totalBorrowed: Decimal;
   flashLoanFee: Decimal;
+  borrowFee: Decimal;
 }
 
 /**
@@ -303,7 +312,7 @@ interface UseEstimateAdjustAmountsProps {
  */
 export const estimateAdjustMode = (
   priceCollToDebt: Decimal,
-  { targetLeverage, totalDeposited, totalBorrowed, flashLoanFee }: UseEstimateAdjustAmountsProps
+  { targetLeverage, totalDeposited, totalBorrowed, flashLoanFee, borrowFee }: UseEstimateAdjustAmountsProps
 ) => {
   return calcAdjustAmounts({
     currentBorrowPosition: totalBorrowed,
@@ -311,6 +320,7 @@ export const estimateAdjustMode = (
     priceCollToDebt,
     targetLeverage,
     flashLoanFee,
+    borrowFee,
   });
 };
 
@@ -320,6 +330,7 @@ export interface AdjustLeverageParams {
   currentDepositPosition: Decimal;
   priceCollToDebt: Decimal;
   flashLoanFee: Decimal;
+  borrowFee: Decimal;
 }
 
 interface AdjustLeverageResult {
@@ -343,6 +354,7 @@ export function calcAdjustAmounts({
   currentDepositPosition,
   priceCollToDebt,
   flashLoanFee,
+  borrowFee,
 }: AdjustLeverageParams): AdjustLeverageResult {
   const initialDeposit = currentDepositPosition.minus(currentBorrowPosition.div(priceCollToDebt));
   const targetDeposit = initialDeposit.mul(targetLeverage);
@@ -352,6 +364,7 @@ export function calcAdjustAmounts({
     priceCollToDebt: new Decimal(priceCollToDebt),
     targetLeverage: new Decimal(targetLeverage),
     flashBorrowFee: flashLoanFee,
+    borrowFee,
   });
 
   const adjustDepositPosition = targetDeposit.minus(currentDepositPosition);
@@ -371,6 +384,7 @@ interface UseTransactionInfoStats {
   selectedTokenMint: PublicKey;
   collTokenMint: PublicKey;
   flashLoanFee: Decimal;
+  borrowFee: Decimal;
   slippagePct?: Decimal;
 }
 
@@ -384,6 +398,7 @@ export const estimateDepositMode = ({
   selectedTokenMint,
   collTokenMint,
   flashLoanFee,
+  borrowFee,
   slippagePct = new Decimal(0),
 }: UseTransactionInfoStats) => {
   const isDepositingCollToken = selectedTokenMint.equals(collTokenMint);
@@ -398,6 +413,7 @@ export const estimateDepositMode = ({
     targetLeverage: new Decimal(targetLeverage),
     priceCollToDebt: new Decimal(priceCollToDebt),
     flashBorrowFee: new Decimal(flashLoanFee),
+    borrowFee: new Decimal(borrowFee),
   });
 
   const slippageFactor = new Decimal(1).add(slippagePct.div(new Decimal(100)));

package/src/leverage/operations.ts

@@ -6,8 +6,6 @@ import {
   KaminoObligation,
   KaminoReserve,
   lamportsToNumberDecimal as fromLamports,
-  getTokenIdsForScopeRefresh,
-  isKaminoObligation,
 } from '../classes';
 import { getFlashLoanInstructions } from './instructions';
 
@@ -17,9 +15,7 @@ import {
   MultiplyObligation,
   ObligationType,
   ObligationTypeTag,
-  PublicKeySet,
   SOL_DECIMALS,
-  ScopePriceRefreshConfig,
   U64_MAX,
   createAtasIdempotent,
   getAssociatedTokenAddress,
@@ -84,7 +80,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   selectedTokenMint,
   kamino,
   obligationTypeTagOverride,
-  scopeRefreshConfig,
+  scopeFeed,
   budgetAndPriorityFeeIxs,
   quoteBufferBps,
   priceAinB,
@@ -146,7 +142,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -313,7 +309,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
   selectedTokenMint,
   kamino,
   obligationTypeTagOverride,
-  scopeRefreshConfig,
+  scopeFeed,
   budgetAndPriorityFeeIxs,
   quoteBufferBps,
   priceAinB,
@@ -338,7 +334,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     selectedTokenMint,
     kamino,
     obligationTypeTagOverride,
-    scopeRefreshConfig,
+    scopeFeed,
     budgetAndPriorityFeeIxs,
     quoteBufferBps,
     priceAinB,
@@ -390,7 +386,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     referrer,
     currentSlot,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     initialInputs.calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -421,7 +417,7 @@ async function buildDepositWithLeverageIxns(
   referrer: PublicKey,
   currentSlot: number,
   depositTokenIsSol: boolean,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   calcs: DepositLeverageCalcsResult,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
@@ -446,7 +442,7 @@ async function buildDepositWithLeverageIxns(
     debtReserve.getLiquidityTokenProgram()
   );
 
-  // 1. Create atas & budget ixns
+  // 1. Create atas & budget txns
   let mintsToCreateAtas: Array<{ mint: PublicKey; tokenProgram: PublicKey }>;
   if (collIsKtoken) {
     const secondTokenAta = strategy!.strategy.tokenAMint.equals(debtTokenMint)
@@ -507,13 +503,10 @@ async function buildDepositWithLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await 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 } = 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(),
@@ -530,6 +523,7 @@ async function buildDepositWithLeverageIxns(
   });
 
   // 3. Deposit initial tokens + borrowed tokens into reserve
+  const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
   const kaminoDepositAndBorrowAction = await KaminoAction.buildDepositAndBorrowTxns(
     market,
     toLamports(!collIsKtoken ? calcs.collTokenToDeposit : calcs.collTokenToDeposit, collReserve.stats.decimals)
@@ -543,14 +537,14 @@ async function buildDepositWithLeverageIxns(
     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
     referrer,
-    currentSlot
+    currentSlot,
+    scopeRefresh
   );
 
   // 4. Swap
@@ -559,18 +553,18 @@ async function buildDepositWithLeverageIxns(
 
   if (!collIsKtoken) {
     return [
-      ...scopeRefreshIxn,
       ...budgetIxns,
       ...atasAndCreateIxns.map((x) => x.createAtaIx),
       ...fillWsolAtaIxns,
       ...[flashBorrowIxn],
-      ...KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
+      ...kaminoDepositAndBorrowAction.setupIxs,
+      ...KaminoAction.actionToLendingIxs(kaminoDepositAndBorrowAction),
+      ...kaminoDepositAndBorrowAction.cleanupIxs,
       ...swapInstructions,
       ...[flashRepayIxn],
     ];
   } else {
     return [
-      ...scopeRefreshIxn,
       ...budgetIxns,
       ...atasAndCreateIxns.map((x) => x.createAtaIx),
       ...fillWsolAtaIxns,
@@ -601,7 +595,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   selectedTokenMint,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -647,7 +641,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
     currentSlot,
     isClosingPosition,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -735,7 +729,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   selectedTokenMint,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -764,7 +758,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     selectedTokenMint,
     budgetAndPriorityFeeIxs,
     kamino,
-    scopeRefreshConfig,
+    scopeFeed,
     quoteBufferBps,
     isKtoken,
     quoter,
@@ -810,7 +804,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     currentSlot,
     isClosingPosition,
     depositTokenIsSol,
-    scopeRefreshConfig,
+    scopeFeed,
     initialInputs.calcs,
     budgetAndPriorityFeeIxs,
     {
@@ -842,7 +836,7 @@ export async function buildWithdrawWithLeverageIxns(
   currentSlot: number,
   isClosingPosition: boolean,
   depositTokenIsSol: boolean,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   calcs: WithdrawLeverageCalcsResult,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
@@ -916,7 +910,7 @@ export async function buildWithdrawWithLeverageIxns(
 
   const budgetIxns = budgetAndPriorityFeeIxs || 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: TransactionInstruction[] = [];
   if (debtTokenMint.equals(NATIVE_MINT)) {
@@ -931,14 +925,11 @@ export async function buildWithdrawWithLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await 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 } = 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(),
@@ -951,7 +942,7 @@ export async function buildWithdrawWithLeverageIxns(
     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 KaminoAction.buildRepayAndWithdrawTxns(
     market,
     isClosingPosition ? U64_MAX : toLamports(calcs.repayAmount, debtReserve!.stats.decimals).floor().toString(),
@@ -964,24 +955,25 @@ export async function buildWithdrawWithLeverageIxns(
     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
+    referrer,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   return [
-    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndCreateIxns.map((x) => x.createAtaIx),
     ...fillWsolAtaIxns,
     ...[flashBorrowIxn],
-    ...KaminoAction.actionToIxs(repayAndWithdrawAction),
+    ...repayAndWithdrawAction.setupIxs,
+    ...KaminoAction.actionToLendingIxs(repayAndWithdrawAction),
+    ...repayAndWithdrawAction.cleanupIxs,
     ...swapInstructions,
     ...[flashRepayIxn],
     ...closeWsolAtaIxns,
@@ -1004,7 +996,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   slippagePct,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   isKtoken,
   quoter,
@@ -1024,10 +1016,13 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   const currentLeverage = obligation.refreshedStats.leverage;
   const isDepositViaLeverage = targetLeverage.gte(new Decimal(currentLeverage));
   let flashLoanFee;
+  let borrowFee;
   if (isDepositViaLeverage) {
     flashLoanFee = collReserve.getFlashLoanFee() || new Decimal(0);
+    borrowFee = collReserve.getBorrowFee() || new Decimal(0);
   } else {
     flashLoanFee = debtReserve.getFlashLoanFee() || new Decimal(0);
+    borrowFee = debtReserve.getBorrowFee() || new Decimal(0);
   }
 
   const { adjustDepositPosition, adjustBorrowPosition } = calcAdjustAmounts({
@@ -1036,6 +1031,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
     targetLeverage: targetLeverage,
     priceCollToDebt: priceCollToDebt,
     flashLoanFee: new Decimal(flashLoanFee),
+    borrowFee,
   });
 
   const isDeposit = adjustDepositPosition.gte(0) && adjustBorrowPosition.gte(0);
@@ -1067,7 +1063,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       currentSlot,
       calcs,
       strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       collIsKtoken,
       {
         preActionIxs: [],
@@ -1103,6 +1099,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       targetLeverage: targetLeverage,
       priceCollToDebt: new Decimal(1).div(swapQuote.priceAInB),
       flashLoanFee: new Decimal(flashLoanFee),
+      borrowFee,
     });
 
     const calcsQuotePrice = await adjustDepositLeverageCalcs(
@@ -1171,7 +1168,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       currentSlot,
       calcs,
       strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       collIsKtoken,
       {
         preActionIxs: [],
@@ -1207,6 +1204,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
       targetLeverage: targetLeverage,
       priceCollToDebt: swapQuote.priceAInB,
       flashLoanFee: new Decimal(flashLoanFee),
+      borrowFee,
     });
 
     const calcsQuotePrice = adjustWithdrawLeverageCalcs(
@@ -1259,7 +1257,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
   slippagePct,
   budgetAndPriorityFeeIxs,
   kamino,
-  scopeRefreshConfig,
+  scopeFeed,
   quoteBufferBps,
   priceAinB,
   isKtoken,
@@ -1283,7 +1281,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
     slippagePct,
     budgetAndPriorityFeeIxs,
     kamino,
-    scopeRefreshConfig,
+    scopeFeed,
     quoteBufferBps,
     priceAinB,
     isKtoken,
@@ -1329,7 +1327,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
       currentSlot,
       initialInputs.calcs,
       initialInputs.strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       initialInputs.collIsKtoken,
       {
         preActionIxs: [],
@@ -1376,7 +1374,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
       currentSlot,
       initialInputs.calcs,
       initialInputs.strategy,
-      scopeRefreshConfig,
+      scopeFeed,
       initialInputs.collIsKtoken,
       {
         preActionIxs: [],
@@ -1409,7 +1407,7 @@ async function buildIncreaseLeverageIxns(
   currentSlot: number,
   calcs: AdjustLeverageCalcsResult,
   strategy: StrategyWithAddress | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
   budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
@@ -1481,17 +1479,9 @@ async function buildIncreaseLeverageIxns(
 
   const atasAndCreateIxns = createAtasIdempotent(owner, mintsToCreateAtas);
 
-  const scopeRefreshIxn = await getScopeRefreshIx(
-    kaminoMarket,
-    collReserve!,
-    debtReserve!,
-    obligation,
-    scopeRefreshConfig
-  );
-
   // 2. Create borrow flash loan instruction
   const { flashBorrowIxn, flashRepayIxn } = 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(),
@@ -1514,14 +1504,14 @@ async function buildIncreaseLeverageIxns(
     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
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   // 4. Borrow tokens in borrow token reserve that will be swapped to repay flash loan
@@ -1532,37 +1522,43 @@ async function buildIncreaseLeverageIxns(
     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
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   const ixs = !collIsKtoken
     ? [
-        ...scopeRefreshIxn,
         ...budgetIxns,
         ...atasAndCreateIxns.map((x) => x.createAtaIx),
         ...[flashBorrowIxn],
-        ...KaminoAction.actionToIxs(depositAction),
-        ...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,
-        ...KaminoAction.actionToIxs(depositAction),
-        ...KaminoAction.actionToIxs(borrowAction),
+        ...depositAction.setupIxs,
+        ...depositAction.lendingIxs,
+        ...depositAction.cleanupIxs,
+        ...borrowAction.setupIxs,
+        ...borrowAction.lendingIxs,
+        ...borrowAction.cleanupIxs,
         ...[flashRepayIxn],
       ];
 
@@ -1582,7 +1578,7 @@ async function buildDecreaseLeverageIxns(
   currentSlot: number,
   calcs: AdjustLeverageCalcsResult,
   strategy: StrategyWithAddress | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
   budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
@@ -1663,18 +1659,9 @@ async function buildDecreaseLeverageIxns(
     );
   }
 
-  const scopeRefreshIxn = await getScopeRefreshIx(
-    kaminoMarket,
-    collReserve!,
-    debtReserve!,
-    obligation,
-    scopeRefreshConfig
-  );
-
   // 3. Flash borrow & repay amount to repay (debt)
   const { flashBorrowIxn, flashRepayIxn } = 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(),
@@ -1688,6 +1675,7 @@ async function buildDecreaseLeverageIxns(
   });
 
   // 4. Actually do the repay of the flash borrowed amounts
+  const scopeRefresh = scopeFeed ? { includeScopeRefresh: true, scopeFeed: scopeFeed } : undefined;
   const repayAction = await KaminoAction.buildRepayTxns(
     kaminoMarket,
     toLamports(Decimal.abs(calcs.adjustBorrowPosition), debtReserve!.stats.decimals).floor().toString(),
@@ -1695,7 +1683,6 @@ async function buildDecreaseLeverageIxns(
     owner,
     obligation,
     useV2Ixs,
-    undefined,
     currentSlot,
     undefined,
     0,
@@ -1703,7 +1690,8 @@ async function buildDecreaseLeverageIxns(
     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)
@@ -1714,26 +1702,29 @@ async function buildDecreaseLeverageIxns(
     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
+    currentSlot,
+    { includeScopeRefresh: true, scopeFeed: scopeFeed! }
   );
 
   const swapInstructions = removeBudgetAndAtaIxns(swapQuoteIxs.swapIxs, []);
 
   const ixns = [
-    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndCreateIxns.map((x) => x.createAtaIx),
     ...fillWsolAtaIxns,
     ...[flashBorrowIxn],
-    ...KaminoAction.actionToIxs(repayAction),
-    ...KaminoAction.actionToIxs(withdrawAction),
+    ...repayAction.setupIxs,
+    ...repayAction.lendingIxs,
+    ...repayAction.cleanupIxs,
+    ...withdrawAction.setupIxs,
+    ...withdrawAction.lendingIxs,
+    ...withdrawAction.cleanupIxs,
     ...swapInstructions,
     ...[flashRepayIxn],
     ...closeWsolAtaIxns,
@@ -1741,36 +1732,3 @@ async function buildDecreaseLeverageIxns(
 
   return ixns;
 }
-
-export const getScopeRefreshIx = async (
-  market: KaminoMarket,
-  collReserve: KaminoReserve,
-  debtReserve: KaminoReserve,
-  obligation: KaminoObligation | ObligationType | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined
-): Promise<TransactionInstruction[]> => {
-  const allReserves =
-    obligation && isKaminoObligation(obligation)
-      ? new PublicKeySet<PublicKey>([
-          ...obligation.getDeposits().map((x) => x.reserveAddress),
-          ...obligation.getBorrows().map((x) => x.reserveAddress),
-          collReserve.address,
-          debtReserve.address,
-        ]).toArray()
-      : new PublicKeySet<PublicKey>([collReserve.address, debtReserve.address]).toArray();
-  const tokenIds = getTokenIdsForScopeRefresh(market, allReserves);
-
-  const scopeRefreshIxns: TransactionInstruction[] = [];
-  if (tokenIds.length > 0 && scopeRefreshConfig) {
-    scopeRefreshIxns.push(
-      await scopeRefreshConfig.scope.refreshPriceListIx(
-        {
-          feed: scopeRefreshConfig.scopeFeed,
-        },
-        tokenIds
-      )
-    );
-  }
-
-  return scopeRefreshIxns;
-};