fix: grpc v2 doing extra subscribes for oracles (#1945)

Author: LukasDeco

sdk/scripts/client-test.ts

@@ -24,7 +24,7 @@ const GRPC_ENDPOINT = process.env.GRPC_ENDPOINT;
 const TOKEN = process.env.TOKEN;
 
 async function initializeGrpcDriftClientV2VersusV1() {
-	const connection = new Connection('');
+	const connection = new Connection('https://api.mainnet-beta.solana.com');
 	const wallet = new Wallet(new Keypair());
 	dotenv.config({ path: '../' });
 
@@ -119,6 +119,7 @@ async function initializeGrpcDriftClientV2VersusV1() {
 		accountSubscription: {
 			...baseAccountSubscription,
 			driftClientAccountSubscriber: grpcDriftClientAccountSubscriberV2,
+			logResubMessages: true,
 		},
 		perpMarketIndexes,
 		spotMarketIndexes,
@@ -132,6 +133,7 @@ async function initializeGrpcDriftClientV2VersusV1() {
 		accountSubscription: {
 			...baseAccountSubscription,
 			driftClientAccountSubscriber: grpcDriftClientAccountSubscriber,
+			// logResubMessages: true,
 		},
 		perpMarketIndexes,
 		spotMarketIndexes,
@@ -142,6 +144,14 @@ async function initializeGrpcDriftClientV2VersusV1() {
 	const clientV1 = new DriftClient(configV1);
 
 	await Promise.all([clientV1.subscribe(), clientV2.subscribe()]);
+
+	clientV2.eventEmitter.on('oraclePriceUpdate', (pubkey, source, data) => {
+		const key = pubkey.toBase58();
+		const src = Object.keys(source ?? {})[0];
+		console.log(
+			`v2 oracle update ${key} (${src}) price ${data.price.toString()}`
+		);
+	});
 	const compare = () => {
 		for (const idx of perpMarketIndexes) {
 			const p1 = clientV1.getOracleDataForPerpMarket(idx).price;

sdk/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -215,6 +215,9 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async addOracle(oracleInfo: OracleInfo): Promise<boolean> {
+		if (this.resubOpts?.logResubMessages) {
+			console.log('[grpcDriftClientAccountSubscriberV2] addOracle');
+		}
 		if (oracleInfo.publicKey.equals(PublicKey.default)) {
 			return true;
 		}
@@ -228,10 +231,7 @@ export class grpcDriftClientAccountSubscriberV2
 			this.oracleInfos = this.oracleInfos.concat(oracleInfo);
 		}
 
-		if (this.oracleMultiSubscriber) {
-			await this.unsubscribeFromOracles();
-			await this.subscribeToOracles();
-		}
+		this.oracleMultiSubscriber?.addAccounts([oracleInfo.publicKey]);
 
 		return true;
 	}
@@ -461,6 +461,11 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async subscribeToPerpMarketAccounts(): Promise<boolean> {
+		if (this.resubOpts?.logResubMessages) {
+			console.log(
+				'[grpcDriftClientAccountSubscriberV2] subscribeToPerpMarketAccounts'
+			);
+		}
 		const perpMarketIndexToAccountPubkeys: Array<[number, PublicKey]> =
 			await Promise.all(
 				this.perpMarketIndexes.map(async (marketIndex) => [
@@ -523,6 +528,11 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async subscribeToSpotMarketAccounts(): Promise<boolean> {
+		if (this.resubOpts?.logResubMessages) {
+			console.log(
+				'[grpcDriftClientAccountSubscriberV2] subscribeToSpotMarketAccounts'
+			);
+		}
 		const spotMarketIndexToAccountPubkeys: Array<[number, PublicKey]> =
 			await Promise.all(
 				this.spotMarketIndexes.map(async (marketIndex) => [
@@ -585,6 +595,9 @@ export class grpcDriftClientAccountSubscriberV2
 	}
 
 	async subscribeToOracles(): Promise<boolean> {
+		if (this.resubOpts?.logResubMessages) {
+			console.log('grpcDriftClientAccountSubscriberV2 subscribeToOracles');
+		}
 		const oraclePubkeyToInfosMap = new Map<string, OracleInfo[]>();
 		for (const info of this.oracleInfos) {
 			const pubkey = info.publicKey.toBase58();

sdk/src/accounts/grpcMultiAccountSubscriber.ts

@@ -189,6 +189,9 @@ export class grpcMultiAccountSubscriber<T, U = undefined> {
 			accountProps: U
 		) => void
 	): Promise<void> {
+		if (this.resubOpts?.logResubMessages) {
+			console.log(`[${this.accountName}] grpcMultiAccountSubscriber subscribe`);
+		}
 		if (this.listenerId != null || this.isUnsubscribing) {
 			return;
 		}