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

package/lib/node/isomorphic/grpc.d.ts

@@ -1,8 +1,10 @@
 import type Client from '@triton-one/yellowstone-grpc';
 import type { SubscribeRequest, SubscribeUpdate } from '@triton-one/yellowstone-grpc';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
-import { CommitmentLevel as LaserCommitmentLevel, subscribe as LaserSubscribe, LaserstreamConfig, SubscribeRequest as LaserSubscribeRequest, SubscribeUpdate as LaserSubscribeUpdate, CompressionAlgorithms } from 'helius-laserstream';
-export { ClientDuplexStream, ChannelOptions, SubscribeRequest, SubscribeUpdate, CommitmentLevel, Client, LaserSubscribe, LaserCommitmentLevel, LaserstreamConfig, LaserSubscribeRequest, LaserSubscribeUpdate, CompressionAlgorithms, };
+import type { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
+import { CommitmentLevel as LaserCommitmentLevel, subscribe as LaserSubscribe, CompressionAlgorithms } from 'helius-laserstream';
+import type { LaserstreamConfig, SubscribeRequest as LaserSubscribeRequest, SubscribeUpdate as LaserSubscribeUpdate } from 'helius-laserstream';
+export { CommitmentLevel, Client, LaserSubscribe, LaserCommitmentLevel, CompressionAlgorithms, };
+export type { ClientDuplexStream, ChannelOptions, SubscribeRequest, SubscribeUpdate, LaserstreamConfig, LaserSubscribeRequest, LaserSubscribeUpdate, };
 export declare function createClient(...args: ConstructorParameters<typeof Client>): Promise<Client>;
 //# sourceMappingURL=grpc.node.d.ts.map

package/lib/node/isomorphic/grpc.js

@@ -23,14 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClient = exports.CompressionAlgorithms = exports.LaserSubscribeUpdate = exports.LaserSubscribeRequest = exports.LaserCommitmentLevel = exports.LaserSubscribe = exports.CommitmentLevel = void 0;
+exports.createClient = exports.CompressionAlgorithms = exports.LaserCommitmentLevel = exports.LaserSubscribe = exports.CommitmentLevel = void 0;
 const yellowstone_grpc_1 = require("@triton-one/yellowstone-grpc");
 Object.defineProperty(exports, "CommitmentLevel", { enumerable: true, get: function () { return yellowstone_grpc_1.CommitmentLevel; } });
 const helius_laserstream_1 = require("helius-laserstream");
 Object.defineProperty(exports, "LaserCommitmentLevel", { enumerable: true, get: function () { return helius_laserstream_1.CommitmentLevel; } });
 Object.defineProperty(exports, "LaserSubscribe", { enumerable: true, get: function () { return helius_laserstream_1.subscribe; } });
-Object.defineProperty(exports, "LaserSubscribeRequest", { enumerable: true, get: function () { return helius_laserstream_1.SubscribeRequest; } });
-Object.defineProperty(exports, "LaserSubscribeUpdate", { enumerable: true, get: function () { return helius_laserstream_1.SubscribeUpdate; } });
 Object.defineProperty(exports, "CompressionAlgorithms", { enumerable: true, get: function () { return helius_laserstream_1.CompressionAlgorithms; } });
 // Export a function to create a new Client instance
 async function createClient(...args) {

package/lib/node/isomorphic/grpc.node.d.ts

@@ -1,8 +1,10 @@
 import type Client from '@triton-one/yellowstone-grpc';
 import type { SubscribeRequest, SubscribeUpdate } from '@triton-one/yellowstone-grpc';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
-import { CommitmentLevel as LaserCommitmentLevel, subscribe as LaserSubscribe, LaserstreamConfig, SubscribeRequest as LaserSubscribeRequest, SubscribeUpdate as LaserSubscribeUpdate, CompressionAlgorithms } from 'helius-laserstream';
-export { ClientDuplexStream, ChannelOptions, SubscribeRequest, SubscribeUpdate, CommitmentLevel, Client, LaserSubscribe, LaserCommitmentLevel, LaserstreamConfig, LaserSubscribeRequest, LaserSubscribeUpdate, CompressionAlgorithms, };
+import type { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
+import { CommitmentLevel as LaserCommitmentLevel, subscribe as LaserSubscribe, CompressionAlgorithms } from 'helius-laserstream';
+import type { LaserstreamConfig, SubscribeRequest as LaserSubscribeRequest, SubscribeUpdate as LaserSubscribeUpdate } from 'helius-laserstream';
+export { CommitmentLevel, Client, LaserSubscribe, LaserCommitmentLevel, CompressionAlgorithms, };
+export type { ClientDuplexStream, ChannelOptions, SubscribeRequest, SubscribeUpdate, LaserstreamConfig, LaserSubscribeRequest, LaserSubscribeUpdate, };
 export declare function createClient(...args: ConstructorParameters<typeof Client>): Promise<Client>;
 //# sourceMappingURL=grpc.node.d.ts.map

package/lib/node/isomorphic/grpc.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grpc.node.d.ts","sourceRoot":"","sources":["../../../src/isomorphic/grpc.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAC;AACvD,OAAO,KAAK,EACX,gBAAgB,EAChB,eAAe,EACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAEnE,OAAO,EACN,eAAe,IAAI,oBAAoB,EACvC,SAAS,IAAI,cAAc,EAC3B,iBAAiB,EACjB,gBAAgB,IAAI,qBAAqB,EACzC,eAAe,IAAI,oBAAoB,EACvC,qBAAqB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,MAAM,EACN,cAAc,EACd,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,GACrB,CAAC;AAGF,wBAAsB,YAAY,CACjC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,CAGjB"}
+{"version":3,"file":"grpc.node.d.ts","sourceRoot":"","sources":["../../../src/isomorphic/grpc.node.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,8BAA8B,CAAC;AACvD,OAAO,KAAK,EACX,gBAAgB,EAChB,eAAe,EACf,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAExE,OAAO,EACN,eAAe,IAAI,oBAAoB,EACvC,SAAS,IAAI,cAAc,EAC3B,qBAAqB,EACrB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EACX,iBAAiB,EACjB,gBAAgB,IAAI,qBAAqB,EACzC,eAAe,IAAI,oBAAoB,EACvC,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,eAAe,EACf,MAAM,EACN,cAAc,EACd,oBAAoB,EACpB,qBAAqB,GACrB,CAAC;AACF,YAAY,EACX,kBAAkB,EAClB,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EACrB,oBAAoB,GACpB,CAAC;AAGF,wBAAsB,YAAY,CACjC,GAAG,IAAI,EAAE,qBAAqB,CAAC,OAAO,MAAM,CAAC,GAC3C,OAAO,CAAC,MAAM,CAAC,CAGjB"}

package/lib/node/isomorphic/grpc.node.js

@@ -23,14 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClient = exports.CompressionAlgorithms = exports.LaserSubscribeUpdate = exports.LaserSubscribeRequest = exports.LaserCommitmentLevel = exports.LaserSubscribe = exports.CommitmentLevel = void 0;
+exports.createClient = exports.CompressionAlgorithms = exports.LaserCommitmentLevel = exports.LaserSubscribe = exports.CommitmentLevel = void 0;
 const yellowstone_grpc_1 = require("@triton-one/yellowstone-grpc");
 Object.defineProperty(exports, "CommitmentLevel", { enumerable: true, get: function () { return yellowstone_grpc_1.CommitmentLevel; } });
 const helius_laserstream_1 = require("helius-laserstream");
 Object.defineProperty(exports, "LaserCommitmentLevel", { enumerable: true, get: function () { return helius_laserstream_1.CommitmentLevel; } });
 Object.defineProperty(exports, "LaserSubscribe", { enumerable: true, get: function () { return helius_laserstream_1.subscribe; } });
-Object.defineProperty(exports, "LaserSubscribeRequest", { enumerable: true, get: function () { return helius_laserstream_1.SubscribeRequest; } });
-Object.defineProperty(exports, "LaserSubscribeUpdate", { enumerable: true, get: function () { return helius_laserstream_1.SubscribeUpdate; } });
 Object.defineProperty(exports, "CompressionAlgorithms", { enumerable: true, get: function () { return helius_laserstream_1.CompressionAlgorithms; } });
 // Export a function to create a new Client instance
 async function createClient(...args) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.142.0-beta.1",
+	"version": "2.142.0-beta.3",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",
@@ -42,7 +42,7 @@
 		"@coral-xyz/anchor": "0.29.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "1.4.5",
-		"@grpc/grpc-js": "1.12.6",
+		"@grpc/grpc-js": "1.14.0",
 		"@openbook-dex/openbook-v2": "0.2.10",
 		"@project-serum/serum": "0.13.65",
 		"@pythnetwork/client": "2.5.3",
@@ -52,7 +52,7 @@
 		"@solana/web3.js": "1.98.0",
 		"@switchboard-xyz/common": "3.0.14",
 		"@switchboard-xyz/on-demand": "2.4.1",
-		"@triton-one/yellowstone-grpc": "1.3.0",
+		"@triton-one/yellowstone-grpc": "1.4.1",
 		"anchor-bankrun": "0.3.0",
 		"gill": "^0.10.2",
 		"helius-laserstream": "0.1.8",

package/scripts/client-test.ts

@@ -0,0 +1,133 @@
+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 { decodeName, DRIFT_PROGRAM_ID, Wallet } from '../src';
+import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
+import dotenv from 'dotenv';
+
+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');
+	const wallet = new Wallet(new Keypair());
+	dotenv.config({ path: '../' });
+	const config: 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,
+				},
+			},
+			driftClientAccountSubscriber: grpcDriftClientAccountSubscriberV2,
+		},
+		perpMarketIndexes: [0, 1, 2], // Example market indexes
+		spotMarketIndexes: [0, 1, 2], // Example market indexes
+		oracleInfos: [], // Add oracle information if needed
+	};
+
+	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));
+				const perpMarketData = driftClient.getPerpMarketAccount(
+					data.marketIndex
+				);
+				console.log(
+					'Perp market data market index:',
+					perpMarketData?.marketIndex
+				);
+				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
+				);
+				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.');
+
+	await updatePromise;
+	console.log('Received required number of updates.');
+}
+
+initializeGrpcDriftClientV2().catch(console.error);

package/src/accounts/grpcAccountSubscriber.ts

@@ -39,13 +39,16 @@ export class grpcAccountSubscriber<T> extends WebSocketAccountSubscriber<T> {
 		program: Program,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => U,
-		resubOpts?: ResubOpts
+		resubOpts?: ResubOpts,
+		clientProp?: Client
 	): Promise<grpcAccountSubscriber<U>> {
-		const client = await createClient(
-			grpcConfigs.endpoint,
-			grpcConfigs.token,
-			grpcConfigs.channelOptions ?? {}
-		);
+		const client = clientProp
+			? clientProp
+			: await createClient(
+					grpcConfigs.endpoint,
+					grpcConfigs.token,
+					grpcConfigs.channelOptions ?? {}
+			  );
 		const commitmentLevel =
 			// @ts-ignore :: isomorphic exported enum fails typescript but will work at runtime
 			grpcConfigs.commitmentLevel ?? CommitmentLevel.CONFIRMED;

package/src/accounts/grpcDriftClientAccountSubscriber.ts

@@ -12,7 +12,7 @@ import { grpcAccountSubscriber } from './grpcAccountSubscriber';
 import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
 import { getOracleId } from '../oracles/oracleId';
 
-export class gprcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
+export class grpcDriftClientAccountSubscriber extends WebSocketDriftClientAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
 
 	constructor(

package/src/accounts/grpcDriftClientAccountSubscriberV2.ts

@@ -0,0 +1,358 @@
+import { WebSocketDriftClientAccountSubscriber } from './webSocketDriftClientAccountSubscriber';
+import { OracleInfo, OraclePriceData } from '../oracles/types';
+import { Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import { findAllMarketAndOracles } from '../config';
+import {
+	getDriftStateAccountPublicKey,
+	getPerpMarketPublicKey,
+	getSpotMarketPublicKey,
+} from '../addresses/pda';
+import {
+	DataAndSlot,
+	DelistedMarketSetting,
+	GrpcConfigs,
+	ResubOpts,
+} from './types';
+import { grpcAccountSubscriber } from './grpcAccountSubscriber';
+import { grpcMultiAccountSubscriber } from './grpcMultiAccountSubscriber';
+import { PerpMarketAccount, SpotMarketAccount, StateAccount } from '../types';
+import { getOracleId } from '../oracles/oracleId';
+
+export class grpcDriftClientAccountSubscriberV2 extends WebSocketDriftClientAccountSubscriber {
+	private grpcConfigs: GrpcConfigs;
+	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,
+		program: Program,
+		perpMarketIndexes: number[],
+		spotMarketIndexes: number[],
+		oracleInfos: OracleInfo[],
+		shouldFindAllMarketsAndOracles: boolean,
+		delistedMarketSetting: DelistedMarketSetting,
+		resubOpts?: ResubOpts
+	) {
+		super(
+			program,
+			perpMarketIndexes,
+			spotMarketIndexes,
+			oracleInfos,
+			shouldFindAllMarketsAndOracles,
+			delistedMarketSetting,
+			resubOpts
+		);
+		this.grpcConfigs = grpcConfigs;
+	}
+
+	public async subscribe(): Promise<boolean> {
+		if (this.isSubscribed) {
+			return true;
+		}
+
+		if (this.isSubscribing) {
+			return await this.subscriptionPromise;
+		}
+
+		this.isSubscribing = true;
+
+		this.subscriptionPromise = new Promise((res) => {
+			this.subscriptionPromiseResolver = res;
+		});
+
+		if (this.shouldFindAllMarketsAndOracles) {
+			const {
+				perpMarketIndexes,
+				perpMarketAccounts,
+				spotMarketIndexes,
+				spotMarketAccounts,
+				oracleInfos,
+			} = await findAllMarketAndOracles(this.program);
+			this.perpMarketIndexes = perpMarketIndexes;
+			this.spotMarketIndexes = spotMarketIndexes;
+			this.oracleInfos = oracleInfos;
+			// front run and set the initial data here to save extra gma call in set initial data
+			this.initialPerpMarketAccountData = new Map(
+				perpMarketAccounts.map((market) => [market.marketIndex, market])
+			);
+			this.initialSpotMarketAccountData = new Map(
+				spotMarketAccounts.map((market) => [market.marketIndex, market])
+			);
+		}
+
+		const statePublicKey = await getDriftStateAccountPublicKey(
+			this.program.programId
+		);
+
+		// create and activate main state account subscription
+		this.stateAccountSubscriber =
+			await grpcAccountSubscriber.create<StateAccount>(
+				this.grpcConfigs,
+				'state',
+				this.program,
+				statePublicKey,
+				undefined,
+				undefined
+			);
+		await this.stateAccountSubscriber.subscribe((data: StateAccount) => {
+			this.eventEmitter.emit('stateAccountUpdate', data);
+			this.eventEmitter.emit('update');
+		});
+
+		// set initial data to avoid spamming getAccountInfo calls in webSocketAccountSubscriber
+		await this.setInitialData();
+
+		// subscribe to perp + spot markets (separate) and oracles
+		await Promise.all([
+			this.subscribeToPerpMarketAccounts(),
+			this.subscribeToSpotMarketAccounts(),
+			this.subscribeToOracles(),
+		]);
+
+		this.eventEmitter.emit('update');
+
+		await this.handleDelistedMarkets();
+
+		await Promise.all([this.setPerpOracleMap(), this.setSpotOracleMap()]);
+
+		this.subscriptionPromiseResolver(true);
+
+		this.isSubscribing = false;
+		this.isSubscribed = true;
+
+		// delete initial data
+		this.removeInitialData();
+
+		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 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 =
+			await grpcMultiAccountSubscriber.create<PerpMarketAccount>(
+				this.grpcConfigs,
+				'perpMarket',
+				this.program,
+				undefined,
+				this.resubOpts,
+				undefined,
+				async () => {
+					try {
+						if (this.resubOpts?.logResubMessages) {
+							console.log(
+								'[grpcDriftClientAccountSubscriberV2] perp markets subscriber unsubscribed; resubscribing'
+							);
+						}
+						await this.subscribeToPerpMarketAccounts();
+					} catch (e) {
+						console.error('Perp markets resubscribe failed:', e);
+					}
+				}
+			);
+
+		for (const data of this.initialPerpMarketAccountData.values()) {
+			this.perpMarketsSubscriber.setAccountData(data.pubkey, data);
+		}
+
+		await this.perpMarketsSubscriber.subscribe(
+			perpMarketPubkeys,
+			(_accountId, data) => {
+				this.eventEmitter.emit(
+					'perpMarketAccountUpdate',
+					data as PerpMarketAccount
+				);
+				this.eventEmitter.emit('update');
+			}
+		);
+
+		return true;
+	}
+
+	override async subscribeToSpotMarketAccounts(): Promise<boolean> {
+		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 =
+			await grpcMultiAccountSubscriber.create<SpotMarketAccount>(
+				this.grpcConfigs,
+				'spotMarket',
+				this.program,
+				undefined,
+				this.resubOpts,
+				undefined,
+				async () => {
+					try {
+						if (this.resubOpts?.logResubMessages) {
+							console.log(
+								'[grpcDriftClientAccountSubscriberV2] spot markets subscriber unsubscribed; resubscribing'
+							);
+						}
+						await this.subscribeToSpotMarketAccounts();
+					} catch (e) {
+						console.error('Spot markets resubscribe failed:', e);
+					}
+				}
+			);
+
+		for (const data of this.initialSpotMarketAccountData.values()) {
+			this.spotMarketsSubscriber.setAccountData(data.pubkey, data);
+		}
+
+		await this.spotMarketsSubscriber.subscribe(
+			spotMarketPubkeys,
+			(_accountId, data) => {
+				this.eventEmitter.emit(
+					'spotMarketAccountUpdate',
+					data as SpotMarketAccount
+				);
+				this.eventEmitter.emit('update');
+			}
+		);
+
+		return true;
+	}
+
+	override async subscribeToOracles(): Promise<boolean> {
+		// Build list of unique oracle pubkeys and a lookup for sources
+		const uniqueOraclePubkeys = new Map<string, OracleInfo>();
+		for (const info of this.oracleInfos) {
+			const id = getOracleId(info.publicKey, info.source);
+			if (
+				!uniqueOraclePubkeys.has(id) &&
+				!info.publicKey.equals((PublicKey as any).default)
+			) {
+				uniqueOraclePubkeys.set(id, info);
+			}
+		}
+
+		const oraclePubkeys = Array.from(uniqueOraclePubkeys.values()).map(
+			(i) => i.publicKey
+		);
+		const pubkeyToSource = new Map<string, OracleInfo['source']>(
+			Array.from(uniqueOraclePubkeys.values()).map((i) => [
+				i.publicKey.toBase58(),
+				i.source,
+			])
+		);
+
+		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 source = pubkeyToSource.get(pubkey);
+					const client = this.oracleClientCache.get(
+						source,
+						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);
+					}
+				}
+			);
+
+		for (const data of this.initialOraclePriceData.entries()) {
+			this.oracleMultiSubscriber.setAccountData(
+				new PublicKey(data[0]),
+				data[1]
+			);
+		}
+
+		await this.oracleMultiSubscriber.subscribe(
+			oraclePubkeys,
+			(accountId, data) => {
+				const source = pubkeyToSource.get(accountId.toBase58());
+				this.eventEmitter.emit('oraclePriceUpdate', accountId, source, data);
+				this.eventEmitter.emit('update');
+			}
+		);
+
+		return true;
+	}
+
+	async unsubscribeFromOracles(): Promise<void> {
+		if (this.oracleMultiSubscriber) {
+			await this.oracleMultiSubscriber.unsubscribe();
+			this.oracleMultiSubscriber = undefined;
+			return;
+		}
+		await super.unsubscribeFromOracles();
+	}
+
+	override async unsubscribe(): Promise<void> {
+		if (this.isSubscribed) {
+			return;
+		}
+
+		await this.stateAccountSubscriber.unsubscribe();
+	}
+}