@drift-labs/sdk 2.66.0-beta.4 → 2.67.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.66.0-beta.4
+2.67.0-beta.1

package/lib/accounts/pollingDriftClientAccountSubscriber.d.ts

@@ -23,7 +23,9 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     errorCallbackId?: string;
     state?: DataAndSlot<StateAccount>;
     perpMarket: Map<number, DataAndSlot<PerpMarketAccount>>;
+    perpOracleMap: Map<number, PublicKey>;
     spotMarket: Map<number, DataAndSlot<SpotMarketAccount>>;
+    spotOracleMap: Map<number, PublicKey>;
     oracles: Map<string, DataAndSlot<OraclePriceData>>;
     user?: DataAndSlot<UserAccount>;
     private isSubscribing;
@@ -47,6 +49,8 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    private setPerpOracleMap;
+    private setSpotOracleMap;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
@@ -54,5 +58,7 @@ export declare class PollingDriftClientAccountSubscriber implements DriftClientA
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency(pollingFrequency: number): void;
 }

package/lib/accounts/pollingDriftClientAccountSubscriber.js

@@ -15,7 +15,9 @@ class PollingDriftClientAccountSubscriber {
         this.accountsToPoll = new Map();
         this.oraclesToPoll = new Map();
         this.perpMarket = new Map();
+        this.perpOracleMap = new Map();
         this.spotMarket = new Map();
+        this.spotOracleMap = new Map();
         this.oracles = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -57,6 +59,8 @@ class PollingDriftClientAccountSubscriber {
         if (subscriptionSucceeded) {
             this.eventEmitter.emit('update');
         }
+        this.setPerpOracleMap();
+        this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = subscriptionSucceeded;
         this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -229,6 +233,7 @@ class PollingDriftClientAccountSubscriber {
         await this.addSpotMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
         await this.addAccountToAccountLoader(accountToPoll);
+        this.setSpotOracleMap();
         return true;
     }
     async addPerpMarket(marketIndex) {
@@ -239,6 +244,7 @@ class PollingDriftClientAccountSubscriber {
         await this.addPerpMarketAccountToPoll(marketIndex);
         const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
         await this.addAccountToAccountLoader(accountToPoll);
+        this.setPerpOracleMap();
         return true;
     }
     async addOracle(oracleInfo) {
@@ -251,6 +257,24 @@ class PollingDriftClientAccountSubscriber {
         await this.addOracleToAccountLoader(oracleToPoll);
         return true;
     }
+    setPerpOracleMap() {
+        const perpMarkets = this.getMarketAccountsAndSlots();
+        for (const perpMarket of perpMarkets) {
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            this.perpOracleMap.set(perpMarketIndex, oracle);
+        }
+    }
+    setSpotOracleMap() {
+        const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        for (const spotMarket of spotMarkets) {
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            this.spotOracleMap.set(spotMarketIndex, oracle);
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
@@ -282,6 +306,40 @@ class PollingDriftClientAccountSubscriber {
         }
         return this.oracles.get(oraclePublicKey.toString());
     }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        if (!perpMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: perpMarketAccount.data.amm.oracleSource,
+                publicKey: perpMarketAccount.data.amm.oracle,
+            }).then(() => {
+                this.setPerpOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        if (!spotMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: spotMarketAccount.data.oracleSource,
+                publicKey: spotMarketAccount.data.oracle,
+            }).then(() => {
+                this.setSpotOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
     updateAccountLoaderPollingFrequency(pollingFrequency) {
         this.accountLoader.updatePollingFrequency(pollingFrequency);
     }

package/lib/accounts/types.d.ts

@@ -47,6 +47,8 @@ export interface DriftClientAccountSubscriber {
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
     updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }
 export interface UserAccountEvents {

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -21,7 +21,9 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
     perpMarketAccountSubscribers: Map<number, AccountSubscriber<PerpMarketAccount>>;
+    perpOracleMap: Map<number, PublicKey>;
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
+    spotOracleMap: Map<number, PublicKey>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
     private isSubscribing;
     private subscriptionPromise;
@@ -42,6 +44,8 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     addSpotMarket(marketIndex: number): Promise<boolean>;
     addPerpMarket(marketIndex: number): Promise<boolean>;
     addOracle(oracleInfo: OracleInfo): Promise<boolean>;
+    private setPerpOracleMap;
+    private setSpotOracleMap;
     assertIsSubscribed(): void;
     getStateAccountAndSlot(): DataAndSlot<StateAccount>;
     getMarketAccountAndSlot(marketIndex: number): DataAndSlot<PerpMarketAccount> | undefined;
@@ -49,4 +53,6 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     getSpotMarketAccountAndSlot(marketIndex: number): DataAndSlot<SpotMarketAccount> | undefined;
     getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[];
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex: number): DataAndSlot<OraclePriceData> | undefined;
 }

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -13,7 +13,9 @@ class WebSocketDriftClientAccountSubscriber {
     constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
+        this.perpOracleMap = new Map();
         this.spotMarketAccountSubscribers = new Map();
+        this.spotOracleMap = new Map();
         this.oracleSubscribers = new Map();
         this.isSubscribing = false;
         this.isSubscribed = false;
@@ -57,6 +59,8 @@ class WebSocketDriftClientAccountSubscriber {
         // subscribe to oracles
         await this.subscribeToOracles();
         this.eventEmitter.emit('update');
+        this.setPerpOracleMap();
+        this.setSpotOracleMap();
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
@@ -152,13 +156,17 @@ class WebSocketDriftClientAccountSubscriber {
         if (this.spotMarketAccountSubscribers.has(marketIndex)) {
             return true;
         }
-        return this.subscribeToSpotMarketAccount(marketIndex);
+        const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
+        this.setSpotOracleMap();
+        return subscriptionSuccess;
     }
     async addPerpMarket(marketIndex) {
         if (this.perpMarketAccountSubscribers.has(marketIndex)) {
             return true;
         }
-        return this.subscribeToPerpMarketAccount(marketIndex);
+        const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
+        this.setPerpOracleMap();
+        return subscriptionSuccess;
     }
     async addOracle(oracleInfo) {
         if (this.oracleSubscribers.has(oracleInfo.publicKey.toString())) {
@@ -169,6 +177,30 @@ class WebSocketDriftClientAccountSubscriber {
         }
         return this.subscribeToOracle(oracleInfo);
     }
+    setPerpOracleMap() {
+        const perpMarkets = this.getMarketAccountsAndSlots();
+        for (const perpMarket of perpMarkets) {
+            if (!perpMarket) {
+                continue;
+            }
+            const perpMarketAccount = perpMarket.data;
+            const perpMarketIndex = perpMarketAccount.marketIndex;
+            const oracle = perpMarketAccount.amm.oracle;
+            this.perpOracleMap.set(perpMarketIndex, oracle);
+        }
+    }
+    setSpotOracleMap() {
+        const spotMarkets = this.getSpotMarketAccountsAndSlots();
+        for (const spotMarket of spotMarkets) {
+            if (!spotMarket) {
+                continue;
+            }
+            const spotMarketAccount = spotMarket.data;
+            const spotMarketIndex = spotMarketAccount.marketIndex;
+            const oracle = spotMarketAccount.oracle;
+            this.spotOracleMap.set(spotMarketIndex, oracle);
+        }
+    }
     assertIsSubscribed() {
         if (!this.isSubscribed) {
             throw new types_1.NotSubscribedError('You must call `subscribe` before using this function');
@@ -202,5 +234,39 @@ class WebSocketDriftClientAccountSubscriber {
         }
         return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
     }
+    getOraclePriceDataAndSlotForPerpMarket(marketIndex) {
+        const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+        const oracle = this.perpOracleMap.get(marketIndex);
+        if (!perpMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: perpMarketAccount.data.amm.oracleSource,
+                publicKey: perpMarketAccount.data.amm.oracle,
+            }).then(() => {
+                this.setPerpOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
+    getOraclePriceDataAndSlotForSpotMarket(marketIndex) {
+        const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+        const oracle = this.spotOracleMap.get(marketIndex);
+        if (!spotMarketAccount || !oracle) {
+            return undefined;
+        }
+        if (!spotMarketAccount.data.oracle.equals(oracle)) {
+            // If the oracle has changed, we need to update the oracle map in background
+            this.addOracle({
+                source: spotMarketAccount.data.oracleSource,
+                publicKey: spotMarketAccount.data.oracle,
+            }).then(() => {
+                this.setSpotOracleMap();
+            });
+        }
+        return this.getOraclePriceDataAndSlot(oracle);
+    }
 }
 exports.WebSocketDriftClientAccountSubscriber = WebSocketDriftClientAccountSubscriber;

package/lib/driftClient.js

@@ -3169,14 +3169,10 @@ class DriftClient {
         this.eventEmitter.emit(eventName, data);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        const oracleKey = this.getPerpMarketAccount(marketIndex).amm.oracle;
-        const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(marketIndex).data;
     }
     getOracleDataForSpotMarket(marketIndex) {
-        const oracleKey = this.getSpotMarketAccount(marketIndex).oracle;
-        const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(marketIndex).data;
     }
     async initializeInsuranceFundStake(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams), [], this.opts);

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.65.0",
+    "version": "2.66.0",
     "name": "drift",
     "instructions": [
         {

package/lib/user.js

@@ -717,7 +717,7 @@ class User {
                 marginRatio = numericConstants_1.ZERO;
             }
             const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
-            const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
+            const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
             let quotePrice;
             if (strict) {
                 quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
@@ -1198,7 +1198,7 @@ class User {
     calculateFreeCollateralDeltaForSpot(market, signedTokenAmount, marginCategory = 'Maintenance') {
         const tokenPrecision = new _1.BN(Math.pow(10, market.decimals));
         if (signedTokenAmount.gt(numericConstants_1.ZERO)) {
-            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price, market, marginCategory);
+            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, this.driftClient.getOracleDataForSpotMarket(market.marketIndex).price, market, marginCategory);
             return numericConstants_1.QUOTE_PRECISION.mul(assetWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
                 .mul(signedTokenAmount)
@@ -1320,7 +1320,7 @@ class User {
      */
     getMaxTradeSizeUSDCForSpot(targetMarketIndex, direction, currentQuoteAssetValue, currentSpotMarketNetValue) {
         const market = this.driftClient.getSpotMarketAccount(targetMarketIndex);
-        const oraclePrice = this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price;
+        const oraclePrice = this.driftClient.getOracleDataForSpotMarket(targetMarketIndex).price;
         currentQuoteAssetValue = this.getSpotMarketAssetValue(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         currentSpotMarketNetValue =
             currentSpotMarketNetValue !== null && currentSpotMarketNetValue !== void 0 ? currentSpotMarketNetValue : this.getSpotPositionValue(targetMarketIndex);
@@ -1872,12 +1872,12 @@ class User {
         for (const perpPosition of this.getActivePerpPositions()) {
             const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
             const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
-            const oraclePriceData = this.driftClient.getOraclePriceDataAndSlot(perpMarket.amm.oracle).data;
+            const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
             const oraclePrice = oraclePriceData.price;
             const worstCaseBaseAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(settledLpPosition);
             const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio));
             const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
-            const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
+            const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
             const baseAssetValue = worstCaseBaseAmount
                 .abs()
                 .mul(oraclePrice)
@@ -1999,14 +1999,10 @@ class User {
         return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders).sub(currentPerpPositionValueUSDC);
     }
     getOracleDataForPerpMarket(marketIndex) {
-        const oracleKey = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
-        const oracleData = this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.driftClient.getOracleDataForPerpMarket(marketIndex);
     }
     getOracleDataForSpotMarket(marketIndex) {
-        const oracleKey = this.driftClient.getSpotMarketAccount(marketIndex).oracle;
-        const oracleData = this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
-        return oracleData;
+        return this.driftClient.getOracleDataForSpotMarket(marketIndex);
     }
 }
 exports.User = User;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.66.0-beta.4",
+	"version": "2.67.0-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -49,7 +49,9 @@ export class PollingDriftClientAccountSubscriber
 
 	state?: DataAndSlot<StateAccount>;
 	perpMarket = new Map<number, DataAndSlot<PerpMarketAccount>>();
+	perpOracleMap = new Map<number, PublicKey>();
 	spotMarket = new Map<number, DataAndSlot<SpotMarketAccount>>();
+	spotOracleMap = new Map<number, PublicKey>();
 	oracles = new Map<string, DataAndSlot<OraclePriceData>>();
 	user?: DataAndSlot<UserAccount>;
 
@@ -114,6 +116,9 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
+		this.setPerpOracleMap();
+		this.setSpotOracleMap();
+
 		this.isSubscribing = false;
 		this.isSubscribed = subscriptionSucceeded;
 		this.subscriptionPromiseResolver(subscriptionSucceeded);
@@ -367,6 +372,7 @@ export class PollingDriftClientAccountSubscriber
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
 
 		await this.addAccountToAccountLoader(accountToPoll);
+		this.setSpotOracleMap();
 		return true;
 	}
 
@@ -383,6 +389,7 @@ export class PollingDriftClientAccountSubscriber
 		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
 		await this.addAccountToAccountLoader(accountToPoll);
+		this.setPerpOracleMap();
 		return true;
 	}
 
@@ -402,6 +409,26 @@ export class PollingDriftClientAccountSubscriber
 		return true;
 	}
 
+	private setPerpOracleMap() {
+		const perpMarkets = this.getMarketAccountsAndSlots();
+		for (const perpMarket of perpMarkets) {
+			const perpMarketAccount = perpMarket.data;
+			const perpMarketIndex = perpMarketAccount.marketIndex;
+			const oracle = perpMarketAccount.amm.oracle;
+			this.perpOracleMap.set(perpMarketIndex, oracle);
+		}
+	}
+
+	private setSpotOracleMap() {
+		const spotMarkets = this.getSpotMarketAccountsAndSlots();
+		for (const spotMarket of spotMarkets) {
+			const spotMarketAccount = spotMarket.data;
+			const spotMarketIndex = spotMarketAccount.marketIndex;
+			const oracle = spotMarketAccount.oracle;
+			this.spotOracleMap.set(spotMarketIndex, oracle);
+		}
+	}
+
 	assertIsSubscribed(): void {
 		if (!this.isSubscribed) {
 			throw new NotSubscribedError(
@@ -449,6 +476,49 @@ export class PollingDriftClientAccountSubscriber
 		return this.oracles.get(oraclePublicKey.toString());
 	}
 
+	public getOraclePriceDataAndSlotForPerpMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined {
+		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+		const oracle = this.perpOracleMap.get(marketIndex);
+		if (!perpMarketAccount || !oracle) {
+			return undefined;
+		}
+
+		if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+			// If the oracle has changed, we need to update the oracle map in background
+			this.addOracle({
+				source: perpMarketAccount.data.amm.oracleSource,
+				publicKey: perpMarketAccount.data.amm.oracle,
+			}).then(() => {
+				this.setPerpOracleMap();
+			});
+		}
+
+		return this.getOraclePriceDataAndSlot(oracle);
+	}
+
+	public getOraclePriceDataAndSlotForSpotMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined {
+		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+		const oracle = this.spotOracleMap.get(marketIndex);
+		if (!spotMarketAccount || !oracle) {
+			return undefined;
+		}
+		if (!spotMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed, we need to update the oracle map in background
+			this.addOracle({
+				source: spotMarketAccount.data.oracleSource,
+				publicKey: spotMarketAccount.data.oracle,
+			}).then(() => {
+				this.setSpotOracleMap();
+			});
+		}
+
+		return this.getOraclePriceDataAndSlot(oracle);
+	}
+
 	public updateAccountLoaderPollingFrequency(pollingFrequency: number): void {
 		this.accountLoader.updatePollingFrequency(pollingFrequency);
 	}

package/src/accounts/types.ts

@@ -71,6 +71,12 @@ export interface DriftClientAccountSubscriber {
 	getOraclePriceDataAndSlot(
 		oraclePublicKey: PublicKey
 	): DataAndSlot<OraclePriceData> | undefined;
+	getOraclePriceDataAndSlotForPerpMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined;
+	getOraclePriceDataAndSlotForSpotMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined;
 
 	updateAccountLoaderPollingFrequency?: (pollingFrequency: number) => void;
 }

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -41,10 +41,12 @@ export class WebSocketDriftClientAccountSubscriber
 		number,
 		AccountSubscriber<PerpMarketAccount>
 	>();
+	perpOracleMap = new Map<number, PublicKey>();
 	spotMarketAccountSubscribers = new Map<
 		number,
 		AccountSubscriber<SpotMarketAccount>
 	>();
+	spotOracleMap = new Map<number, PublicKey>();
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 
 	private isSubscribing = false;
@@ -123,6 +125,9 @@ export class WebSocketDriftClientAccountSubscriber
 
 		this.eventEmitter.emit('update');
 
+		this.setPerpOracleMap();
+		this.setSpotOracleMap();
+
 		this.isSubscribing = false;
 		this.isSubscribed = true;
 		this.subscriptionPromiseResolver(true);
@@ -280,14 +285,18 @@ export class WebSocketDriftClientAccountSubscriber
 		if (this.spotMarketAccountSubscribers.has(marketIndex)) {
 			return true;
 		}
-		return this.subscribeToSpotMarketAccount(marketIndex);
+		const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
+		this.setSpotOracleMap();
+		return subscriptionSuccess;
 	}
 
 	async addPerpMarket(marketIndex: number): Promise<boolean> {
 		if (this.perpMarketAccountSubscribers.has(marketIndex)) {
 			return true;
 		}
-		return this.subscribeToPerpMarketAccount(marketIndex);
+		const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
+		this.setPerpOracleMap();
+		return subscriptionSuccess;
 	}
 
 	async addOracle(oracleInfo: OracleInfo): Promise<boolean> {
@@ -302,6 +311,32 @@ export class WebSocketDriftClientAccountSubscriber
 		return this.subscribeToOracle(oracleInfo);
 	}
 
+	private setPerpOracleMap() {
+		const perpMarkets = this.getMarketAccountsAndSlots();
+		for (const perpMarket of perpMarkets) {
+			if (!perpMarket) {
+				continue;
+			}
+			const perpMarketAccount = perpMarket.data;
+			const perpMarketIndex = perpMarketAccount.marketIndex;
+			const oracle = perpMarketAccount.amm.oracle;
+			this.perpOracleMap.set(perpMarketIndex, oracle);
+		}
+	}
+
+	private setSpotOracleMap() {
+		const spotMarkets = this.getSpotMarketAccountsAndSlots();
+		for (const spotMarket of spotMarkets) {
+			if (!spotMarket) {
+				continue;
+			}
+			const spotMarketAccount = spotMarket.data;
+			const spotMarketIndex = spotMarketAccount.marketIndex;
+			const oracle = spotMarketAccount.oracle;
+			this.spotOracleMap.set(spotMarketIndex, oracle);
+		}
+	}
+
 	assertIsSubscribed(): void {
 		if (!this.isSubscribed) {
 			throw new NotSubscribedError(
@@ -353,4 +388,48 @@ export class WebSocketDriftClientAccountSubscriber
 		}
 		return this.oracleSubscribers.get(oraclePublicKey.toString()).dataAndSlot;
 	}
+
+	public getOraclePriceDataAndSlotForPerpMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined {
+		const perpMarketAccount = this.getMarketAccountAndSlot(marketIndex);
+		const oracle = this.perpOracleMap.get(marketIndex);
+		if (!perpMarketAccount || !oracle) {
+			return undefined;
+		}
+
+		if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
+			// If the oracle has changed, we need to update the oracle map in background
+			this.addOracle({
+				source: perpMarketAccount.data.amm.oracleSource,
+				publicKey: perpMarketAccount.data.amm.oracle,
+			}).then(() => {
+				this.setPerpOracleMap();
+			});
+		}
+
+		return this.getOraclePriceDataAndSlot(oracle);
+	}
+
+	public getOraclePriceDataAndSlotForSpotMarket(
+		marketIndex: number
+	): DataAndSlot<OraclePriceData> | undefined {
+		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
+		const oracle = this.spotOracleMap.get(marketIndex);
+		if (!spotMarketAccount || !oracle) {
+			return undefined;
+		}
+
+		if (!spotMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed, we need to update the oracle map in background
+			this.addOracle({
+				source: spotMarketAccount.data.oracleSource,
+				publicKey: spotMarketAccount.data.oracle,
+			}).then(() => {
+				this.setSpotOracleMap();
+			});
+		}
+
+		return this.getOraclePriceDataAndSlot(oracle);
+	}
 }

package/src/driftClient.ts

@@ -5873,17 +5873,15 @@ export class DriftClient {
 	}
 
 	public getOracleDataForPerpMarket(marketIndex: number): OraclePriceData {
-		const oracleKey = this.getPerpMarketAccount(marketIndex).amm.oracle;
-		const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-
-		return oracleData;
+		return this.accountSubscriber.getOraclePriceDataAndSlotForPerpMarket(
+			marketIndex
+		).data;
 	}
 
 	public getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
-		const oracleKey = this.getSpotMarketAccount(marketIndex).oracle;
-		const oracleData = this.getOraclePriceDataAndSlot(oracleKey).data;
-
-		return oracleData;
+		return this.accountSubscriber.getOraclePriceDataAndSlotForSpotMarket(
+			marketIndex
+		).data;
 	}
 
 	public async initializeInsuranceFundStake(

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.65.0",
+  "version": "2.66.0",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -1307,9 +1307,9 @@ export class User {
 			const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
 				market.quoteSpotMarketIndex
 			);
-			const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(
-				quoteSpotMarket.oracle
-			).data;
+			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
+				QUOTE_SPOT_MARKET_INDEX
+			);
 
 			let quotePrice;
 			if (strict) {
@@ -2205,7 +2205,7 @@ export class User {
 		if (signedTokenAmount.gt(ZERO)) {
 			const assetWeight = calculateAssetWeight(
 				signedTokenAmount,
-				this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price,
+				this.driftClient.getOracleDataForSpotMarket(market.marketIndex).price,
 				market,
 				marginCategory
 			);
@@ -2388,9 +2388,8 @@ export class User {
 		currentSpotMarketNetValue?: BN
 	): BN {
 		const market = this.driftClient.getSpotMarketAccount(targetMarketIndex);
-		const oraclePrice = this.driftClient.getOraclePriceDataAndSlot(
-			market.oracle
-		).data.price;
+		const oraclePrice =
+			this.driftClient.getOracleDataForSpotMarket(targetMarketIndex).price;
 
 		currentQuoteAssetValue = this.getSpotMarketAssetValue(
 			QUOTE_SPOT_MARKET_INDEX
@@ -3401,9 +3400,9 @@ export class User {
 			const perpMarket = this.driftClient.getPerpMarketAccount(
 				perpPosition.marketIndex
 			);
-			const oraclePriceData = this.driftClient.getOraclePriceDataAndSlot(
-				perpMarket.amm.oracle
-			).data;
+			const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(
+				perpMarket.marketIndex
+			);
 			const oraclePrice = oraclePriceData.price;
 			const worstCaseBaseAmount =
 				calculateWorstCaseBaseAssetAmount(settledLpPosition);
@@ -3420,9 +3419,9 @@ export class User {
 			const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
 				perpMarket.quoteSpotMarketIndex
 			);
-			const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(
-				quoteSpotMarket.oracle
-			).data;
+			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
+				QUOTE_SPOT_MARKET_INDEX
+			);
 
 			const baseAssetValue = worstCaseBaseAmount
 				.abs()
@@ -3645,20 +3644,10 @@ export class User {
 	}
 
 	private getOracleDataForPerpMarket(marketIndex: number): OraclePriceData {
-		const oracleKey =
-			this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
-		const oracleData =
-			this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
-
-		return oracleData;
+		return this.driftClient.getOracleDataForPerpMarket(marketIndex);
 	}
 
 	private getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
-		const oracleKey = this.driftClient.getSpotMarketAccount(marketIndex).oracle;
-
-		const oracleData =
-			this.driftClient.getOraclePriceDataAndSlot(oracleKey).data;
-
-		return oracleData;
+		return this.driftClient.getOracleDataForSpotMarket(marketIndex);
 	}
 }