@drift-labs/sdk 2.142.0 → 2.143.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.142.0-beta.27
+2.143.0-beta.1

package/lib/browser/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -106,9 +106,10 @@ class grpcDriftClientAccountSubscriberV2 {
         }
         const exists = this.oracleInfos.some((o) => o.source === oracleInfo.source &&
             o.publicKey.equals(oracleInfo.publicKey));
-        if (!exists) {
-            this.oracleInfos = this.oracleInfos.concat(oracleInfo);
+        if (exists) {
+            return true; // Already exists, don't add duplicate
         }
+        this.oracleInfos = this.oracleInfos.concat(oracleInfo);
         (_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.addAccounts([oracleInfo.publicKey]);
         return true;
     }
@@ -412,10 +413,31 @@ class grpcDriftClientAccountSubscriberV2 {
         // Remove accounts in batches - perp markets
         if (perpMarketPubkeysToRemove.length > 0) {
             await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
+            // Clean up the mapping for removed perp markets
+            for (const pubkey of perpMarketPubkeysToRemove) {
+                const pubkeyString = pubkey.toBase58();
+                for (const [marketIndex, accountPubkey,] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
+                    if (accountPubkey === pubkeyString) {
+                        this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
+                        this.perpOracleMap.delete(marketIndex);
+                        this.perpOracleStringMap.delete(marketIndex);
+                        break;
+                    }
+                }
+            }
         }
         // Remove accounts in batches - oracles
         if (oraclePubkeysToRemove.length > 0) {
             await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+            // Clean up oracle data for removed oracles by finding their sources
+            for (const pubkey of oraclePubkeysToRemove) {
+                // Find the oracle source by checking oracleInfos
+                const oracleInfo = this.oracleInfos.find((info) => info.publicKey.equals(pubkey));
+                if (oracleInfo) {
+                    const oracleId = (0, oracleId_1.getOracleId)(pubkey, oracleInfo.source);
+                    this.oracleIdToOracleDataMap.delete(oracleId);
+                }
+            }
         }
     }
     removeInitialData() {
@@ -431,14 +453,24 @@ class grpcDriftClientAccountSubscriberV2 {
         }
     }
     async unsubscribe() {
-        var _a, _c;
-        if (this.isSubscribed) {
+        var _a, _c, _d;
+        if (!this.isSubscribed) {
             return;
         }
-        await this.stateAccountSubscriber.unsubscribe();
+        this.isSubscribed = false;
+        this.isSubscribing = false;
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         await this.unsubscribeFromOracles();
-        await ((_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
-        await ((_c = this.spotMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
+        await ((_c = this.perpMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
+        await ((_d = this.spotMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.unsubscribe());
+        // Clean up all maps to prevent memory leaks
+        this.perpMarketIndexToAccountPubkeyMap.clear();
+        this.spotMarketIndexToAccountPubkeyMap.clear();
+        this.oracleIdToOracleDataMap.clear();
+        this.perpOracleMap.clear();
+        this.perpOracleStringMap.clear();
+        this.spotOracleMap.clear();
+        this.spotOracleStringMap.clear();
     }
 }
 exports.grpcDriftClientAccountSubscriberV2 = grpcDriftClientAccountSubscriberV2;

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"grpcDriftClientAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/grpcDriftClientAccountSubscriberV2.ts"],"names":[],"mappings":"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"}

package/lib/node/accounts/grpcDriftClientAccountSubscriberV2.js

@@ -106,9 +106,10 @@ class grpcDriftClientAccountSubscriberV2 {
         }
         const exists = this.oracleInfos.some((o) => o.source === oracleInfo.source &&
             o.publicKey.equals(oracleInfo.publicKey));
-        if (!exists) {
-            this.oracleInfos = this.oracleInfos.concat(oracleInfo);
+        if (exists) {
+            return true; // Already exists, don't add duplicate
         }
+        this.oracleInfos = this.oracleInfos.concat(oracleInfo);
         (_c = this.oracleMultiSubscriber) === null || _c === void 0 ? void 0 : _c.addAccounts([oracleInfo.publicKey]);
         return true;
     }
@@ -412,10 +413,31 @@ class grpcDriftClientAccountSubscriberV2 {
         // Remove accounts in batches - perp markets
         if (perpMarketPubkeysToRemove.length > 0) {
             await this.perpMarketsSubscriber.removeAccounts(perpMarketPubkeysToRemove);
+            // Clean up the mapping for removed perp markets
+            for (const pubkey of perpMarketPubkeysToRemove) {
+                const pubkeyString = pubkey.toBase58();
+                for (const [marketIndex, accountPubkey,] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
+                    if (accountPubkey === pubkeyString) {
+                        this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
+                        this.perpOracleMap.delete(marketIndex);
+                        this.perpOracleStringMap.delete(marketIndex);
+                        break;
+                    }
+                }
+            }
         }
         // Remove accounts in batches - oracles
         if (oraclePubkeysToRemove.length > 0) {
             await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+            // Clean up oracle data for removed oracles by finding their sources
+            for (const pubkey of oraclePubkeysToRemove) {
+                // Find the oracle source by checking oracleInfos
+                const oracleInfo = this.oracleInfos.find((info) => info.publicKey.equals(pubkey));
+                if (oracleInfo) {
+                    const oracleId = (0, oracleId_1.getOracleId)(pubkey, oracleInfo.source);
+                    this.oracleIdToOracleDataMap.delete(oracleId);
+                }
+            }
         }
     }
     removeInitialData() {
@@ -431,14 +453,24 @@ class grpcDriftClientAccountSubscriberV2 {
         }
     }
     async unsubscribe() {
-        var _a, _c;
-        if (this.isSubscribed) {
+        var _a, _c, _d;
+        if (!this.isSubscribed) {
             return;
         }
-        await this.stateAccountSubscriber.unsubscribe();
+        this.isSubscribed = false;
+        this.isSubscribing = false;
+        await ((_a = this.stateAccountSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         await this.unsubscribeFromOracles();
-        await ((_a = this.perpMarketsSubscriber) === null || _a === void 0 ? void 0 : _a.unsubscribe());
-        await ((_c = this.spotMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
+        await ((_c = this.perpMarketsSubscriber) === null || _c === void 0 ? void 0 : _c.unsubscribe());
+        await ((_d = this.spotMarketsSubscriber) === null || _d === void 0 ? void 0 : _d.unsubscribe());
+        // Clean up all maps to prevent memory leaks
+        this.perpMarketIndexToAccountPubkeyMap.clear();
+        this.spotMarketIndexToAccountPubkeyMap.clear();
+        this.oracleIdToOracleDataMap.clear();
+        this.perpOracleMap.clear();
+        this.perpOracleStringMap.clear();
+        this.spotOracleMap.clear();
+        this.spotOracleStringMap.clear();
     }
 }
 exports.grpcDriftClientAccountSubscriberV2 = grpcDriftClientAccountSubscriberV2;

package/package.json

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

package/scripts/single-grpc-client-test.ts

@@ -0,0 +1,226 @@
+import { DriftClient } from '../src/driftClient';
+import { grpcDriftClientAccountSubscriberV2 } from '../src/accounts/grpcDriftClientAccountSubscriberV2';
+import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import { DriftClientConfig } from '../src/driftClientConfig';
+import {
+	DRIFT_PROGRAM_ID,
+	PerpMarketAccount,
+	SpotMarketAccount,
+	Wallet,
+	OracleInfo,
+	decodeName,
+} from '../src';
+import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
+import dotenv from 'dotenv';
+import {
+	AnchorProvider,
+	Idl,
+	Program,
+	ProgramAccount,
+} from '@coral-xyz/anchor';
+import driftIDL from '../src/idl/drift.json';
+
+const GRPC_ENDPOINT = process.env.GRPC_ENDPOINT;
+const TOKEN = process.env.TOKEN;
+const RPC_ENDPOINT = process.env.RPC_ENDPOINT;
+
+async function initializeSingleGrpcClient() {
+	console.log('🚀 Initializing single gRPC Drift Client...');
+
+	const connection = new Connection(RPC_ENDPOINT);
+	const wallet = new Wallet(new Keypair());
+	dotenv.config({ path: '../' });
+
+	const programId = new PublicKey(DRIFT_PROGRAM_ID);
+	const provider = new AnchorProvider(
+		connection,
+		// @ts-ignore
+		wallet,
+		{
+			commitment: 'processed',
+		}
+	);
+
+	const program = new Program(driftIDL as Idl, programId, provider);
+
+	// Get perp market accounts
+	const allPerpMarketProgramAccounts =
+		(await program.account.perpMarket.all()) as ProgramAccount<PerpMarketAccount>[];
+	const perpMarketProgramAccounts = allPerpMarketProgramAccounts.filter((val) =>
+		[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15].includes(
+			val.account.marketIndex
+		)
+	);
+	const perpMarketIndexes = perpMarketProgramAccounts.map(
+		(val) => val.account.marketIndex
+	);
+
+	// Get spot market accounts
+	const allSpotMarketProgramAccounts =
+		(await program.account.spotMarket.all()) as ProgramAccount<SpotMarketAccount>[];
+	const spotMarketProgramAccounts = allSpotMarketProgramAccounts.filter((val) =>
+		[0, 1, 2, 3, 4, 5].includes(val.account.marketIndex)
+	);
+	const spotMarketIndexes = spotMarketProgramAccounts.map(
+		(val) => val.account.marketIndex
+	);
+
+	// Get oracle infos
+	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,
+			});
+		}
+	}
+
+	console.log(`📊 Markets: ${perpMarketIndexes.length} perp, ${spotMarketIndexes.length} spot`);
+	console.log(`🔮 Oracles: ${oracleInfos.length}`);
+
+	const baseAccountSubscription = {
+		type: 'grpc' as const,
+		grpcConfigs: {
+			endpoint: GRPC_ENDPOINT,
+			token: TOKEN,
+			commitmentLevel: CommitmentLevel.PROCESSED,
+			channelOptions: {
+				'grpc.keepalive_time_ms': 10_000,
+				'grpc.keepalive_timeout_ms': 1_000,
+				'grpc.keepalive_permit_without_calls': 1,
+			},
+		},
+	};
+
+	const config: DriftClientConfig = {
+		connection,
+		wallet,
+		programID: new PublicKey(DRIFT_PROGRAM_ID),
+		accountSubscription: {
+			...baseAccountSubscription,
+			driftClientAccountSubscriber: grpcDriftClientAccountSubscriberV2,
+		},
+		perpMarketIndexes,
+		spotMarketIndexes,
+		oracleInfos,
+	};
+
+	const client = new DriftClient(config);
+
+	// Set up event listeners
+	const eventCounts = {
+		stateAccountUpdate: 0,
+		perpMarketAccountUpdate: 0,
+		spotMarketAccountUpdate: 0,
+		oraclePriceUpdate: 0,
+		update: 0,
+	};
+
+	console.log('🎧 Setting up event listeners...');
+
+	client.eventEmitter.on('stateAccountUpdate', (_data) => {
+		eventCounts.stateAccountUpdate++;
+	});
+
+	client.eventEmitter.on('perpMarketAccountUpdate', (_data) => {
+		eventCounts.perpMarketAccountUpdate++;
+	});
+
+	client.eventEmitter.on('spotMarketAccountUpdate', (_data) => {
+		eventCounts.spotMarketAccountUpdate++;
+	});
+
+	client.eventEmitter.on('oraclePriceUpdate', (_publicKey, _source, _data) => {
+		eventCounts.oraclePriceUpdate++;
+	});
+
+	client.accountSubscriber.eventEmitter.on('update', () => {
+		eventCounts.update++;
+	});
+
+	// Subscribe
+	console.log('🔗 Subscribing to accounts...');
+	await client.subscribe();
+
+	console.log('✅ Client subscribed successfully!');
+	console.log('🚀 Starting high-load testing (50 reads/sec per perp market)...');
+
+	// High-frequency load testing - 50 reads per second per perp market
+	const loadTestInterval = setInterval(async () => {
+		try {
+			// Test getPerpMarketAccount for each perp market (50 times per second per market)
+			for (const marketIndex of perpMarketIndexes) {
+				const perpMarketAccount = client.getPerpMarketAccount(marketIndex);
+				console.log("perpMarketAccount name: ", decodeName(perpMarketAccount.name));
+				console.log("perpMarketAccount data: ", JSON.stringify({
+					marketIndex: perpMarketAccount.marketIndex,
+					name: decodeName(perpMarketAccount.name),
+					baseAssetReserve: perpMarketAccount.amm.baseAssetReserve.toString(),
+					quoteAssetReserve: perpMarketAccount.amm.quoteAssetReserve.toString()
+				}));
+			}
+
+			// Test getMMOracleDataForPerpMarket for each perp market (50 times per second per market)
+			for (const marketIndex of perpMarketIndexes) {
+				try {
+					const oracleData = client.getMMOracleDataForPerpMarket(marketIndex);
+					console.log("oracleData price: ", oracleData.price.toString());
+					console.log("oracleData: ", JSON.stringify({
+						price: oracleData.price.toString(),
+						confidence: oracleData.confidence?.toString(),
+						slot: oracleData.slot?.toString()
+					}));
+				} catch (error) {
+					// Ignore errors for load testing
+				}
+			}
+		} catch (error) {
+			console.error('Load test error:', error);
+		}
+	}, 20); // 50 times per second = 1000ms / 50 = 20ms interval
+
+	// Log periodic stats
+	const statsInterval = setInterval(() => {
+		console.log('\n📈 Event Counts:', eventCounts);
+		console.log(`⏱️  Client subscribed: ${client.isSubscribed}`);
+		console.log(`🔗 Account subscriber subscribed: ${client.accountSubscriber.isSubscribed}`);
+		console.log(`🔥 Load: ${perpMarketIndexes.length * 50 * 2} reads/sec (${perpMarketIndexes.length} markets × 50 getPerpMarketAccount + 50 getMMOracleDataForPerpMarket)`);
+	}, 5000);
+
+	// Handle shutdown signals - just exit without cleanup since they never unsubscribe
+	process.on('SIGINT', () => {
+		console.log('\n🛑 Shutting down...');
+		clearInterval(loadTestInterval);
+		clearInterval(statsInterval);
+		process.exit(0);
+	});
+
+	process.on('SIGTERM', () => {
+		console.log('\n🛑 Shutting down...');
+		clearInterval(loadTestInterval);
+		clearInterval(statsInterval);
+		process.exit(0);
+	});
+
+	return client;
+}
+
+initializeSingleGrpcClient().catch(console.error);

package/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -227,10 +227,11 @@ export class grpcDriftClientAccountSubscriberV2
 				o.source === oracleInfo.source &&
 				o.publicKey.equals(oracleInfo.publicKey)
 		);
-		if (!exists) {
-			this.oracleInfos = this.oracleInfos.concat(oracleInfo);
+		if (exists) {
+			return true; // Already exists, don't add duplicate
 		}
 
+		this.oracleInfos = this.oracleInfos.concat(oracleInfo);
 		this.oracleMultiSubscriber?.addAccounts([oracleInfo.publicKey]);
 
 		return true;
@@ -708,11 +709,37 @@ export class grpcDriftClientAccountSubscriberV2
 			await this.perpMarketsSubscriber.removeAccounts(
 				perpMarketPubkeysToRemove
 			);
+			// Clean up the mapping for removed perp markets
+			for (const pubkey of perpMarketPubkeysToRemove) {
+				const pubkeyString = pubkey.toBase58();
+				for (const [
+					marketIndex,
+					accountPubkey,
+				] of this.perpMarketIndexToAccountPubkeyMap.entries()) {
+					if (accountPubkey === pubkeyString) {
+						this.perpMarketIndexToAccountPubkeyMap.delete(marketIndex);
+						this.perpOracleMap.delete(marketIndex);
+						this.perpOracleStringMap.delete(marketIndex);
+						break;
+					}
+				}
+			}
 		}
 
 		// Remove accounts in batches - oracles
 		if (oraclePubkeysToRemove.length > 0) {
 			await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+			// Clean up oracle data for removed oracles by finding their sources
+			for (const pubkey of oraclePubkeysToRemove) {
+				// Find the oracle source by checking oracleInfos
+				const oracleInfo = this.oracleInfos.find((info) =>
+					info.publicKey.equals(pubkey)
+				);
+				if (oracleInfo) {
+					const oracleId = getOracleId(pubkey, oracleInfo.source);
+					this.oracleIdToOracleDataMap.delete(oracleId);
+				}
+			}
 		}
 	}
 
@@ -731,13 +758,25 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async unsubscribe(): Promise<void> {
-		if (this.isSubscribed) {
+		if (!this.isSubscribed) {
 			return;
 		}
 
-		await this.stateAccountSubscriber.unsubscribe();
+		this.isSubscribed = false;
+		this.isSubscribing = false;
+
+		await this.stateAccountSubscriber?.unsubscribe();
 		await this.unsubscribeFromOracles();
 		await this.perpMarketsSubscriber?.unsubscribe();
 		await this.spotMarketsSubscriber?.unsubscribe();
+
+		// Clean up all maps to prevent memory leaks
+		this.perpMarketIndexToAccountPubkeyMap.clear();
+		this.spotMarketIndexToAccountPubkeyMap.clear();
+		this.oracleIdToOracleDataMap.clear();
+		this.perpOracleMap.clear();
+		this.perpOracleStringMap.clear();
+		this.spotOracleMap.clear();
+		this.spotOracleStringMap.clear();
 	}
 }