@drift-labs/sdk 2.67.0-beta.0 → 2.67.0-beta.2

package/lib/oracles/switchboardClient.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="node" />
+import { Connection, PublicKey } from '@solana/web3.js';
+import { OracleClient, OraclePriceData } from './types';
+import { BorshAccountsCoder } from '@coral-xyz/anchor';
+export declare class SwitchboardClient implements OracleClient {
+    connection: Connection;
+    coder: BorshAccountsCoder;
+    constructor(connection: Connection);
+    getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
+    getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
+}

package/lib/oracles/switchboardClient.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SwitchboardClient = void 0;
+const numericConstants_1 = require("../constants/numericConstants");
+const switchboard_json_1 = __importDefault(require("../idl/switchboard.json"));
+const anchor_1 = require("@coral-xyz/anchor");
+class SwitchboardClient {
+    constructor(connection) {
+        this.connection = connection;
+        this.coder = new anchor_1.BorshAccountsCoder(switchboard_json_1.default);
+    }
+    async getOraclePriceData(pricePublicKey) {
+        const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
+        return this.getOraclePriceDataFromBuffer(accountInfo.data);
+    }
+    getOraclePriceDataFromBuffer(buffer) {
+        const aggregatorAccountData = this.coder.decodeUnchecked('AggregatorAccountData', buffer);
+        const price = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.result);
+        const confidence = convertSwitchboardDecimal(aggregatorAccountData.latestConfirmedRound.stdDeviation);
+        const hasSufficientNumberOfDataPoints = aggregatorAccountData.latestConfirmedRound.numSuccess >=
+            aggregatorAccountData.minOracleResults;
+        const slot = aggregatorAccountData.latestConfirmedRound.roundOpenSlot;
+        return {
+            price,
+            slot,
+            confidence,
+            hasSufficientNumberOfDataPoints,
+        };
+    }
+}
+exports.SwitchboardClient = SwitchboardClient;
+function convertSwitchboardDecimal(switchboardDecimal) {
+    const switchboardPrecision = numericConstants_1.TEN.pow(new anchor_1.BN(switchboardDecimal.scale));
+    return switchboardDecimal.mantissa
+        .mul(numericConstants_1.PRICE_PRECISION)
+        .div(switchboardPrecision);
+}

package/lib/types.d.ts

@@ -143,6 +143,9 @@ export declare class OracleSource {
     static readonly PYTH_1M: {
         pyth1M: {};
     };
+    static readonly SWITCHBOARD: {
+        switchboard: {};
+    };
     static readonly QUOTE_ASSET: {
         quoteAsset: {};
     };

package/lib/types.js

@@ -95,7 +95,7 @@ exports.OracleSource = OracleSource;
 OracleSource.PYTH = { pyth: {} };
 OracleSource.PYTH_1K = { pyth1K: {} };
 OracleSource.PYTH_1M = { pyth1M: {} };
-// static readonly SWITCHBOARD = { switchboard: {} };
+OracleSource.SWITCHBOARD = { switchboard: {} };
 OracleSource.QUOTE_ASSET = { quoteAsset: {} };
 OracleSource.PYTH_STABLE_COIN = { pythStableCoin: {} };
 class OrderType {

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.67.0-beta.0",
+	"version": "2.67.0-beta.2",
 	"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(
@@ -6185,9 +6183,13 @@ export class DriftClient {
 			}
 		}
 
+		const userAccountExists =
+			!!this.getUser()?.accountSubscriber?.isSubscribed &&
+			(await this.checkIfAccountExists(this.getUser().userAccountPublicKey));
+
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: [this.getUserAccount()],
-			useMarketLastSlotCache: true,
+			userAccounts: userAccountExists ? [this.getUserAccount()] : [],
+			useMarketLastSlotCache: false,
 			writableSpotMarketIndexes: [marketIndex],
 		});
 

package/src/factory/oracleClient.ts

@@ -5,6 +5,7 @@ import { PythClient } from '../oracles/pythClient';
 // import { SwitchboardClient } from '../oracles/switchboardClient';
 import { QuoteAssetOracleClient } from '../oracles/quoteAssetOracleClient';
 import { BN } from '@coral-xyz/anchor';
+import { SwitchboardClient } from '../oracles/switchboardClient';
 
 export function getOracleClient(
 	oracleSource: OracleSource,
@@ -26,9 +27,9 @@ export function getOracleClient(
 		return new PythClient(connection, undefined, true);
 	}
 
-	// if (isVariant(oracleSource, 'switchboard')) {
-	// 	return new SwitchboardClient(connection);
-	// }
+	if (isVariant(oracleSource, 'switchboard')) {
+		return new SwitchboardClient(connection);
+	}
 
 	if (isVariant(oracleSource, 'quoteAsset')) {
 		return new QuoteAssetOracleClient();