@drift-labs/sdk 2.95.0-beta.12 → 2.95.0-beta.13

package/VERSION

@@ -1 +1 @@
-2.95.0-beta.12
+2.95.0-beta.13

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -25,11 +25,16 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotMarketAccountSubscribers: Map<number, AccountSubscriber<SpotMarketAccount>>;
     spotOracleMap: Map<number, PublicKey>;
     oracleSubscribers: Map<string, AccountSubscriber<OraclePriceData>>;
+    initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
+    initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
+    initialOraclePriceData: Map<string, OraclePriceData>;
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
     constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
+    setInitialData(): Promise<void>;
+    removeInitialData(): void;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;
     subscribeToSpotMarketAccounts(): Promise<boolean>;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -40,10 +40,13 @@ class WebSocketDriftClientAccountSubscriber {
             this.subscriptionPromiseResolver = res;
         });
         if (this.shouldFindAllMarketsAndOracles) {
-            const { perpMarketIndexes, spotMarketIndexes, oracleInfos } = await (0, config_1.findAllMarketAndOracles)(this.program);
+            const { perpMarketIndexes, perpMarketAccounts, spotMarketIndexes, spotMarketAccounts, oracleInfos, } = await (0, config_1.findAllMarketAndOracles)(this.program);
             this.perpMarketIndexes = perpMarketIndexes;
             this.spotMarketIndexes = spotMarketIndexes;
             this.oracleInfos = oracleInfos;
+            // front run and set the initial data here to save extra gma call in set initial data
+            this.initialPerpMarketAccountData = new Map(perpMarketAccounts.map((market) => [market.marketIndex, market]));
+            this.initialSpotMarketAccountData = new Map(spotMarketAccounts.map((market) => [market.marketIndex, market]));
         }
         const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
@@ -52,6 +55,8 @@ class WebSocketDriftClientAccountSubscriber {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
         });
+        // set initial data to avoid spamming getAccountInfo calls in webSocketAccountSubscriber
+        await this.setInitialData();
         await Promise.all([
             // subscribe to market accounts
             this.subscribeToPerpMarketAccounts(),
@@ -65,8 +70,40 @@ class WebSocketDriftClientAccountSubscriber {
         this.isSubscribing = false;
         this.isSubscribed = true;
         this.subscriptionPromiseResolver(true);
+        // delete initial data
+        this.removeInitialData();
         return true;
     }
+    async setInitialData() {
+        const connection = this.program.provider.connection;
+        if (!this.initialPerpMarketAccountData) {
+            const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) => (0, pda_1.getPerpMarketPublicKeySync)(this.program.programId, marketIndex));
+            const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(perpMarketPublicKeys);
+            this.initialPerpMarketAccountData = new Map(perpMarketAccountInfos.map((accountInfo) => {
+                const perpMarket = this.program.coder.accounts.decode('PerpMarket', accountInfo.data);
+                return [perpMarket.marketIndex, perpMarket];
+            }));
+        }
+        if (!this.initialSpotMarketAccountData) {
+            const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) => (0, pda_1.getSpotMarketPublicKeySync)(this.program.programId, marketIndex));
+            const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(spotMarketPublicKeys);
+            this.initialSpotMarketAccountData = new Map(spotMarketAccountInfos.map((accountInfo) => {
+                const spotMarket = this.program.coder.accounts.decode('SpotMarket', accountInfo.data);
+                return [spotMarket.marketIndex, spotMarket];
+            }));
+        }
+        const oracleAccountInfos = await connection.getMultipleAccountsInfo(this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey));
+        this.initialOraclePriceData = new Map(this.oracleInfos.map((oracleInfo, i) => {
+            const oracleClient = this.oracleClientCache.get(oracleInfo.source, connection, this.program);
+            const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(oracleAccountInfos[i].data);
+            return [oracleInfo.publicKey.toString(), oraclePriceData];
+        }));
+    }
+    removeInitialData() {
+        this.initialPerpMarketAccountData = new Map();
+        this.initialSpotMarketAccountData = new Map();
+        this.initialOraclePriceData = new Map();
+    }
     async subscribeToPerpMarketAccounts() {
         await Promise.all(this.perpMarketIndexes.map((marketIndex) => this.subscribeToPerpMarketAccount(marketIndex)));
         return true;
@@ -74,6 +111,7 @@ class WebSocketDriftClientAccountSubscriber {
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
+        accountSubscriber.setData(this.initialPerpMarketAccountData.get(marketIndex));
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -88,6 +126,7 @@ class WebSocketDriftClientAccountSubscriber {
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
+        accountSubscriber.setData(this.initialSpotMarketAccountData.get(marketIndex));
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -102,15 +141,17 @@ class WebSocketDriftClientAccountSubscriber {
         return true;
     }
     async subscribeToOracle(oracleInfo) {
+        const oracleString = oracleInfo.publicKey.toString();
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
         }, this.resubOpts, this.commitment);
+        accountSubscriber.setData(this.initialOraclePriceData.get(oracleString));
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');
         });
-        this.oracleSubscribers.set(oracleInfo.publicKey.toString(), accountSubscriber);
+        this.oracleSubscribers.set(oracleString, accountSubscriber);
         return true;
     }
     async unsubscribeFromMarketAccounts() {

package/lib/addresses/pda.d.ts

@@ -9,7 +9,9 @@ export declare function getUserAccountPublicKey(programId: PublicKey, authority:
 export declare function getUserAccountPublicKeySync(programId: PublicKey, authority: PublicKey, subAccountId?: number): PublicKey;
 export declare function getUserStatsAccountPublicKey(programId: PublicKey, authority: PublicKey): PublicKey;
 export declare function getPerpMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
+export declare function getPerpMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
+export declare function getSpotMarketPublicKeySync(programId: PublicKey, marketIndex: number): PublicKey;
 export declare function getSpotMarketVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundVaultPublicKey(programId: PublicKey, marketIndex: number): Promise<PublicKey>;
 export declare function getInsuranceFundStakeAccountPublicKey(programId: PublicKey, authority: PublicKey, marketIndex: number): PublicKey;

package/lib/addresses/pda.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
+exports.getTokenProgramForSpotMarket = exports.getPythPullOraclePublicKey = exports.getPrelaunchOraclePublicKey = exports.getProtocolIfSharesTransferConfigPublicKey = exports.getReferrerNamePublicKeySync = exports.getOpenbookV2FulfillmentConfigPublicKey = exports.getPhoenixFulfillmentConfigPublicKey = exports.getSerumFulfillmentConfigPublicKey = exports.getSerumSignerPublicKey = exports.getSerumOpenOrdersPublicKey = exports.getDriftSignerPublicKey = exports.getInsuranceFundStakeAccountPublicKey = exports.getInsuranceFundVaultPublicKey = exports.getSpotMarketVaultPublicKey = exports.getSpotMarketPublicKeySync = exports.getSpotMarketPublicKey = exports.getPerpMarketPublicKeySync = exports.getPerpMarketPublicKey = exports.getUserStatsAccountPublicKey = exports.getUserAccountPublicKeySync = exports.getUserAccountPublicKey = exports.getUserAccountPublicKeyAndNonce = exports.getDriftStateAccountPublicKey = exports.getDriftStateAccountPublicKeyAndNonce = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const spl_token_1 = require("@solana/spl-token");
@@ -69,6 +69,13 @@ async function getPerpMarketPublicKey(programId, marketIndex) {
     ], programId))[0];
 }
 exports.getPerpMarketPublicKey = getPerpMarketPublicKey;
+function getPerpMarketPublicKeySync(programId, marketIndex) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),
+        new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+    ], programId)[0];
+}
+exports.getPerpMarketPublicKeySync = getPerpMarketPublicKeySync;
 async function getSpotMarketPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
@@ -76,6 +83,13 @@ async function getSpotMarketPublicKey(programId, marketIndex) {
     ], programId))[0];
 }
 exports.getSpotMarketPublicKey = getSpotMarketPublicKey;
+function getSpotMarketPublicKeySync(programId, marketIndex) {
+    return web3_js_1.PublicKey.findProgramAddressSync([
+        Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
+        new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+    ], programId)[0];
+}
+exports.getSpotMarketPublicKeySync = getSpotMarketPublicKeySync;
 async function getSpotMarketVaultPublicKey(programId, marketIndex) {
     return (await web3_js_1.PublicKey.findProgramAddress([
         Buffer.from(anchor.utils.bytes.utf8.encode('spot_market_vault')),

package/lib/config.d.ts

@@ -1,3 +1,4 @@
+import { PerpMarketAccount, SpotMarketAccount } from '.';
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
@@ -44,7 +45,9 @@ export declare function getMarketsAndOraclesForSubscription(env: DriftEnv): {
 };
 export declare function findAllMarketAndOracles(program: Program): Promise<{
     perpMarketIndexes: number[];
+    perpMarketAccounts: PerpMarketAccount[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
+    spotMarketAccounts: SpotMarketAccount[];
 }>;
 export {};

package/lib/config.js

@@ -106,7 +106,9 @@ async function findAllMarketAndOracles(program) {
     }
     return {
         perpMarketIndexes,
+        perpMarketAccounts: perpMarketProgramAccounts.map((account) => account.account),
         spotMarketIndexes,
+        spotMarketAccounts: spotMarketProgramAccounts.map((account) => account.account),
         oracleInfos: Array.from(oracleInfos.values()),
     };
 }

package/package.json

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

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -13,6 +13,8 @@ import {
 	getDriftStateAccountPublicKey,
 	getSpotMarketPublicKey,
 	getPerpMarketPublicKey,
+	getPerpMarketPublicKeySync,
+	getSpotMarketPublicKeySync,
 } from '../addresses/pda';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { Commitment, PublicKey } from '@solana/web3.js';
@@ -50,6 +52,10 @@ export class WebSocketDriftClientAccountSubscriber
 	spotOracleMap = new Map<number, PublicKey>();
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 
+	initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
+	initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
+	initialOraclePriceData: Map<string, OraclePriceData>;
+
 	private isSubscribing = false;
 	private subscriptionPromise: Promise<boolean>;
 	private subscriptionPromiseResolver: (val: boolean) => void;
@@ -90,11 +96,23 @@ export class WebSocketDriftClientAccountSubscriber
 		});
 
 		if (this.shouldFindAllMarketsAndOracles) {
-			const { perpMarketIndexes, spotMarketIndexes, oracleInfos } =
-				await findAllMarketAndOracles(this.program);
+			const {
+				perpMarketIndexes,
+				perpMarketAccounts,
+				spotMarketIndexes,
+				spotMarketAccounts,
+				oracleInfos,
+			} = await findAllMarketAndOracles(this.program);
 			this.perpMarketIndexes = perpMarketIndexes;
 			this.spotMarketIndexes = spotMarketIndexes;
 			this.oracleInfos = oracleInfos;
+			// front run and set the initial data here to save extra gma call in set initial data
+			this.initialPerpMarketAccountData = new Map(
+				perpMarketAccounts.map((market) => [market.marketIndex, market])
+			);
+			this.initialSpotMarketAccountData = new Map(
+				spotMarketAccounts.map((market) => [market.marketIndex, market])
+			);
 		}
 
 		const statePublicKey = await getDriftStateAccountPublicKey(
@@ -115,6 +133,9 @@ export class WebSocketDriftClientAccountSubscriber
 			this.eventEmitter.emit('update');
 		});
 
+		// set initial data to avoid spamming getAccountInfo calls in webSocketAccountSubscriber
+		await this.setInitialData();
+
 		await Promise.all([
 			// subscribe to market accounts
 			this.subscribeToPerpMarketAccounts(),
@@ -132,9 +153,75 @@ export class WebSocketDriftClientAccountSubscriber
 		this.isSubscribed = true;
 		this.subscriptionPromiseResolver(true);
 
+		// delete initial data
+		this.removeInitialData();
+
 		return true;
 	}
 
+	async setInitialData(): Promise<void> {
+		const connection = this.program.provider.connection;
+
+		if (!this.initialPerpMarketAccountData) {
+			const perpMarketPublicKeys = this.perpMarketIndexes.map((marketIndex) =>
+				getPerpMarketPublicKeySync(this.program.programId, marketIndex)
+			);
+			const perpMarketAccountInfos = await connection.getMultipleAccountsInfo(
+				perpMarketPublicKeys
+			);
+			this.initialPerpMarketAccountData = new Map(
+				perpMarketAccountInfos.map((accountInfo) => {
+					const perpMarket = this.program.coder.accounts.decode(
+						'PerpMarket',
+						accountInfo.data
+					);
+					return [perpMarket.marketIndex, perpMarket];
+				})
+			);
+		}
+
+		if (!this.initialSpotMarketAccountData) {
+			const spotMarketPublicKeys = this.spotMarketIndexes.map((marketIndex) =>
+				getSpotMarketPublicKeySync(this.program.programId, marketIndex)
+			);
+			const spotMarketAccountInfos = await connection.getMultipleAccountsInfo(
+				spotMarketPublicKeys
+			);
+			this.initialSpotMarketAccountData = new Map(
+				spotMarketAccountInfos.map((accountInfo) => {
+					const spotMarket = this.program.coder.accounts.decode(
+						'SpotMarket',
+						accountInfo.data
+					);
+					return [spotMarket.marketIndex, spotMarket];
+				})
+			);
+		}
+
+		const oracleAccountInfos = await connection.getMultipleAccountsInfo(
+			this.oracleInfos.map((oracleInfo) => oracleInfo.publicKey)
+		);
+		this.initialOraclePriceData = new Map(
+			this.oracleInfos.map((oracleInfo, i) => {
+				const oracleClient = this.oracleClientCache.get(
+					oracleInfo.source,
+					connection,
+					this.program
+				);
+				const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
+					oracleAccountInfos[i].data
+				);
+				return [oracleInfo.publicKey.toString(), oraclePriceData];
+			})
+		);
+	}
+
+	removeInitialData() {
+		this.initialPerpMarketAccountData = new Map();
+		this.initialSpotMarketAccountData = new Map();
+		this.initialOraclePriceData = new Map();
+	}
+
 	async subscribeToPerpMarketAccounts(): Promise<boolean> {
 		await Promise.all(
 			this.perpMarketIndexes.map((marketIndex) =>
@@ -157,6 +244,9 @@ export class WebSocketDriftClientAccountSubscriber
 			this.resubOpts,
 			this.commitment
 		);
+		accountSubscriber.setData(
+			this.initialPerpMarketAccountData.get(marketIndex)
+		);
 		await accountSubscriber.subscribe((data: PerpMarketAccount) => {
 			this.eventEmitter.emit('perpMarketAccountUpdate', data);
 			this.eventEmitter.emit('update');
@@ -187,6 +277,9 @@ export class WebSocketDriftClientAccountSubscriber
 			this.resubOpts,
 			this.commitment
 		);
+		accountSubscriber.setData(
+			this.initialSpotMarketAccountData.get(marketIndex)
+		);
 		await accountSubscriber.subscribe((data: SpotMarketAccount) => {
 			this.eventEmitter.emit('spotMarketAccountUpdate', data);
 			this.eventEmitter.emit('update');
@@ -206,6 +299,7 @@ export class WebSocketDriftClientAccountSubscriber
 	}
 
 	async subscribeToOracle(oracleInfo: OracleInfo): Promise<boolean> {
+		const oracleString = oracleInfo.publicKey.toString();
 		const client = this.oracleClientCache.get(
 			oracleInfo.source,
 			this.program.provider.connection,
@@ -221,16 +315,13 @@ export class WebSocketDriftClientAccountSubscriber
 			this.resubOpts,
 			this.commitment
 		);
-
+		accountSubscriber.setData(this.initialOraclePriceData.get(oracleString));
 		await accountSubscriber.subscribe((data: OraclePriceData) => {
 			this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
 			this.eventEmitter.emit('update');
 		});
 
-		this.oracleSubscribers.set(
-			oracleInfo.publicKey.toString(),
-			accountSubscriber
-		);
+		this.oracleSubscribers.set(oracleString, accountSubscriber);
 		return true;
 	}
 

package/src/addresses/pda.ts

@@ -87,6 +87,19 @@ export async function getPerpMarketPublicKey(
 	)[0];
 }
 
+export function getPerpMarketPublicKeySync(
+	programId: PublicKey,
+	marketIndex: number
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('perp_market')),
+			new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+		],
+		programId
+	)[0];
+}
+
 export async function getSpotMarketPublicKey(
 	programId: PublicKey,
 	marketIndex: number
@@ -102,6 +115,19 @@ export async function getSpotMarketPublicKey(
 	)[0];
 }
 
+export function getSpotMarketPublicKeySync(
+	programId: PublicKey,
+	marketIndex: number
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('spot_market')),
+			new anchor.BN(marketIndex).toArrayLike(Buffer, 'le', 2),
+		],
+		programId
+	)[0];
+}
+
 export async function getSpotMarketVaultPublicKey(
 	programId: PublicKey,
 	marketIndex: number

package/src/config.ts

@@ -132,8 +132,10 @@ export function getMarketsAndOraclesForSubscription(env: DriftEnv): {
 
 export async function findAllMarketAndOracles(program: Program): Promise<{
 	perpMarketIndexes: number[];
+	perpMarketAccounts: PerpMarketAccount[];
 	spotMarketIndexes: number[];
 	oracleInfos: OracleInfo[];
+	spotMarketAccounts: SpotMarketAccount[];
 }> {
 	const perpMarketIndexes = [];
 	const spotMarketIndexes = [];
@@ -164,7 +166,13 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 
 	return {
 		perpMarketIndexes,
+		perpMarketAccounts: perpMarketProgramAccounts.map(
+			(account) => account.account
+		),
 		spotMarketIndexes,
+		spotMarketAccounts: spotMarketProgramAccounts.map(
+			(account) => account.account
+		),
 		oracleInfos: Array.from(oracleInfos.values()),
 	};
 }