fix: grpc sub v2/multi not updating data map (#1940)

Author: LukasDeco

sdk/scripts/client-test.ts

@@ -96,20 +96,29 @@ async function initializeGrpcDriftClientV2() {
 		driftClient.accountSubscriber.eventEmitter.on(
 			'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
-				);
-				const oracle = driftClient.getOracleDataForPerpMarket(data.marketIndex);
-				const mmOracle = driftClient.getMMOracleDataForPerpMarket(
-					data.marketIndex
+					'Perp market account update:',
+					decodeName(data.name),
+					'mmOracleSequenceId:',
+					data.amm.mmOracleSequenceId.toString()
 				);
-				console.log('Perp oracle price:', oracle.price.toString());
-				console.log('Perp MM oracle price:', mmOracle.price.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 &&

sdk/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -246,7 +246,7 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 			);
 
 		for (const data of this.initialPerpMarketAccountData.values()) {
-			this.perpMarketsSubscriber.setAccountData(data.pubkey, data);
+			this.perpMarketsSubscriber.setAccountData(data.pubkey.toBase58(), data);
 		}
 
 		await this.perpMarketsSubscriber.subscribe(
@@ -308,7 +308,7 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 			);
 
 		for (const data of this.initialSpotMarketAccountData.values()) {
-			this.spotMarketsSubscriber.setAccountData(data.pubkey, data);
+			this.spotMarketsSubscriber.setAccountData(data.pubkey.toBase58(), data);
 		}
 
 		await this.spotMarketsSubscriber.subscribe(
@@ -383,7 +383,7 @@ export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAcco
 
 		for (const data of this.initialOraclePriceData.entries()) {
 			const { publicKey } = getPublicKeyAndSourceFromOracleId(data[0]);
-			this.oracleMultiSubscriber.setAccountData(publicKey, data[1]);
+			this.oracleMultiSubscriber.setAccountData(publicKey.toBase58(), data[1]);
 		}
 
 		await this.oracleMultiSubscriber.subscribe(

sdk/src/accounts/grpcMultiAccountSubscriber.ts

@@ -93,8 +93,8 @@ export class grpcMultiAccountSubscriber<T> {
 		);
 	}
 
-	setAccountData(accountPubkey: PublicKey, data: T, slot?: number): void {
-		this.dataMap.set(accountPubkey.toBase58(), { data, slot });
+	setAccountData(accountPubkey: string, data: T, slot?: number): void {
+		this.dataMap.set(accountPubkey, { data, slot });
 	}
 
 	getAccountData(accountPubkey: string): DataAndSlot<T> | undefined {
@@ -122,9 +122,10 @@ export class grpcMultiAccountSubscriber<T> {
 		for (const pk of accounts) {
 			const key = pk.toBase58();
 			this.subscribedAccounts.add(key);
-			this.onChangeMap.set(key, (data, ctx, buffer) =>
-				onChange(new PublicKey(key), data, ctx, buffer)
-			);
+			this.onChangeMap.set(key, (data, ctx, buffer) => {
+				this.setAccountData(key, data, ctx.slot);
+				onChange(new PublicKey(key), data, ctx, buffer);
+			});
 		}
 
 		this.stream =