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

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,6 +538,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(
       'borrow',
       includeAtaIxns,
@@ -510,7 +556,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       undefined,
       overrideElevationGroupRequest
@@ -531,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',
@@ -554,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,
@@ -561,7 +617,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addDepositReserveLiquidityIx();
@@ -575,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',
@@ -598,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,
@@ -605,7 +671,6 @@ export class KaminoAction {
       false,
       addInitObligationForFarm,
       false,
-      scopeRefreshConfig,
       false
     );
     axn.addRedeemReserveCollateralIx();
@@ -620,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',
@@ -645,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,
@@ -652,7 +728,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -673,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,
@@ -703,6 +778,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(
       'deposit',
       includeAtaIxns,
@@ -710,7 +797,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForDeposit,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -728,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;
   }
 
@@ -755,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,
@@ -783,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,
@@ -790,7 +874,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarmForRepay,
       useV2Ixs,
-      undefined,
       createLookupTable,
       twoTokenAction
     );
@@ -810,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;
   }
 
@@ -833,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
@@ -841,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?: {
@@ -866,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,
@@ -873,7 +954,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable,
       false,
       overrideElevationGroupRequest
@@ -913,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,
@@ -921,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',
@@ -940,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,
@@ -947,7 +1038,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -970,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,
@@ -978,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,
@@ -999,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,
@@ -1006,7 +1108,6 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       useV2Ixs,
-      scopeRefreshConfig,
       createLookupTable
     );
     if (useV2Ixs) {
@@ -2399,7 +2500,6 @@ export class KaminoAction {
     includeUserMetadata: boolean,
     addInitObligationForFarm: boolean,
     useV2Ixs: boolean,
-    scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
     createLookupTable: boolean,
     twoTokenAction: boolean = false,
     overrideElevationGroupRequest?: number
@@ -2440,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 {

package/src/classes/manager.ts

@@ -949,7 +949,7 @@ export class KaminoManager {
   }
 
   /**
-   * This returns an array of scope oracle configs to be used to set the scope price and twap oracles for a reserve
+   * This retruns an array of scope oracle configs to be used to set the scope price and twap oracles for a reserve
    * @param feed - scope feed to fetch prices from
    * @param cluster - cluster to fetch from, this should be left unchanged unless working on devnet or locally
    * @returns - an array of scope oracle configs

package/src/classes/market.ts

@@ -29,7 +29,7 @@ import Decimal from 'decimal.js';
 import { FarmState } from '@kamino-finance/farms-sdk';
 import { PROGRAM_ID } from '../idl_codegen/programId';
 import bs58 from 'bs58';
-import { OraclePrices, Scope, U16_MAX } from '@kamino-finance/scope-sdk';
+import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
 import { Fraction } from './fraction';
 import { chunks, KaminoPrices, MintToPriceMap } from '@kamino-finance/kliquidity-sdk';
 import { parseTokenSymbol, parseZeroPaddedUtf8 } from './utils';
@@ -59,6 +59,8 @@ export class KaminoMarket {
 
   readonly programId: PublicKey;
 
+  scope: Scope;
+
   private readonly recentSlotDurationMs: number;
 
   private constructor(
@@ -66,6 +68,7 @@ export class KaminoMarket {
     state: LendingMarket,
     marketAddress: string,
     reserves: Map<PublicKey, KaminoReserve>,
+    scope: Scope,
     recentSlotDurationMs: number,
     programId: PublicKey = PROGRAM_ID
   ) {
@@ -75,6 +78,7 @@ export class KaminoMarket {
     this.reserves = reserves;
     this.reservesActive = getReservesActive(this.reserves);
     this.programId = programId;
+    this.scope = scope;
     this.recentSlotDurationMs = recentSlotDurationMs;
   }
 
@@ -93,6 +97,7 @@ export class KaminoMarket {
     marketAddress: PublicKey,
     recentSlotDurationMs: number,
     programId: PublicKey = PROGRAM_ID,
+    setupLocalTest: boolean = false,
     withReserves: boolean = true
   ) {
     const market = await LendingMarket.fetch(connection, marketAddress, programId);
@@ -100,12 +105,26 @@ export class KaminoMarket {
     if (market === null) {
       return null;
     }
+    let scope: Scope;
+    if (!setupLocalTest) {
+      scope = new Scope('mainnet-beta', connection);
+    } else {
+      scope = new Scope('localnet', connection);
+    }
 
     const reserves = withReserves
       ? await getReservesForMarket(marketAddress, connection, programId, recentSlotDurationMs)
       : new Map<PublicKey, KaminoReserve>();
 
-    return new KaminoMarket(connection, market, marketAddress.toString(), reserves, recentSlotDurationMs, programId);
+    return new KaminoMarket(
+      connection,
+      market,
+      marketAddress.toString(),
+      reserves,
+      scope,
+      recentSlotDurationMs,
+      programId
+    );
   }
 
   async reload(): Promise<void> {
@@ -1167,9 +1186,9 @@ export class KaminoMarket {
   /**
    * Get all Scope prices used by all the market reserves
    */
-  async getAllScopePrices(scope: Scope, oraclePrices?: OraclePrices): Promise<KaminoPrices> {
+  async getAllScopePrices(oraclePrices?: OraclePrices): Promise<KaminoPrices> {
     if (!oraclePrices) {
-      oraclePrices = await scope.getOraclePrices();
+      oraclePrices = await this.scope.getOraclePrices();
     }
     const spot: MintToPriceMap = {};
     const twaps: MintToPriceMap = {};
@@ -1180,11 +1199,11 @@ export class KaminoMarket {
       const chain = reserve.state.config.tokenInfo.scopeConfiguration.priceChain;
       const twapChain = reserve.state.config.tokenInfo.scopeConfiguration.twapChain.filter((x) => x > 0);
       if (oracle && isNotNullPubkey(oracle) && chain && Scope.isScopeChainValid(chain)) {
-        const spotPrice = await scope.getPriceFromChain(chain, oraclePrices);
+        const spotPrice = await this.scope.getPriceFromChain(chain, oraclePrices);
         spot[tokenMint] = { price: spotPrice.price, name: tokenName };
       }
       if (oracle && isNotNullPubkey(oracle) && twapChain && Scope.isScopeChainValid(twapChain)) {
-        const twap = await scope.getPriceFromChain(twapChain, oraclePrices);
+        const twap = await this.scope.getPriceFromChain(twapChain, oraclePrices);
         twaps[tokenMint] = { price: twap.price, name: tokenName };
       }
     }
@@ -1508,34 +1527,6 @@ export function getReservesActive(reserves: Map<PublicKey, KaminoReserve>): Map<
   return reservesActive;
 }
 
-export function 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)) {
-      let x = 0;
-
-      while (reserve.state.config.tokenInfo.scopeConfiguration.priceChain[x] !== U16_MAX) {
-        tokenIds.push(reserve.state.config.tokenInfo.scopeConfiguration.priceChain[x]);
-        x++;
-      }
-
-      x = 0;
-      while (reserve.state.config.tokenInfo.scopeConfiguration.twapChain[x] !== U16_MAX) {
-        tokenIds.push(reserve.state.config.tokenInfo.scopeConfiguration.twapChain[x]);
-        x++;
-      }
-    }
-  }
-
-  return tokenIds;
-}
-
 export async function getReserveFromMintAndMarket(
   connection: Connection,
   market: KaminoMarket,

package/src/classes/obligation.ts

@@ -17,7 +17,6 @@ import {
   getObligationPdaWithArgs,
   getObligationType,
   isNotNullPubkey,
-  ObligationType,
   PubkeyHashMap,
   TOTAL_NUMBER_OF_IDS_TO_CHECK,
   U64_MAX,
@@ -1594,8 +1593,3 @@ export class KaminoObligation {
     }
   }
 }
-
-// Create a function that checks if an obligation is of type obligation or obligationType
-export function isKaminoObligation(obligation: KaminoObligation | ObligationType): obligation is KaminoObligation {
-  return 'obligationAddress' in obligation;
-}