fix: methods for getting market and slot data bombing

Author: LukasDeco

sdk/scripts/client-test.ts

@@ -48,6 +48,13 @@ async function initializeGrpcDriftClientV2() {
 			'perpMarketAccountUpdate',
 			(data) => {
 				console.log('Perp market account update:', decodeName(data.name));
+				const perpMarketData = driftClient.getPerpMarketAccount(
+					data.marketIndex
+				);
+				console.log(
+					'Perp market data market index:',
+					perpMarketData?.marketIndex
+				);
 				perpMarketUpdateCount++;
 				if (
 					perpMarketUpdateCount >= 10 &&
@@ -64,6 +71,13 @@ async function initializeGrpcDriftClientV2() {
 			'spotMarketAccountUpdate',
 			(data) => {
 				console.log('Spot market account update:', decodeName(data.name));
+				const spotMarketData = driftClient.getSpotMarketAccount(
+					data.marketIndex
+				);
+				console.log(
+					'Spot market data market index:',
+					spotMarketData?.marketIndex
+				);
 				spotMarketUpdateCount++;
 				if (
 					perpMarketUpdateCount >= 10 &&

sdk/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -8,7 +8,12 @@ import {
 	getPerpMarketPublicKey,
 	getSpotMarketPublicKey,
 } from '../addresses/pda';
-import { DelistedMarketSetting, GrpcConfigs, ResubOpts } from './types';
+import {
+	DataAndSlot,
+	DelistedMarketSetting,
+	GrpcConfigs,
+	ResubOpts,
+} from './types';
 import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 import { grpcMultiAccountSubscriber } from './grpcMultiAccountSubscriber';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
@@ -19,6 +24,8 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 	private perpMarketsSubscriber?: grpcMultiAccountSubscriber<PerpMarketAccount>;
 	private spotMarketsSubscriber?: grpcMultiAccountSubscriber<SpotMarketAccount>;
 	private oracleMultiSubscriber?: grpcMultiAccountSubscriber<OraclePriceData>;
+	private perpMarketIndexToAccountPubkeyMap = new Map<number, PublicKey>();
+	private spotMarketIndexToAccountPubkeyMap = new Map<number, PublicKey>();
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
@@ -123,11 +130,39 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 		return true;
 	}
 
+	override getMarketAccountAndSlot(
+		marketIndex: number
+	): DataAndSlot<PerpMarketAccount> | undefined {
+		return this.perpMarketsSubscriber?.getAccountData(
+			this.perpMarketIndexToAccountPubkeyMap.get(marketIndex)
+		);
+	}
+
+	override getSpotMarketAccountAndSlot(
+		marketIndex: number
+	): DataAndSlot<SpotMarketAccount> | undefined {
+		return this.spotMarketsSubscriber?.getAccountData(
+			this.spotMarketIndexToAccountPubkeyMap.get(marketIndex)
+		);
+	}
+
 	override async subscribeToPerpMarketAccounts(): Promise<boolean> {
-		const perpMarketPubkeys = await Promise.all(
-			this.perpMarketIndexes.map((marketIndex) =>
-				getPerpMarketPublicKey(this.program.programId, marketIndex)
-			)
+		const perpMarketIndexToAccountPubkeys: Array<[number, PublicKey]> =
+			await Promise.all(
+				this.perpMarketIndexes.map(async (marketIndex) => [
+					marketIndex,
+					await getPerpMarketPublicKey(this.program.programId, marketIndex),
+				])
+			);
+		for (const [
+			marketIndex,
+			accountPubkey,
+		] of perpMarketIndexToAccountPubkeys) {
+			this.perpMarketIndexToAccountPubkeyMap.set(marketIndex, accountPubkey);
+		}
+
+		const perpMarketPubkeys = perpMarketIndexToAccountPubkeys.map(
+			([_, accountPubkey]) => accountPubkey
 		);
 
 		this.perpMarketsSubscriber =
@@ -151,6 +186,11 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 					}
 				}
 			);
+
+		for (const data of this.initialPerpMarketAccountData.values()) {
+			this.perpMarketsSubscriber.setAccountData(data.pubkey, data);
+		}
+
 		await this.perpMarketsSubscriber.subscribe(
 			perpMarketPubkeys,
 			(_accountId, data) => {
@@ -166,10 +206,22 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 	}
 
 	override async subscribeToSpotMarketAccounts(): Promise<boolean> {
-		const spotMarketPubkeys = await Promise.all(
-			this.spotMarketIndexes.map((marketIndex) =>
-				getSpotMarketPublicKey(this.program.programId, marketIndex)
-			)
+		const spotMarketIndexToAccountPubkeys: Array<[number, PublicKey]> =
+			await Promise.all(
+				this.spotMarketIndexes.map(async (marketIndex) => [
+					marketIndex,
+					await getSpotMarketPublicKey(this.program.programId, marketIndex),
+				])
+			);
+		for (const [
+			marketIndex,
+			accountPubkey,
+		] of spotMarketIndexToAccountPubkeys) {
+			this.spotMarketIndexToAccountPubkeyMap.set(marketIndex, accountPubkey);
+		}
+
+		const spotMarketPubkeys = spotMarketIndexToAccountPubkeys.map(
+			([_, accountPubkey]) => accountPubkey
 		);
 
 		this.spotMarketsSubscriber =
@@ -193,6 +245,11 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 					}
 				}
 			);
+
+		for (const data of this.initialSpotMarketAccountData.values()) {
+			this.spotMarketsSubscriber.setAccountData(data.pubkey, data);
+		}
+
 		await this.spotMarketsSubscriber.subscribe(
 			spotMarketPubkeys,
 			(_accountId, data) => {
@@ -263,6 +320,13 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 				}
 			);
 
+		for (const data of this.initialOraclePriceData.entries()) {
+			this.oracleMultiSubscriber.setAccountData(
+				new PublicKey(data[0]),
+				data[1]
+			);
+		}
+
 		await this.oracleMultiSubscriber.subscribe(
 			oraclePubkeys,
 			(accountId, data) => {

sdk/src/accounts/grpcMultiAccountSubscriber.ts

@@ -11,7 +11,7 @@ import {
 	SubscribeUpdate,
 	createClient,
 } from '../isomorphic/grpc';
-import { GrpcConfigs, ResubOpts } from './types';
+import { DataAndSlot, GrpcConfigs, ResubOpts } from './types';
 
 interface AccountInfoLike {
 	owner: PublicKey;
@@ -42,6 +42,8 @@ export class grpcMultiAccountSubscriber<T> {
 		(data: T, context: Context, buffer: Buffer) => void
 	>();
 
+	private dataMap = new Map<string, DataAndSlot<T>>();
+
 	private constructor(
 		client: Client,
 		commitmentLevel: CommitmentLevel,
@@ -91,6 +93,14 @@ export class grpcMultiAccountSubscriber<T> {
 		);
 	}
 
+	setAccountData(accountPubkey: PublicKey, data: T, slot?: number): void {
+		this.dataMap.set(accountPubkey.toBase58(), { data, slot });
+	}
+
+	getAccountData(accountPubkey: PublicKey): DataAndSlot<T> | undefined {
+		return this.dataMap.get(accountPubkey.toBase58());
+	}
+
 	async subscribe(
 		accounts: PublicKey[],
 		onChange: (