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

package/src/accounts/grpcMultiAccountSubscriber.ts

@@ -0,0 +1,343 @@
+import { Program } from '@coral-xyz/anchor';
+import { Context, PublicKey } from '@solana/web3.js';
+import * as Buffer from 'buffer';
+import bs58 from 'bs58';
+
+import {
+	Client,
+	ClientDuplexStream,
+	CommitmentLevel,
+	SubscribeRequest,
+	SubscribeUpdate,
+	createClient,
+} from '../isomorphic/grpc';
+import { DataAndSlot, GrpcConfigs, ResubOpts } from './types';
+
+interface AccountInfoLike {
+	owner: PublicKey;
+	lamports: number;
+	data: Buffer;
+	executable: boolean;
+	rentEpoch: number;
+}
+
+export class grpcMultiAccountSubscriber<T> {
+	private client: Client;
+	private stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
+	private commitmentLevel: CommitmentLevel;
+	private program: Program;
+	private accountName: string;
+	private decodeBufferFn?: (buffer: Buffer, pubkey?: string) => T;
+	private resubOpts?: ResubOpts;
+	private onUnsubscribe?: () => Promise<void>;
+
+	public listenerId?: number;
+	public isUnsubscribing = false;
+	private timeoutId?: ReturnType<typeof setTimeout>;
+	private receivingData = false;
+
+	private subscribedAccounts = new Set<string>();
+	private onChangeMap = new Map<
+		string,
+		(data: T, context: Context, buffer: Buffer) => void
+	>();
+
+	private dataMap = new Map<string, DataAndSlot<T>>();
+
+	private constructor(
+		client: Client,
+		commitmentLevel: CommitmentLevel,
+		accountName: string,
+		program: Program,
+		decodeBuffer?: (buffer: Buffer, pubkey?: string) => T,
+		resubOpts?: ResubOpts,
+		onUnsubscribe?: () => Promise<void>
+	) {
+		this.client = client;
+		this.commitmentLevel = commitmentLevel;
+		this.accountName = accountName;
+		this.program = program;
+		this.decodeBufferFn = decodeBuffer;
+		this.resubOpts = resubOpts;
+		this.onUnsubscribe = onUnsubscribe;
+	}
+
+	public static async create<U>(
+		grpcConfigs: GrpcConfigs,
+		accountName: string,
+		program: Program,
+		decodeBuffer?: (buffer: Buffer, pubkey?: string) => U,
+		resubOpts?: ResubOpts,
+		clientProp?: Client,
+		onUnsubscribe?: () => Promise<void>
+	): Promise<grpcMultiAccountSubscriber<U>> {
+		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;
+
+		return new grpcMultiAccountSubscriber(
+			client,
+			commitmentLevel,
+			accountName,
+			program,
+			decodeBuffer,
+			resubOpts,
+			onUnsubscribe
+		);
+	}
+
+	setAccountData(accountPubkey: string, data: T, slot?: number): void {
+		this.dataMap.set(accountPubkey, { data, slot });
+	}
+
+	getAccountData(accountPubkey: string): DataAndSlot<T> | undefined {
+		return this.dataMap.get(accountPubkey);
+	}
+
+	getAccountDataMap(): Map<string, DataAndSlot<T>> {
+		return this.dataMap;
+	}
+
+	async subscribe(
+		accounts: PublicKey[],
+		onChange: (
+			accountId: PublicKey,
+			data: T,
+			context: Context,
+			buffer: Buffer
+		) => void
+	): Promise<void> {
+		if (this.listenerId != null || this.isUnsubscribing) {
+			return;
+		}
+
+		// Track accounts and single onChange for all
+		for (const pk of accounts) {
+			const key = pk.toBase58();
+			this.subscribedAccounts.add(key);
+			this.onChangeMap.set(key, (data, ctx, buffer) => {
+				this.setAccountData(key, data, ctx.slot);
+				onChange(new PublicKey(key), data, ctx, buffer);
+			});
+		}
+
+		this.stream =
+			(await this.client.subscribe()) as unknown as typeof this.stream;
+		const request: SubscribeRequest = {
+			slots: {},
+			accounts: {
+				account: {
+					account: accounts.map((a) => a.toBase58()),
+					owner: [],
+					filters: [],
+				},
+			},
+			transactions: {},
+			blocks: {},
+			blocksMeta: {},
+			accountsDataSlice: [],
+			commitment: this.commitmentLevel,
+			entry: {},
+			transactionsStatus: {},
+		};
+
+		this.stream.on('data', (chunk: SubscribeUpdate) => {
+			if (!chunk.account) {
+				return;
+			}
+			const slot = Number(chunk.account.slot);
+			const accountPubkeyBytes = chunk.account.account.pubkey;
+			const accountPubkey = bs58.encode(
+				accountPubkeyBytes as unknown as Uint8Array
+			);
+			if (!accountPubkey || !this.subscribedAccounts.has(accountPubkey)) {
+				return;
+			}
+			const accountInfo: AccountInfoLike = {
+				owner: new PublicKey(chunk.account.account.owner),
+				lamports: Number(chunk.account.account.lamports),
+				data: Buffer.Buffer.from(chunk.account.account.data),
+				executable: chunk.account.account.executable,
+				rentEpoch: Number(chunk.account.account.rentEpoch),
+			};
+
+			const context = { slot } as Context;
+			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 (this.resubOpts?.resubTimeoutMs) {
+					this.receivingData = true;
+					clearTimeout(this.timeoutId);
+					handler(data, context, buffer);
+					this.setTimeout();
+				} else {
+					handler(data, context, buffer);
+				}
+			}
+		});
+
+		return new Promise<void>((resolve, reject) => {
+			this.stream.write(request, (err) => {
+				if (err === null || err === undefined) {
+					this.listenerId = 1;
+					if (this.resubOpts?.resubTimeoutMs) {
+						this.receivingData = true;
+						this.setTimeout();
+					}
+					resolve();
+				} else {
+					reject(err);
+				}
+			});
+		}).catch((reason) => {
+			console.error(reason);
+			throw reason;
+		});
+	}
+
+	async addAccounts(accounts: PublicKey[]): Promise<void> {
+		for (const pk of accounts) {
+			this.subscribedAccounts.add(pk.toBase58());
+		}
+		const request: SubscribeRequest = {
+			slots: {},
+			accounts: {
+				account: {
+					account: Array.from(this.subscribedAccounts.values()),
+					owner: [],
+					filters: [],
+				},
+			},
+			transactions: {},
+			blocks: {},
+			blocksMeta: {},
+			accountsDataSlice: [],
+			commitment: this.commitmentLevel,
+			entry: {},
+			transactionsStatus: {},
+		};
+
+		await new Promise<void>((resolve, reject) => {
+			this.stream.write(request, (err) => {
+				if (err === null || err === undefined) {
+					resolve();
+				} else {
+					reject(err);
+				}
+			});
+		});
+	}
+
+	async removeAccounts(accounts: PublicKey[]): Promise<void> {
+		for (const pk of accounts) {
+			const k = pk.toBase58();
+			this.subscribedAccounts.delete(k);
+			this.onChangeMap.delete(k);
+		}
+		const request: SubscribeRequest = {
+			slots: {},
+			accounts: {
+				account: {
+					account: Array.from(this.subscribedAccounts.values()),
+					owner: [],
+					filters: [],
+				},
+			},
+			transactions: {},
+			blocks: {},
+			blocksMeta: {},
+			accountsDataSlice: [],
+			commitment: this.commitmentLevel,
+			entry: {},
+			transactionsStatus: {},
+		};
+
+		await new Promise<void>((resolve, reject) => {
+			this.stream.write(request, (err) => {
+				if (err === null || err === undefined) {
+					resolve();
+				} else {
+					reject(err);
+				}
+			});
+		});
+	}
+
+	async unsubscribe(): Promise<void> {
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+		this.timeoutId = undefined;
+
+		if (this.listenerId != null) {
+			const promise = new Promise<void>((resolve, reject) => {
+				const request: SubscribeRequest = {
+					slots: {},
+					accounts: {},
+					transactions: {},
+					blocks: {},
+					blocksMeta: {},
+					accountsDataSlice: [],
+					entry: {},
+					transactionsStatus: {},
+				};
+				this.stream.write(request, (err) => {
+					if (err === null || err === undefined) {
+						this.listenerId = undefined;
+						this.isUnsubscribing = false;
+						resolve();
+					} else {
+						reject(err);
+					}
+				});
+			}).catch((reason) => {
+				console.error(reason);
+				throw reason;
+			});
+			return promise;
+		} else {
+			this.isUnsubscribing = false;
+		}
+
+		if (this.onUnsubscribe) {
+			try {
+				await this.onUnsubscribe();
+			} catch (e) {
+				console.error(e);
+			}
+		}
+	}
+
+	private setTimeout(): void {
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					return;
+				}
+				if (this.receivingData) {
+					await this.unsubscribe();
+					this.receivingData = false;
+				}
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
+	}
+
+	private capitalize(value: string): string {
+		if (!value) return value;
+		return value.charAt(0).toUpperCase() + value.slice(1);
+	}
+}

package/src/constants/spotMarkets.ts

@@ -39,8 +39,8 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'USDC',
 		marketIndex: 0,
 		poolId: 0,
-		oracle: new PublicKey('En8hkHLkRe9d9DraYmBTrus518BvmVH448YcvmrFM6Ce'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
+		oracle: new PublicKey('9VCioxmni2gDLv11qufWzT3RDERhQE4iY5Gf7NTfYyAV'),
+		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
 		mint: new PublicKey('8zGuJQqwhZafTah7Uc7Z4tXRnguqkn5KLFAP8oV6PHe2'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
@@ -52,8 +52,8 @@ export const DevnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'SOL',
 		marketIndex: 1,
 		poolId: 0,
-		oracle: new PublicKey('BAtFj4kQttZRVep3UZS2aZRDixkGYgWsbqTBVDbnSsPF'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('3m6i4RFWEDw2Ft4tFHPJtYgmpPe21k56M3FHeWYrgGBz'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey(WRAPPED_SOL_MINT),
 		precision: LAMPORTS_PRECISION,
 		precisionExp: LAMPORTS_EXP,

package/src/driftClient.ts

@@ -189,7 +189,7 @@ import {
 } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed, AnchorUtils } from '@switchboard-xyz/on-demand';
-import { gprcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
+import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 import nacl from 'tweetnacl';
 import { Slothash } from './slot/SlothashSubscriber';
 import { getOracleId } from './oracles/oracleId';
@@ -434,7 +434,10 @@ export class DriftClient {
 				delistedMarketSetting
 			);
 		} else if (config.accountSubscription?.type === 'grpc') {
-			this.accountSubscriber = new gprcDriftClientAccountSubscriber(
+			const accountSubscriberClass =
+				config.accountSubscription?.driftClientAccountSubscriber ??
+				grpcDriftClientAccountSubscriber;
+			this.accountSubscriber = new accountSubscriberClass(
 				config.accountSubscription.grpcConfigs,
 				this.program,
 				config.perpMarketIndexes ?? [],

package/src/driftClientConfig.ts

@@ -22,6 +22,8 @@ import { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscri
 import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
 import { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
 import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
+import { grpcDriftClientAccountSubscriberV2 } from './accounts/grpcDriftClientAccountSubscriberV2';
+import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -60,6 +62,17 @@ export type DriftClientSubscriptionConfig =
 			grpcConfigs: GrpcConfigs;
 			resubTimeoutMs?: number;
 			logResubMessages?: boolean;
+			driftClientAccountSubscriber?: new (
+				grpcConfigs: GrpcConfigs,
+				program: Program,
+				perpMarketIndexes: number[],
+				spotMarketIndexes: number[],
+				oracleInfos: OracleInfo[],
+				shouldFindAllMarketsAndOracles: boolean,
+				delistedMarketSetting: DelistedMarketSetting
+			) =>
+				| grpcDriftClientAccountSubscriberV2
+				| grpcDriftClientAccountSubscriber;
 	  }
 	| {
 			type: 'websocket';

package/src/isomorphic/grpc.node.ts

@@ -4,30 +4,34 @@ import type {
 	SubscribeUpdate,
 } from '@triton-one/yellowstone-grpc';
 import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ClientDuplexStream, ChannelOptions } from '@grpc/grpc-js';
+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,
-	CompressionAlgorithms,
 } from 'helius-laserstream';
 
 export {
-	ClientDuplexStream,
-	ChannelOptions,
-	SubscribeRequest,
-	SubscribeUpdate,
 	CommitmentLevel,
 	Client,
 	LaserSubscribe,
 	LaserCommitmentLevel,
+	CompressionAlgorithms,
+};
+export type {
+	ClientDuplexStream,
+	ChannelOptions,
+	SubscribeRequest,
+	SubscribeUpdate,
 	LaserstreamConfig,
 	LaserSubscribeRequest,
 	LaserSubscribeUpdate,
-	CompressionAlgorithms,
 };
 
 // Export a function to create a new Client instance

package/src/types.ts

@@ -1669,13 +1669,15 @@ export type RevenueShareEscrowAccount = {
 };
 
 export type RevenueShareOrder = {
-	builderIdx: number;
 	feesAccrued: BN;
 	orderId: number;
 	feeTenthBps: number;
 	marketIndex: number;
+	subAccountId: number;
+	builderIdx: number;
 	bitFlags: number;
-	marketType: MarketType; // 0: spot, 1: perp
+	userOrderIndex: number;
+	marketType: MarketType;
 	padding: number[];
 };