@kamino-finance/klend-sdk 5.11.5-beta.0 → 5.11.6-beta.0

package/src/classes/action.ts

@@ -21,7 +21,6 @@ import BN from 'bn.js';
 import Decimal from 'decimal.js';
 import {
   borrowObligationLiquidity,
-  depositAndWithdraw,
   borrowObligationLiquidityV2,
   depositObligationCollateral,
   depositObligationCollateralV2,
@@ -42,7 +41,6 @@ import {
   RefreshObligationFarmsForReserveAccounts,
   RefreshObligationFarmsForReserveArgs,
   refreshReserve,
-  repayAndWithdrawAndRedeem,
   repayObligationLiquidity,
   repayObligationLiquidityV2,
   requestElevationGroup,
@@ -63,11 +61,11 @@ import {
   isNotNullPubkey,
   PublicKeySet,
   getAssociatedTokenAddress,
-  ScopePriceRefreshConfig,
+  ScopeRefresh,
   createAtasIdempotent,
   obligationFarmStatePda,
 } from '../utils';
-import { getTokenIdsForScopeRefresh, KaminoMarket } from './market';
+import { KaminoMarket } from './market';
 import { KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
 import { ReserveFarmKind } from '../idl_codegen/types';
@@ -75,7 +73,7 @@ import { farmsId } from '@kamino-finance/farms-sdk';
 import { Reserve } from '../idl_codegen/accounts';
 import { VanillaObligation } from '../utils/ObligationType';
 import { PROGRAM_ID } from '../lib';
-import { Scope } from '@kamino-finance/scope-sdk';
+import { U16_MAX } from '@kamino-finance/scope-sdk';
 
 const SOL_PADDING_FOR_INTEREST = new BN('1000000');
 
@@ -92,9 +90,7 @@ export type ActionType =
   | 'repayAndWithdraw'
   | 'refreshObligation'
   | 'requestElevationGroup'
-  | 'withdrawReferrerFees'
-  | 'repayAndWithdrawV2'
-  | 'depositAndWithdraw';
+  | 'withdrawReferrerFees';
 
 export type AuxiliaryIx = 'setup' | 'inBetween' | 'cleanup';
 
@@ -415,7 +411,6 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *before* the deposit
@@ -423,6 +418,7 @@ export class KaminoAction {
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
     overrideElevationGroupRequest: number | undefined = undefined // if set, when an elevationgroup request is made, it will use this value
   ) {
     const axn = await KaminoAction.initialize(
@@ -441,6 +437,16 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
     await axn.addSupportIxs(
       'deposit',
       includeAtaIxns,
@@ -448,7 +454,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       undefined,
       overrideElevationGroupRequest
@@ -463,10 +468,36 @@ export class KaminoAction {
     return axn;
   }
 
-  async addScopeRefreshIxs(scope: Scope, tokens: number[], feed: string = 'hubble') {
-    this.setupIxsLabels.unshift(`refreshScopePrices`);
-    this.setupIxs.unshift(
-      await scope.refreshPriceListIx(
+  getTokenIdsForScopeRefresh(kaminoMarket: KaminoMarket, reserves: PublicKey[]): number[] {
+    const tokenIds: number[] = [];
+
+    for (const reserveAddress of reserves) {
+      const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
+      if (!reserve) {
+        throw new Error(`Reserve not found for reserve ${reserveAddress.toBase58()}`);
+      }
+
+      if (!reserve.state.config.tokenInfo.scopeConfiguration.priceFeed.equals(PublicKey.default)) {
+        reserve.state.config.tokenInfo.scopeConfiguration.priceChain.map((x) => {
+          if (x !== U16_MAX) {
+            tokenIds.push(x);
+          }
+        });
+        reserve.state.config.tokenInfo.scopeConfiguration.twapChain.map((x) => {
+          if (x !== U16_MAX) {
+            tokenIds.push(x);
+          }
+        });
+      }
+    }
+
+    return tokenIds;
+  }
+
+  async addScopeRefreshIxs(tokens: number[], feed: string = 'hubble') {
+    this.preTxnIxsLabels.unshift(`refreshScopePrices`);
+    this.preTxnIxs.unshift(
+      await this.kaminoMarket.scope.refreshPriceListIx(
         {
           feed: feed,
         },
@@ -482,7 +513,6 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
@@ -490,6 +520,7 @@ export class KaminoAction {
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
     overrideElevationGroupRequest: number | undefined = undefined // if set, when an elevationgroup request is made, it will use this value
   ) {
     const axn = await KaminoAction.initialize(
@@ -507,16 +538,15 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
-    if (!axn.referrer.equals(PublicKey.default)) {
-      const referrerTokenState = referrerTokenStatePda(
-        axn.referrer,
-        axn.reserve.address,
-        axn.kaminoMarket.programId
-      )[0];
-      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-      if (!account) {
-        axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
-      }
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
     }
 
     await axn.addSupportIxs(
@@ -526,7 +556,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       undefined,
       overrideElevationGroupRequest
@@ -547,12 +576,12 @@ export class KaminoAction {
     mint: PublicKey,
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     referrer: PublicKey = PublicKey.default,
-    currentSlot: number = 0
+    currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initialize(
       'mint',
@@ -570,6 +599,17 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'mint',
       includeAtaIxns,
@@ -577,7 +617,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addDepositReserveLiquidityIx();
@@ -591,12 +630,12 @@ export class KaminoAction {
     mint: PublicKey,
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     referrer: PublicKey = PublicKey.default,
-    currentSlot: number = 0
+    currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initialize(
       'redeem',
@@ -614,6 +653,17 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'redeem',
       includeAtaIxns,
@@ -621,7 +671,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addRedeemReserveCollateralIx();
@@ -636,14 +685,14 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
-    currentSlot: number = 0
+    currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initialize(
       'depositCollateral',
@@ -661,6 +710,17 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'depositCollateral',
       includeAtaIxns,
@@ -668,7 +728,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -689,14 +748,14 @@ export class KaminoAction {
     payer: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
-    currentSlot: number = 0
+    currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initializeMultiTokenAction(
       kaminoMarket,
@@ -719,17 +778,18 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
-    if (!axn.referrer.equals(PublicKey.default)) {
-      const referrerTokenState = referrerTokenStatePda(
-        axn.referrer,
-        axn.outflowReserve!.address,
-        axn.kaminoMarket.programId
-      )[0];
-      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-      if (!account) {
-        axn.addInitReferrerTokenStateIx(axn.outflowReserve!, referrerTokenState);
-      }
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+      axn.outflowReserve!.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
     }
+
     await axn.addSupportIxs(
       'deposit',
       includeAtaIxns,
@@ -737,7 +797,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForDeposit,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -755,126 +814,6 @@ export class KaminoAction {
       useV2Ixs
     );
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-
-    // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
-    const allReserves = new PublicKeySet<PublicKey>([
-      ...axn.depositReserves,
-      ...axn.borrowReserves,
-      axn.reserve.address,
-      ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
-      ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
-    ]).toArray();
-    const tokenIds = getTokenIdsForScopeRefresh(axn.kaminoMarket, allReserves);
-
-    if (tokenIds.length > 0 && scopeRefreshConfig) {
-      await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
-    }
-    return axn;
-  }
-
-  static async buildDepositAndWithdrawV2Txns(
-    kaminoMarket: KaminoMarket,
-    depositAmount: string | BN,
-    depositMint: PublicKey,
-    withdrawAmount: string | BN,
-    withdrawMint: PublicKey,
-    payer: PublicKey,
-    currentSlot: number,
-    obligation: KaminoObligation | ObligationType,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata,
-    createLookupTable: boolean = true,
-    referrer: PublicKey = PublicKey.default
-  ) {
-    const axn = await KaminoAction.initializeMultiTokenAction(
-      kaminoMarket,
-      'depositAndWithdraw',
-      depositAmount,
-      depositMint,
-      withdrawMint,
-      payer,
-      payer,
-      obligation,
-      withdrawAmount,
-      referrer,
-      currentSlot
-    );
-    const addInitObligationForFarm = true;
-    const twoTokenAction = true;
-    if (extraComputeBudget > 0) {
-      axn.addComputeBudgetIxn(extraComputeBudget);
-    }
-
-    await axn.addSupportIxs(
-      'depositAndWithdraw',
-      includeAtaIxns,
-      requestElevationGroup,
-      includeUserMetadata,
-      addInitObligationForFarm,
-      true,
-      scopeRefreshConfig,
-      createLookupTable,
-      twoTokenAction
-    );
-    const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve!, axn.outflowAmount!);
-    axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
-
-    return axn;
-  }
-
-  static async buildRepayAndWithdrawV2Txns(
-    kaminoMarket: KaminoMarket,
-    repayAmount: string | BN,
-    repayMint: PublicKey,
-    withdrawAmount: string | BN,
-    withdrawMint: PublicKey,
-    payer: PublicKey,
-    currentSlot: number,
-    obligation: KaminoObligation | ObligationType,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
-    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
-    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
-    requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata,
-    createLookupTable: boolean = true,
-    referrer: PublicKey = PublicKey.default
-  ) {
-    const axn = await KaminoAction.initializeMultiTokenAction(
-      kaminoMarket,
-      'repayAndWithdrawV2',
-      repayAmount,
-      repayMint,
-      withdrawMint,
-      payer,
-      payer,
-      obligation,
-      withdrawAmount,
-      referrer,
-      currentSlot
-    );
-    const addInitObligationForFarm = true;
-    const twoTokenAction = true;
-    if (extraComputeBudget > 0) {
-      axn.addComputeBudgetIxn(extraComputeBudget);
-    }
-
-    await axn.addSupportIxs(
-      'repayAndWithdrawV2',
-      includeAtaIxns,
-      requestElevationGroup,
-      includeUserMetadata,
-      addInitObligationForFarm,
-      true,
-      scopeRefreshConfig,
-      createLookupTable,
-      twoTokenAction
-    );
-    const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve!, axn.outflowAmount!);
-    axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
-
     return axn;
   }
 
@@ -888,13 +827,13 @@ export class KaminoAction {
     currentSlot: number,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
     createLookupTable: boolean = true,
-    referrer: PublicKey = PublicKey.default
+    referrer: PublicKey = PublicKey.default,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initializeMultiTokenAction(
       kaminoMarket,
@@ -916,6 +855,18 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+      axn.outflowReserve!.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'repay',
       includeAtaIxns,
@@ -923,7 +874,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForRepay,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -943,19 +893,6 @@ export class KaminoAction {
       useV2Ixs
     );
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
-    // Create the scope refresh ixn in here to ensure it's the first ixn in the txn
-    const allReserves = new PublicKeySet<PublicKey>([
-      ...axn.depositReserves,
-      ...axn.borrowReserves,
-      axn.reserve.address,
-      ...(axn.outflowReserve ? [axn.outflowReserve.address] : []),
-      ...(axn.preLoadedDepositReservesSameTx ? axn.preLoadedDepositReservesSameTx : []),
-    ]).toArray();
-    const tokenIds = getTokenIdsForScopeRefresh(axn.kaminoMarket, allReserves);
-
-    if (tokenIds.length > 0 && scopeRefreshConfig) {
-      await axn.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
-    }
     return axn;
   }
 
@@ -966,7 +903,6 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *after* the withdraw
@@ -974,6 +910,7 @@ export class KaminoAction {
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh | undefined = undefined,
     overrideElevationGroupRequest?: number,
     // Optional customizations which may be needed if the obligation was mutated by some previous ixn.
     obligationCustomizations?: {
@@ -999,6 +936,17 @@ export class KaminoAction {
 
     axn.depositReserves.push(...(obligationCustomizations?.addedDepositReserves || []));
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'withdraw',
       includeAtaIxns,
@@ -1006,7 +954,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       false,
       overrideElevationGroupRequest
@@ -1046,7 +993,6 @@ export class KaminoAction {
     owner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     currentSlot: number,
     payer: PublicKey | undefined = undefined,
     extraComputeBudget: number = 1_000_000,
@@ -1054,7 +1000,8 @@ export class KaminoAction {
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true,
     createLookupTable: boolean = true,
-    referrer: PublicKey = PublicKey.default
+    referrer: PublicKey = PublicKey.default,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initialize(
       'repay',
@@ -1073,6 +1020,17 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'repay',
       includeAtaIxns,
@@ -1080,7 +1038,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -1103,7 +1060,6 @@ export class KaminoAction {
     obligationOwner: PublicKey,
     obligation: KaminoObligation | ObligationType,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup: boolean = false,
@@ -1111,7 +1067,8 @@ export class KaminoAction {
     createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     maxAllowedLtvOverridePercent: number = 0,
-    currentSlot: number = 0
+    currentSlot: number = 0,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
     const axn = await KaminoAction.initializeMultiTokenAction(
       kaminoMarket,
@@ -1132,6 +1089,18 @@ export class KaminoAction {
       axn.addComputeBudgetIxn(extraComputeBudget);
     }
 
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+      axn.outflowReserve!.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
     await axn.addSupportIxs(
       'liquidate',
       includeAtaIxns,
@@ -1139,7 +1108,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -1168,17 +1136,6 @@ export class KaminoAction {
     axn.preTxnIxs.push(...createAtaIxs);
     axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
 
-    if (!axn.referrer.equals(PublicKey.default)) {
-      const referrerTokenState = referrerTokenStatePda(
-        axn.referrer,
-        axn.reserve.address,
-        axn.kaminoMarket.programId
-      )[0];
-      const account = await axn.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
-      if (!account) {
-        axn.addInitReferrerTokenStateIx(axn.reserve, referrerTokenState);
-      }
-    }
     axn.addRefreshReserveIxs([axn.reserve.address]);
     axn.addWithdrawReferrerFeesIxs();
 
@@ -1367,11 +1324,14 @@ export class KaminoAction {
   addDepositIxV2() {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(
+            this.getObligationPda(),
+            this.reserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1432,11 +1392,14 @@ export class KaminoAction {
   addDepositObligationCollateralIxV2() {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(
+            this.getObligationPda(),
+            this.reserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1514,11 +1477,11 @@ export class KaminoAction {
 
     const farmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -1589,11 +1552,14 @@ export class KaminoAction {
   async addWithdrawIxV2(collateralAmount: BN) {
     const farmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(
+            this.getObligationPda(),
+            this.reserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1673,11 +1639,11 @@ export class KaminoAction {
 
     const farmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
           reserveFarmState: this.reserve.state.farmDebt,
         };
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -1713,208 +1679,6 @@ export class KaminoAction {
     this.lendingIxs.push(repayIx);
   }
 
-  addRepayAndWithdrawV2Ixs(withdrawCollateralAmount: BN) {
-    this.lendingIxsLabels.push(
-      `repayAndWithdrawAndRedeem(repayReserve=${this.reserve!.address})(withdrawReserve=${
-        this.outflowReserve!.address
-      })(obligation=${this.getObligationPda()})`
-    );
-
-    const depositReservesList = this.getAdditionalDepositReservesList();
-
-    const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-      return { pubkey: reserve, isSigner: false, isWritable: true };
-    });
-    const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-      return { pubkey: reserve, isSigner: false, isWritable: true };
-    });
-
-    if (!this.outflowAmount) {
-      throw new Error(`outflowAmount not set`);
-    }
-
-    if (!this.outflowReserve) {
-      throw new Error(`outflowReserve not set`);
-    }
-
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
-    const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
-      ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
-        }
-      : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.outflowReserve.state.farmCollateral,
-            this.getObligationPda()
-          ),
-          reserveFarmState: this.outflowReserve.state.farmCollateral,
-        };
-
-    const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
-      ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
-        }
-      : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
-          reserveFarmState: this.reserve.state.farmDebt,
-        };
-
-    const repayAndWithdrawIx = repayAndWithdrawAndRedeem(
-      {
-        repayAmount: this.amount,
-        withdrawCollateralAmount,
-      },
-      {
-        repayAccounts: {
-          owner: this.owner,
-          obligation: this.getObligationPda(),
-          lendingMarket: this.kaminoMarket.getAddress(),
-          repayReserve: this.reserve!.address,
-          reserveLiquidityMint: this.reserve.getLiquidityMint(),
-          userSourceLiquidity: this.userTokenAccountAddress,
-          reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
-          tokenProgram: this.reserve.getLiquidityTokenProgram(),
-          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
-        },
-        withdrawAccounts: {
-          owner: this.owner,
-          obligation: this.getObligationPda(),
-          lendingMarket: this.kaminoMarket.getAddress(),
-          lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-          withdrawReserve: this.outflowReserve.address,
-          reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-          reserveCollateralMint: this.outflowReserve.getCTokenMint(),
-          reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-          reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-          userDestinationLiquidity: this.additionalTokenAccountAddress,
-          placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-          collateralTokenProgram: TOKEN_PROGRAM_ID,
-          liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
-        },
-        collateralFarmsAccounts,
-        debtFarmsAccounts,
-        farmsProgram: farmsId,
-      },
-      this.kaminoMarket.programId
-    );
-
-    repayAndWithdrawIx.keys = repayAndWithdrawIx.keys.concat([
-      ...depositReserveAccountMetas,
-      ...borrowReserveAccountMetas,
-    ]);
-
-    this.lendingIxs.push(repayAndWithdrawIx);
-  }
-
-  addDepositAndWithdrawV2Ixs(withdrawCollateralAmount: BN) {
-    this.lendingIxsLabels.push(
-      `depositAndWithdrawV2(depositReserve=${this.reserve!.address})(withdrawReserve=${
-        this.outflowReserve!.address
-      })(obligation=${this.getObligationPda()})`
-    );
-
-    const depositReservesList = this.getAdditionalDepositReservesList();
-
-    const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-      return { pubkey: reserve, isSigner: false, isWritable: true };
-    });
-    const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
-      return { pubkey: reserve, isSigner: false, isWritable: true };
-    });
-
-    if (!this.outflowAmount) {
-      throw new Error(`outflowAmount not set`);
-    }
-
-    if (!this.outflowReserve) {
-      throw new Error(`outflowReserve not set`);
-    }
-
-    if (!this.additionalTokenAccountAddress) {
-      throw new Error(`additionalTokenAccountAddress not set`);
-    }
-
-    const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
-      ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
-        }
-      : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
-          reserveFarmState: this.reserve.state.farmCollateral,
-        };
-    const withdrawFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
-      ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
-        }
-      : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.outflowReserve.state.farmCollateral,
-            this.getObligationPda()
-          ),
-          reserveFarmState: this.outflowReserve.state.farmCollateral,
-        };
-
-    const depositAndWithdrawIx = depositAndWithdraw(
-      {
-        liquidityAmount: this.amount,
-        withdrawCollateralAmount,
-      },
-      {
-        depositAccounts: {
-          owner: this.owner,
-          obligation: this.getObligationPda(),
-          lendingMarket: this.kaminoMarket.getAddress(),
-          lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-          reserve: this.reserve.address,
-          reserveLiquidityMint: this.reserve.getLiquidityMint(),
-          reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-          reserveCollateralMint: this.reserve.getCTokenMint(),
-          reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
-          userSourceLiquidity: this.userTokenAccountAddress,
-          placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-          collateralTokenProgram: TOKEN_PROGRAM_ID,
-          liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
-        },
-        withdrawAccounts: {
-          owner: this.owner,
-          obligation: this.getObligationPda(),
-          lendingMarket: this.kaminoMarket.getAddress(),
-          lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-          withdrawReserve: this.outflowReserve.address,
-          reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-          reserveCollateralMint: this.outflowReserve.getCTokenMint(),
-          reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-          reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
-          userDestinationLiquidity: this.additionalTokenAccountAddress,
-          placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-          collateralTokenProgram: TOKEN_PROGRAM_ID,
-          liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
-        },
-        depositFarmsAccounts,
-        withdrawFarmsAccounts,
-        farmsProgram: farmsId,
-      },
-      this.kaminoMarket.programId
-    );
-
-    depositAndWithdrawIx.keys = depositAndWithdrawIx.keys.concat([
-      ...depositReserveAccountMetas,
-      ...borrowReserveAccountMetas,
-    ]);
-
-    this.lendingIxs.push(depositAndWithdrawIx);
-  }
-
   async addDepositAndBorrowIx() {
     this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
     this.lendingIxsLabels.push(`borrowObligationLiquidity`);
@@ -1996,11 +1760,14 @@ export class KaminoAction {
   async addDepositAndBorrowIxV2() {
     const collateralFarmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(
+            this.getObligationPda(),
+            this.reserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -2057,11 +1824,14 @@ export class KaminoAction {
 
     const debtFarmsAccounts = this.outflowReserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.outflowReserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(
+            this.getObligationPda(),
+            this.outflowReserve.state.farmDebt!
+          )[0],
           reserveFarmState: this.outflowReserve.state.farmDebt,
         };
 
@@ -2183,11 +1953,11 @@ export class KaminoAction {
 
     const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -2231,14 +2001,14 @@ export class KaminoAction {
 
     const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
-            this.outflowReserve.state.farmCollateral,
-            this.getObligationPda()
-          ),
+            this.getObligationPda(),
+            this.outflowReserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.outflowReserve.state.farmCollateral,
         };
 
@@ -2272,7 +2042,7 @@ export class KaminoAction {
     );
   }
 
-  addLiquidateIx(maxAllowedLtvOverridePercent: number = 0) {
+  async addLiquidateIx(maxAllowedLtvOverridePercent: number = 0) {
     this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
     if (!this.outflowReserve) {
       throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -2340,24 +2110,24 @@ export class KaminoAction {
 
     const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
-            this.outflowReserve.state.farmCollateral,
-            this.getObligationPda()
-          ),
+            this.getObligationPda(),
+            this.outflowReserve.state.farmCollateral
+          )[0],
           reserveFarmState: this.outflowReserve.state.farmCollateral,
         };
 
     const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
       ? {
-          obligationFarmUserState: this.kaminoMarket.programId,
-          reserveFarmState: this.kaminoMarket.programId,
+          obligationFarmUserState: PROGRAM_ID,
+          reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -2469,9 +2239,7 @@ export class KaminoAction {
         'repay',
         'depositAndBorrow',
         'repayAndWithdraw',
-        'repayAndWithdrawV2',
         'refreshObligation',
-        'depositAndWithdraw',
       ].includes(action)
     ) {
       // The support ixns in order are:
@@ -2489,17 +2257,12 @@ export class KaminoAction {
 
       let currentReserves: KaminoReserve[] = [];
 
-      if (
-        action === 'liquidate' ||
-        action === 'depositAndBorrow' ||
-        action === 'repayAndWithdraw' ||
-        action === 'repayAndWithdrawV2'
-      ) {
+      if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
         if (!this.outflowReserve) {
           throw new Error('outflowReserve is undefined');
         }
 
-        if (action === 'depositAndBorrow' || action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
+        if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
           currentReserves = [this.reserve, this.outflowReserve];
           if (action === 'depositAndBorrow') {
             if (this.obligation) {
@@ -2538,19 +2301,13 @@ export class KaminoAction {
           action === 'depositAndBorrow' ||
           action === 'depositCollateral' ||
           action === 'withdraw' ||
-          action === 'deposit' ||
-          action === 'depositAndWithdraw'
+          action === 'deposit'
         ) {
           await this.addInitObligationForFarm(this.reserve, ReserveFarmKind.Collateral, addAsSupportIx);
-          if (this.outflowReserve && action !== 'depositAndWithdraw') {
+          if (this.outflowReserve) {
             await this.addInitObligationForFarm(this.outflowReserve, ReserveFarmKind.Debt, addAsSupportIx);
           }
-        } else if (
-          action === 'repayAndWithdraw' ||
-          action === 'borrow' ||
-          action === 'repay' ||
-          action === 'repayAndWithdrawV2'
-        ) {
+        } else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
           // todo - probably don't need to add both debt and collateral for everything here
           await this.addInitObligationForFarm(this.reserve, ReserveFarmKind.Debt, addAsSupportIx);
           if (this.outflowReserve) {
@@ -2581,7 +2338,7 @@ export class KaminoAction {
       }
 
       if (requestElevationGroup) {
-        if (action === 'repay' || action === 'repayAndWithdrawV2') {
+        if (action === 'repay') {
           const repayObligationLiquidity = this.obligation!.borrows.get(this.reserve.address);
 
           if (!repayObligationLiquidity) {
@@ -2743,7 +2500,6 @@ export class KaminoAction {
     includeUserMetadata: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     createLookupTable: boolean,
     twoTokenAction: boolean = false,
     overrideElevationGroupRequest?: number
@@ -2764,6 +2520,13 @@ export class KaminoAction {
         this.addInitUserMetadataIxs(lookupTable);
       }
 
+      if (['borrow', 'withdrawReferrerFees'].includes(action)) {
+        await this.addInitReferrerTokenStateIx(this.reserve);
+      }
+      // depositAndBorrow
+      if (action === 'deposit' && this.outflowReserve) {
+        await this.addInitReferrerTokenStateIx(this.outflowReserve);
+      }
       await this.addInitObligationIxs();
     }
 
@@ -2777,19 +2540,6 @@ export class KaminoAction {
       twoTokenAction,
       overrideElevationGroupRequest
     );
-
-    const allReserves = new PublicKeySet<PublicKey>([
-      ...this.depositReserves,
-      ...this.borrowReserves,
-      this.reserve.address,
-      ...(this.outflowReserve ? [this.outflowReserve.address] : []),
-      ...(this.preLoadedDepositReservesSameTx ? this.preLoadedDepositReservesSameTx : []),
-    ]).toArray();
-    const tokenIds = getTokenIdsForScopeRefresh(this.kaminoMarket, allReserves);
-
-    if (tokenIds.length > 0 && scopeRefreshConfig) {
-      await this.addScopeRefreshIxs(scopeRefreshConfig.scope, tokenIds, scopeRefreshConfig.scopeFeed);
-    }
   }
 
   private static optionalAccount(pubkey: PublicKey, programId: PublicKey = PROGRAM_ID): PublicKey {
@@ -3009,7 +2759,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Collateral,
           kaminoReserve.state.farmCollateral,
-          obligationFarmStatePda(kaminoReserve.state.farmCollateral, this.getObligationPda()),
+          obligationFarmStatePda(this.getObligationPda(), kaminoReserve.state.farmCollateral)[0],
           kaminoReserve,
         ]);
       }
@@ -3017,7 +2767,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Debt,
           kaminoReserve.state.farmDebt,
-          obligationFarmStatePda(kaminoReserve.state.farmDebt, this.getObligationPda()),
+          obligationFarmStatePda(this.getObligationPda(), kaminoReserve.state.farmDebt)[0],
           kaminoReserve,
         ]);
       }
@@ -3101,18 +2851,18 @@ export class KaminoAction {
     const farms: [number, PublicKey, PublicKey][] = [];
 
     if (mode === ReserveFarmKind.Collateral && isNotNullPubkey(reserve.state.farmCollateral)) {
-      const pda = obligationFarmStatePda(reserve.state.farmCollateral, this.getObligationPda());
-      const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+      const userPda = obligationFarmStatePda(this.getObligationPda(), reserve.state.farmCollateral)[0];
+      const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
       if (!account) {
-        farms.push([ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
+        farms.push([ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, userPda]);
       }
     }
 
     if (mode === ReserveFarmKind.Debt && isNotNullPubkey(reserve.state.farmDebt)) {
-      const pda = obligationFarmStatePda(reserve.state.farmDebt, this.getObligationPda());
-      const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+      const userPda = obligationFarmStatePda(this.getObligationPda(), reserve.state.farmDebt)[0];
+      const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
       if (!account) {
-        farms.push([ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
+        farms.push([ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, userPda]);
       }
     }
 
@@ -3146,7 +2896,7 @@ export class KaminoAction {
     });
   }
 
-  private addInitObligationIxs() {
+  private async addInitObligationIxs() {
     if (!this.obligation) {
       const obligationPda = this.getObligationPda();
       const [userMetadataAddress, _bump] = userMetadataPda(this.owner, this.kaminoMarket.programId);
@@ -3198,21 +2948,29 @@ export class KaminoAction {
     this.setupIxsLabels.push(`initUserMetadata[${userMetadataAddress.toString()}]`);
   }
 
-  private addInitReferrerTokenStateIx(reserve: KaminoReserve, referrerTokenState: PublicKey) {
-    const initReferrerTokenStateIx = initReferrerTokenState(
-      {
-        lendingMarket: this.kaminoMarket.getAddress(),
-        payer: this.owner,
-        reserve: reserve.address,
-        referrer: this.referrer,
-        referrerTokenState,
-        rent: SYSVAR_RENT_PUBKEY,
-        systemProgram: SystemProgram.programId,
-      },
-      this.kaminoMarket.programId
-    );
-    this.setupIxs.unshift(initReferrerTokenStateIx);
-    this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
+  private async addInitReferrerTokenStateIx(reserve: KaminoReserve) {
+    if (this.referrer.equals(PublicKey.default)) {
+      return;
+    }
+
+    const referrerTokenState = referrerTokenStatePda(this.referrer, reserve.address, this.kaminoMarket.programId)[0];
+    const account = await this.kaminoMarket.getConnection().getAccountInfo(referrerTokenState);
+    if (!account) {
+      const initReferrerTokenStateIx = initReferrerTokenState(
+        {
+          lendingMarket: this.kaminoMarket.getAddress(),
+          payer: this.owner,
+          reserve: reserve.address,
+          referrer: this.referrer,
+          referrerTokenState,
+          rent: SYSVAR_RENT_PUBKEY,
+          systemProgram: SystemProgram.programId,
+        },
+        this.kaminoMarket.programId
+      );
+      this.setupIxs.unshift(initReferrerTokenStateIx);
+      this.setupIxsLabels.unshift(`InitReferrerTokenState[${referrerTokenState.toString()} res=${reserve.address}]`);
+    }
   }
 
   private addWithdrawReferrerFeesIxs() {
@@ -3361,7 +3119,7 @@ export class KaminoAction {
 
     let safeRepay = new BN(this.amount);
 
-    if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new BN(U64_MAX))) {
+    if (this.obligation && action === 'repay' && this.amount.eq(new BN(U64_MAX))) {
       const borrow = this.obligation.state.borrows.find(
         (borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString()
       );
@@ -3375,7 +3133,7 @@ export class KaminoAction {
         this.currentSlot,
         this.kaminoMarket.state.referralFeeBps
       );
-
+      // TODO: shouldn't this calc be added to all other stuff as well?
       safeRepay = new BN(
         Math.floor(
           KaminoObligation.getBorrowAmount(borrow)
@@ -3403,7 +3161,6 @@ export class KaminoAction {
     const sendAction =
       action === 'deposit' ||
       action === 'repay' ||
-      action === 'repayAndWithdrawV2' ||
       action === 'mint' ||
       (action === 'liquidate' && this.secondaryMint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
@@ -3513,7 +3270,7 @@ export class KaminoAction {
       additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
       primaryMint = inflowTokenMint;
       secondaryMint = outflowTokenMint;
-    } else if (action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2' || action === 'depositAndWithdraw') {
+    } else if (action === 'repayAndWithdraw') {
       primaryMint = inflowTokenMint;
       secondaryMint = outflowTokenMint;
       userTokenAccountAddress = userInflowTokenAccountAddress;