@drift-labs/sdk 2.142.0-beta.14 → 2.142.0-beta.15

package/lib/node/accounts/grpcMultiAccountSubscriber.js

@@ -44,12 +44,13 @@ function commitmentLevelToCommitment(commitmentLevel) {
     }
 }
 class grpcMultiAccountSubscriber {
-    constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe) {
+    constructor(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap) {
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.subscribedAccounts = new Set();
         this.onChangeMap = new Map();
         this.dataMap = new Map();
+        this.accountPropsMap = new Map();
         this.client = client;
         this.commitmentLevel = commitmentLevel;
         this.accountName = accountName;
@@ -57,8 +58,9 @@ class grpcMultiAccountSubscriber {
         this.decodeBufferFn = decodeBuffer;
         this.resubOpts = resubOpts;
         this.onUnsubscribe = onUnsubscribe;
+        this.accountPropsMap = accountPropsMap;
     }
-    static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe) {
+    static async create(grpcConfigs, accountName, program, decodeBuffer, resubOpts, clientProp, onUnsubscribe, accountPropsMap) {
         var _a, _b;
         const client = clientProp
             ? clientProp
@@ -66,7 +68,7 @@ class grpcMultiAccountSubscriber {
         const commitmentLevel = 
         // @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
         (_b = grpcConfigs.commitmentLevel) !== null && _b !== void 0 ? _b : grpc_1.CommitmentLevel.CONFIRMED;
-        return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe);
+        return new grpcMultiAccountSubscriber(client, commitmentLevel, accountName, program, decodeBuffer, resubOpts, onUnsubscribe, accountPropsMap);
     }
     setAccountData(accountPubkey, data, slot) {
         this.dataMap.set(accountPubkey, { data, slot });
@@ -119,9 +121,9 @@ class grpcMultiAccountSubscriber {
         for (const pk of accounts) {
             const key = pk.toBase58();
             this.subscribedAccounts.add(key);
-            this.onChangeMap.set(key, (data, ctx, buffer) => {
+            this.onChangeMap.set(key, (data, ctx, buffer, accountProps) => {
                 this.setAccountData(key, data, ctx.slot);
-                onChange(new web3_js_1.PublicKey(key), data, ctx, buffer);
+                onChange(new web3_js_1.PublicKey(key), data, ctx, buffer, accountProps);
             });
         }
         this.stream =
@@ -163,21 +165,33 @@ class grpcMultiAccountSubscriber {
             };
             const context = { slot };
             const buffer = accountInfo.data;
-            const data = this.decodeBufferFn
-                ? this.decodeBufferFn(buffer, accountPubkey)
-                : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
-            const handler = this.onChangeMap.get(accountPubkey);
-            if (handler) {
-                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
-                    this.receivingData = true;
-                    clearTimeout(this.timeoutId);
-                    handler(data, context, buffer);
-                    this.setTimeout();
+            const accountProps = (_a = this.accountPropsMap) === null || _a === void 0 ? void 0 : _a.get(accountPubkey);
+            const handleDataBuffer = (context, buffer, accountProps) => {
+                var _a;
+                const data = this.decodeBufferFn
+                    ? this.decodeBufferFn(buffer, accountPubkey, accountProps)
+                    : this.program.account[this.accountName].coder.accounts.decode(this.capitalize(this.accountName), buffer);
+                const handler = this.onChangeMap.get(accountPubkey);
+                if (handler) {
+                    if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
+                        this.receivingData = true;
+                        clearTimeout(this.timeoutId);
+                        handler(data, context, buffer, accountProps);
+                        this.setTimeout();
+                    }
+                    else {
+                        handler(data, context, buffer, accountProps);
+                    }
                 }
-                else {
-                    handler(data, context, buffer);
+            };
+            if (Array.isArray(accountProps)) {
+                for (const props of accountProps) {
+                    handleDataBuffer(context, buffer, props);
                 }
             }
+            else {
+                handleDataBuffer(context, buffer, accountProps);
+            }
         });
         return new Promise((resolve, reject) => {
             this.stream.write(request, (err) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.142.0-beta.14",
+	"version": "2.142.0-beta.15",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"module": "./lib/browser/index.js",

package/scripts/client-test.ts

@@ -1,12 +1,14 @@
 import { DriftClient } from '../src/driftClient';
 import { grpcDriftClientAccountSubscriberV2 } from '../src/accounts/grpcDriftClientAccountSubscriberV2';
+import { grpcDriftClientAccountSubscriber } from '../src/accounts/grpcDriftClientAccountSubscriber';
 import { Connection, Keypair, PublicKey } from '@solana/web3.js';
 import { DriftClientConfig } from '../src/driftClientConfig';
 import {
-	decodeName,
 	DRIFT_PROGRAM_ID,
 	PerpMarketAccount,
+	SpotMarketAccount,
 	Wallet,
+	OracleInfo,
 } from '../src';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
 import dotenv from 'dotenv';
@@ -21,8 +23,8 @@ import driftIDL from '../src/idl/drift.json';
 const GRPC_ENDPOINT = process.env.GRPC_ENDPOINT;
 const TOKEN = process.env.TOKEN;
 
-async function initializeGrpcDriftClientV2() {
-	const connection = new Connection('https://api.mainnet-beta.solana.com');
+async function initializeGrpcDriftClientV2VersusV1() {
+	const connection = new Connection('');
 	const wallet = new Wallet(new Keypair());
 	dotenv.config({ path: '../' });
 
@@ -38,177 +40,136 @@ async function initializeGrpcDriftClientV2() {
 
 	const program = new Program(driftIDL as Idl, programId, provider);
 
-	const perpMarketProgramAccounts =
-		(await program.account.perpMarket.all()) as ProgramAccount<PerpMarketAccount>[];
-	const solPerpMarket = perpMarketProgramAccounts.find(
-		(account) => account.account.marketIndex === 0
-	);
-	const solOracleInfo = {
-		publicKey: solPerpMarket.account.amm.oracle,
-		source: solPerpMarket.account.amm.oracleSource,
-	};
-	const ethPerpMarket = perpMarketProgramAccounts.find(
-		(account) => account.account.marketIndex === 2
-	);
-	const ethOracleInfo = {
-		publicKey: ethPerpMarket.account.amm.oracle,
-		source: ethPerpMarket.account.amm.oracleSource,
-	};
-	const btcPerpMarket = perpMarketProgramAccounts.find(
-		(account) => account.account.marketIndex === 1
-	);
-	const btcOracleInfo = {
-		publicKey: btcPerpMarket.account.amm.oracle,
-		source: btcPerpMarket.account.amm.oracleSource,
+	const perpMarketIndexes = [4];
+	const spotMarketIndexes = [32];
+
+	const perpMarketProgramAccounts = (
+		await program.account.perpMarket.all()
+	).filter((a) =>
+		perpMarketIndexes.includes(a.account.marketIndex as number)
+	) as ProgramAccount<PerpMarketAccount>[];
+	const spotMarketProgramAccounts = (
+		await program.account.spotMarket.all()
+	).filter((a) =>
+		spotMarketIndexes.includes(a.account.marketIndex as number)
+	) as ProgramAccount<SpotMarketAccount>[];
+
+	// const perpMarketIndexes = perpMarketProgramAccounts.map(
+	// 	(a) => a.account.marketIndex
+	// );
+	// const spotMarketIndexes = spotMarketProgramAccounts.map(
+	// 	(a) => a.account.marketIndex
+	// );
+	// const oracleInfos = [
+	// 	{
+	// 		publicKey: new PublicKey('BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4'),
+	// 		source: OracleSource.PYTH_LAZER,
+	// 	},
+	// 	{
+	// 		publicKey: new PublicKey('BERaNi6cpEresbq6HC1EQGaB1H1UjvEo4NGnmYSSJof4'),
+	// 		source: OracleSource.PYTH_LAZER_1M,
+	// 	},
+	// ];
+
+	const seen = new Set<string>();
+	const oracleInfos: OracleInfo[] = [];
+	for (const acct of perpMarketProgramAccounts) {
+		const key = `${acct.account.amm.oracle.toBase58()}-${Object.keys(
+			acct.account.amm.oracleSource ?? {}
+		)?.[0]}`;
+		if (!seen.has(key)) {
+			seen.add(key);
+			oracleInfos.push({
+				publicKey: acct.account.amm.oracle,
+				source: acct.account.amm.oracleSource,
+			});
+		}
+	}
+	for (const acct of spotMarketProgramAccounts) {
+		const key = `${acct.account.oracle.toBase58()}-${Object.keys(
+			acct.account.oracleSource ?? {}
+		)?.[0]}`;
+		if (!seen.has(key)) {
+			seen.add(key);
+			oracleInfos.push({
+				publicKey: acct.account.oracle,
+				source: acct.account.oracleSource,
+			});
+		}
+	}
+
+	const baseAccountSubscription = {
+		type: 'grpc' as const,
+		grpcConfigs: {
+			endpoint: GRPC_ENDPOINT,
+			token: TOKEN,
+			commitmentLevel: 'confirmed' as unknown as CommitmentLevel,
+			channelOptions: {
+				'grpc.keepalive_time_ms': 10_000,
+				'grpc.keepalive_timeout_ms': 1_000,
+				'grpc.keepalive_permit_without_calls': 1,
+			},
+		},
 	};
 
-	const config: DriftClientConfig = {
+	const configV2: DriftClientConfig = {
 		connection,
 		wallet,
 		programID: new PublicKey(DRIFT_PROGRAM_ID),
 		accountSubscription: {
-			type: 'grpc',
-			grpcConfigs: {
-				endpoint: GRPC_ENDPOINT,
-				token: TOKEN,
-				commitmentLevel: 'confirmed' as unknown as CommitmentLevel,
-				channelOptions: {
-					'grpc.keepalive_time_ms': 10_000,
-					'grpc.keepalive_timeout_ms': 1_000,
-					'grpc.keepalive_permit_without_calls': 1,
-				},
-			},
+			...baseAccountSubscription,
 			driftClientAccountSubscriber: grpcDriftClientAccountSubscriberV2,
 		},
-		perpMarketIndexes: [0, 1, 2],
-		spotMarketIndexes: [0, 1, 2],
-		oracleInfos: [solOracleInfo, ethOracleInfo, btcOracleInfo],
+		perpMarketIndexes,
+		spotMarketIndexes,
+		oracleInfos,
 	};
 
-	const driftClient = new DriftClient(config);
-
-	let perpMarketUpdateCount = 0;
-	let spotMarketUpdateCount = 0;
-	let oraclePriceUpdateCount = 0;
-	let userAccountUpdateCount = 0;
-
-	const updatePromise = new Promise<void>((resolve) => {
-		driftClient.accountSubscriber.eventEmitter.on(
-			'perpMarketAccountUpdate',
-			(data) => {
-				console.log(
-					'Perp market account update:',
-					decodeName(data.name),
-					'mmOracleSequenceId:',
-					data.amm.mmOracleSequenceId.toString()
-				);
-				// const perpMarketData = driftClient.getPerpMarketAccount(
-				// 	data.marketIndex
-				// );
-				// console.log(
-				// 	'Perp market data market index:',
-				// 	perpMarketData?.marketIndex
-				// );
-				// const oracle = driftClient.getOracleDataForPerpMarket(data.marketIndex);
-				// const mmOracle = driftClient.getMMOracleDataForPerpMarket(
-				// 	data.marketIndex
-				// );
-				// console.log('Perp oracle price:', oracle.price.toString());
-				// console.log('Perp MM oracle price:', mmOracle.price.toString());
-				// console.log(
-				// 	'Perp MM oracle sequence id:',
-				// 	perpMarketData?.amm?.mmOracleSequenceId?.toString()
-				// );
-				perpMarketUpdateCount++;
-				if (
-					perpMarketUpdateCount >= 10 &&
-					spotMarketUpdateCount >= 10 &&
-					oraclePriceUpdateCount >= 10 &&
-					userAccountUpdateCount >= 2
-				) {
-					resolve();
-				}
-			}
-		);
-
-		driftClient.accountSubscriber.eventEmitter.on(
-			'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
-				);
-				const oracle = driftClient.getOracleDataForSpotMarket(data.marketIndex);
-				console.log('Spot oracle price:', oracle.price.toString());
-				spotMarketUpdateCount++;
-				if (
-					perpMarketUpdateCount >= 10 &&
-					spotMarketUpdateCount >= 10 &&
-					oraclePriceUpdateCount >= 10 &&
-					userAccountUpdateCount >= 2
-				) {
-					resolve();
-				}
-			}
-		);
-
-		driftClient.accountSubscriber.eventEmitter.on(
-			'oraclePriceUpdate',
-			(data) => {
-				console.log('Oracle price update:', data.toBase58());
-				oraclePriceUpdateCount++;
-				if (
-					perpMarketUpdateCount >= 10 &&
-					spotMarketUpdateCount >= 10 &&
-					oraclePriceUpdateCount >= 10 &&
-					userAccountUpdateCount >= 2
-				) {
-					resolve();
-				}
-			}
-		);
-
-		driftClient.accountSubscriber.eventEmitter.on(
-			'userAccountUpdate',
-			(data) => {
-				console.log('User account update:', decodeName(data.name));
-				userAccountUpdateCount++;
-				if (
-					perpMarketUpdateCount >= 10 &&
-					spotMarketUpdateCount >= 10 &&
-					oraclePriceUpdateCount >= 10 &&
-					userAccountUpdateCount >= 2
-				) {
-					resolve();
-				}
-			}
-		);
-	});
-
-	await driftClient.subscribe();
-	console.log('DriftClient initialized and listening for updates.');
-
-	for (const marketIndex of config.perpMarketIndexes) {
-		const oracle = driftClient.getOracleDataForPerpMarket(marketIndex);
-		const mmOracle = driftClient.getMMOracleDataForPerpMarket(marketIndex);
-		console.log('Initial perp oracle price:', oracle.price.toString());
-		console.log('Initial perp MM oracle price:', mmOracle.price.toString());
-	}
+	const configV1: DriftClientConfig = {
+		connection,
+		wallet,
+		programID: new PublicKey(DRIFT_PROGRAM_ID),
+		accountSubscription: {
+			...baseAccountSubscription,
+			driftClientAccountSubscriber: grpcDriftClientAccountSubscriber,
+		},
+		perpMarketIndexes,
+		spotMarketIndexes,
+		oracleInfos,
+	};
 
-	for (const marketIndex of config.spotMarketIndexes) {
-		const oracle = driftClient.getOracleDataForSpotMarket(marketIndex);
-		console.log('Initial spot oracle price:', oracle.price.toString());
-	}
+	const clientV2 = new DriftClient(configV2);
+	const clientV1 = new DriftClient(configV1);
+
+	await Promise.all([clientV1.subscribe(), clientV2.subscribe()]);
+	const compare = () => {
+		for (const idx of perpMarketIndexes) {
+			const p1 = clientV1.getOracleDataForPerpMarket(idx).price;
+			const p2 = clientV2.getOracleDataForPerpMarket(idx).price;
+			console.log(
+				`perp mkt ${idx} | v1 ${p1.toString()} | v2 ${p2.toString()}`
+			);
+		}
+		for (const idx of spotMarketIndexes) {
+			const s1 = clientV1.getOracleDataForSpotMarket(idx).price;
+			const s2 = clientV2.getOracleDataForSpotMarket(idx).price;
+			console.log(
+				`spot mkt ${idx} | v1 ${s1.toString()} | v2 ${s2.toString()}`
+			);
+		}
+	};
+
+	compare();
+	const interval = setInterval(compare, 1000);
 
-	const stateAccount = driftClient.getStateAccount();
-	console.log('Initial state account:', stateAccount.toString());
+	const cleanup = async () => {
+		clearInterval(interval);
+		await Promise.all([clientV1.unsubscribe(), clientV2.unsubscribe()]);
+		process.exit(0);
+	};
 
-	await updatePromise;
-	console.log('Received required number of updates.');
+	process.on('SIGINT', cleanup);
+	process.on('SIGTERM', cleanup);
 }
 
-initializeGrpcDriftClientV2().catch(console.error);
+initializeGrpcDriftClientV2VersusV1().catch(console.error);

package/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -37,7 +37,10 @@ export class grpcDriftClientAccountSubscriberV2
 	private grpcConfigs: GrpcConfigs;
 	private perpMarketsSubscriber?: grpcMultiAccountSubscriber<PerpMarketAccount>;
 	private spotMarketsSubscriber?: grpcMultiAccountSubscriber<SpotMarketAccount>;
-	private oracleMultiSubscriber?: grpcMultiAccountSubscriber<OraclePriceData>;
+	private oracleMultiSubscriber?: grpcMultiAccountSubscriber<
+		OraclePriceData,
+		OracleInfo
+	>;
 	private perpMarketIndexToAccountPubkeyMap = new Map<number, string>();
 	private spotMarketIndexToAccountPubkeyMap = new Map<number, string>();
 	private delistedMarketSetting: DelistedMarketSetting;
@@ -60,6 +63,10 @@ export class grpcDriftClientAccountSubscriberV2
 	public perpOracleStringMap = new Map<number, string>();
 	public spotOracleMap = new Map<number, PublicKey>();
 	public spotOracleStringMap = new Map<number, string>();
+	private oracleIdToOracleDataMap = new Map<
+		string,
+		DataAndSlot<OraclePriceData>
+	>();
 	public stateAccountSubscriber?: AccountSubscriber<StateAccount>;
 	oracleClientCache = new OracleClientCache();
 	private resubOpts?: ResubOpts;
@@ -360,8 +367,9 @@ export class grpcDriftClientAccountSubscriberV2
 		oracleId: string
 	): DataAndSlot<OraclePriceData> | undefined {
 		this.assertIsSubscribed();
-		const { publicKey } = getPublicKeyAndSourceFromOracleId(oracleId);
-		return this.oracleMultiSubscriber?.getAccountData(publicKey.toBase58());
+		// we need to rely on a map we store in this class because the grpcMultiAccountSubscriber does not track a mapping or oracle ID.
+		// DO NOT call getAccountData on the oracleMultiSubscriber, it will not return the correct data in certain cases(BONK spot and perp market subscribed too at once).
+		return this.oracleIdToOracleDataMap.get(oracleId);
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -577,80 +585,80 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async subscribeToOracles(): Promise<boolean> {
-		const pubkeyToSources = new Map<string, Set<OracleInfo['source']>>();
+		const oraclePubkeyToInfosMap = new Map<string, OracleInfo[]>();
 		for (const info of this.oracleInfos) {
-			if (info.publicKey.equals((PublicKey as any).default)) {
-				continue;
+			const pubkey = info.publicKey.toBase58();
+			if (!oraclePubkeyToInfosMap.has(pubkey)) {
+				oraclePubkeyToInfosMap.set(pubkey, []);
 			}
-			const key = info.publicKey.toBase58();
-			let sources = pubkeyToSources.get(key);
-			if (!sources) {
-				sources = new Set<OracleInfo['source']>();
-				pubkeyToSources.set(key, sources);
-			}
-			sources.add(info.source);
+			oraclePubkeyToInfosMap.get(pubkey).push(info);
 		}
 
-		const oraclePubkeys = Array.from(pubkeyToSources.keys()).map(
-			(k) => new PublicKey(k)
+		const oraclePubkeys = Array.from(
+			new Set(this.oracleInfos.map((info) => info.publicKey))
 		);
 
-		this.oracleMultiSubscriber =
-			await grpcMultiAccountSubscriber.create<OraclePriceData>(
-				this.grpcConfigs,
-				'oracle',
-				this.program,
-				(buffer: Buffer, pubkey?: string) => {
-					if (!pubkey) {
-						throw new Error('Oracle pubkey missing in decode');
-					}
-					const sources = pubkeyToSources.get(pubkey);
-					if (!sources || sources.size === 0) {
-						throw new Error('Oracle sources missing for pubkey in decode');
-					}
-					const primarySource = sources.values().next().value;
-					const client = this.oracleClientCache.get(
-						primarySource,
-						this.program.provider.connection,
-						this.program
-					);
-					return client.getOraclePriceDataFromBuffer(buffer);
-				},
-				this.resubOpts,
-				undefined,
-				async () => {
-					try {
-						if (this.resubOpts?.logResubMessages) {
-							console.log(
-								'[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing'
-							);
-						}
-						await this.subscribeToOracles();
-					} catch (e) {
-						console.error('Oracle resubscribe failed:', e);
+		this.oracleMultiSubscriber = await grpcMultiAccountSubscriber.create<
+			OraclePriceData,
+			OracleInfo
+		>(
+			this.grpcConfigs,
+			'oracle',
+			this.program,
+			(buffer: Buffer, pubkey?: string, accountProps?: OracleInfo) => {
+				if (!pubkey) {
+					throw new Error('Oracle pubkey missing in decode');
+				}
+
+				const client = this.oracleClientCache.get(
+					accountProps.source,
+					this.program.provider.connection,
+					this.program
+				);
+				const price = client.getOraclePriceDataFromBuffer(buffer);
+				return price;
+			},
+			this.resubOpts,
+			undefined,
+			async () => {
+				try {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							'[grpcDriftClientAccountSubscriberV2] oracle subscriber unsubscribed; resubscribing'
+						);
 					}
+					await this.subscribeToOracles();
+				} catch (e) {
+					console.error('Oracle resubscribe failed:', e);
 				}
-			);
+			},
+			oraclePubkeyToInfosMap
+		);
 
 		for (const data of this.initialOraclePriceData.entries()) {
 			const { publicKey } = getPublicKeyAndSourceFromOracleId(data[0]);
 			this.oracleMultiSubscriber.setAccountData(publicKey.toBase58(), data[1]);
+			this.oracleIdToOracleDataMap.set(data[0], {
+				data: data[1],
+				slot: 0,
+			});
 		}
 
 		await this.oracleMultiSubscriber.subscribe(
 			oraclePubkeys,
-			(accountId, data) => {
-				const sources = pubkeyToSources.get(accountId.toBase58());
-				if (sources) {
-					for (const source of sources.values()) {
-						this.eventEmitter.emit(
-							'oraclePriceUpdate',
-							accountId,
-							source,
-							data
-						);
-					}
-				}
+			(accountId, data, context, _b, accountProps) => {
+				const oracleId = getOracleId(accountId, accountProps.source);
+				this.oracleIdToOracleDataMap.set(oracleId, {
+					data,
+					slot: context.slot,
+				});
+				this.eventEmitter.emit(
+					'oraclePriceUpdate',
+					accountId,
+					accountProps.source,
+					data
+				);
+
 				this.eventEmitter.emit('update');
 			}
 		);