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

package/src/classes/action.ts

@@ -61,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';
@@ -73,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');
 
@@ -411,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
@@ -419,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(
@@ -437,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,
@@ -444,7 +454,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       undefined,
       overrideElevationGroupRequest
@@ -459,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,
         },
@@ -478,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,
@@ -486,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(
@@ -503,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(
@@ -522,7 +556,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       undefined,
       overrideElevationGroupRequest
@@ -543,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',
@@ -566,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,
@@ -573,7 +617,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addDepositReserveLiquidityIx();
@@ -587,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',
@@ -610,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,
@@ -617,7 +671,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addRedeemReserveCollateralIx();
@@ -632,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',
@@ -657,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,
@@ -664,7 +728,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -685,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,
@@ -715,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,
@@ -733,7 +797,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForDeposit,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -751,20 +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;
   }
 
@@ -778,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,
@@ -806,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,
@@ -813,7 +874,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForRepay,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -833,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;
   }
 
@@ -856,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
@@ -864,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?: {
@@ -889,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,
@@ -896,7 +954,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       false,
       overrideElevationGroupRequest
@@ -936,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,
@@ -944,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',
@@ -963,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,
@@ -970,7 +1038,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -993,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,
@@ -1001,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,
@@ -1022,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,
@@ -1029,7 +1108,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -1058,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();
 
@@ -1257,8 +1324,8 @@ 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(
@@ -1325,8 +1392,8 @@ 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(
@@ -1410,8 +1477,8 @@ 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.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1485,8 +1552,8 @@ 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(
@@ -1572,8 +1639,8 @@ 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.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1693,8 +1760,8 @@ 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(
@@ -1757,8 +1824,8 @@ 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(
@@ -1886,8 +1953,8 @@ 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.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -1934,8 +2001,8 @@ 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(
@@ -2043,8 +2110,8 @@ 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(
@@ -2056,8 +2123,8 @@ 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.getObligationPda(), this.reserve.state.farmDebt)[0],
@@ -2433,7 +2500,6 @@ export class KaminoAction {
     includeUserMetadata: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     createLookupTable: boolean,
     twoTokenAction: boolean = false,
     overrideElevationGroupRequest?: number
@@ -2454,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();
     }
 
@@ -2467,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 {
@@ -2888,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() {