@drift-labs/sdk 2.67.0-beta.1 → 2.67.0-beta.3

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/package.json

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

package/src/accounts/pollingDriftClientAccountSubscriber.ts

@@ -116,8 +116,8 @@ export class PollingDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		}
 
-		this.setPerpOracleMap();
-		this.setSpotOracleMap();
+		await this.setPerpOracleMap();
+		await this.setSpotOracleMap();
 
 		this.isSubscribing = false;
 		this.isSubscribed = subscriptionSucceeded;
@@ -389,7 +389,7 @@ export class PollingDriftClientAccountSubscriber
 		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
 		await this.addAccountToAccountLoader(accountToPoll);
-		this.setPerpOracleMap();
+		await this.setPerpOracleMap();
 		return true;
 	}
 
@@ -402,29 +402,60 @@ export class PollingDriftClientAccountSubscriber
 		}
 
 		this.addOracleToPoll(oracleInfo);
-		const oracleToPoll = this.oraclesToPoll.get(
-			oracleInfo.publicKey.toString()
-		);
+		const oracleString = oracleInfo.publicKey.toBase58();
+		const oracleToPoll = this.oraclesToPoll.get(oracleString);
 		await this.addOracleToAccountLoader(oracleToPoll);
+
+		await this.pauseForOracleToBeAdded(3, oracleString);
+
 		return true;
 	}
 
-	private setPerpOracleMap() {
+	private async pauseForOracleToBeAdded(
+		tries: number,
+		oracle: string
+	): Promise<void> {
+		let i = 0;
+		while (i < tries) {
+			await new Promise((r) =>
+				setTimeout(r, this.accountLoader.pollingFrequency)
+			);
+			if (this.accountLoader.bufferAndSlotMap.has(oracle)) {
+				return;
+			}
+			i++;
+		}
+		console.log(`Pausing to find oracle ${oracle} failed`);
+	}
+
+	private async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
+			if (!this.oracles.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: perpMarketAccount.amm.oracleSource,
+				});
+			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
 	}
 
-	private setSpotOracleMap() {
+	private async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			const spotMarketAccount = spotMarket.data;
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
+			if (!this.oracles.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: spotMarketAccount.oracleSource,
+				});
+			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
 	}
@@ -481,18 +512,14 @@ export class PollingDriftClientAccountSubscriber
 	): 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();
-			});
+			this.setPerpOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);
@@ -506,14 +533,10 @@ export class PollingDriftClientAccountSubscriber
 		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();
-			});
+			this.setSpotOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -125,8 +125,8 @@ export class WebSocketDriftClientAccountSubscriber
 
 		this.eventEmitter.emit('update');
 
-		this.setPerpOracleMap();
-		this.setSpotOracleMap();
+		await this.setPerpOracleMap();
+		await this.setSpotOracleMap();
 
 		this.isSubscribing = false;
 		this.isSubscribed = true;
@@ -286,7 +286,7 @@ export class WebSocketDriftClientAccountSubscriber
 			return true;
 		}
 		const subscriptionSuccess = this.subscribeToSpotMarketAccount(marketIndex);
-		this.setSpotOracleMap();
+		await this.setSpotOracleMap();
 		return subscriptionSuccess;
 	}
 
@@ -295,7 +295,7 @@ export class WebSocketDriftClientAccountSubscriber
 			return true;
 		}
 		const subscriptionSuccess = this.subscribeToPerpMarketAccount(marketIndex);
-		this.setPerpOracleMap();
+		await this.setPerpOracleMap();
 		return subscriptionSuccess;
 	}
 
@@ -311,7 +311,7 @@ export class WebSocketDriftClientAccountSubscriber
 		return this.subscribeToOracle(oracleInfo);
 	}
 
-	private setPerpOracleMap() {
+	private async setPerpOracleMap() {
 		const perpMarkets = this.getMarketAccountsAndSlots();
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket) {
@@ -320,11 +320,17 @@ export class WebSocketDriftClientAccountSubscriber
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
 			const oracle = perpMarketAccount.amm.oracle;
+			if (!this.oracleSubscribers.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: perpMarket.data.amm.oracleSource,
+				});
+			}
 			this.perpOracleMap.set(perpMarketIndex, oracle);
 		}
 	}
 
-	private setSpotOracleMap() {
+	private async setSpotOracleMap() {
 		const spotMarkets = this.getSpotMarketAccountsAndSlots();
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket) {
@@ -333,6 +339,12 @@ export class WebSocketDriftClientAccountSubscriber
 			const spotMarketAccount = spotMarket.data;
 			const spotMarketIndex = spotMarketAccount.marketIndex;
 			const oracle = spotMarketAccount.oracle;
+			if (!this.oracleSubscribers.has(oracle.toBase58())) {
+				await this.addOracle({
+					publicKey: oracle,
+					source: spotMarketAccount.oracleSource,
+				});
+			}
 			this.spotOracleMap.set(spotMarketIndex, oracle);
 		}
 	}
@@ -400,12 +412,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 		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();
-			});
+			this.setPerpOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);
@@ -422,12 +429,7 @@ export class WebSocketDriftClientAccountSubscriber
 
 		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();
-			});
+			this.setSpotOracleMap();
 		}
 
 		return this.getOraclePriceDataAndSlot(oracle);

package/src/driftClient.ts

@@ -6183,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();