@drift-labs/sdk 2.96.0-beta.2 → 2.96.0-beta.3

package/src/accounts/grpcProgramAccountSubscriber.ts

@@ -1,181 +0,0 @@
-import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
-import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
-import * as Buffer from 'buffer';
-import { WebSocketProgramAccountSubscriber } from './webSocketProgramAccountSubscriber';
-import { ClientDuplexStream } from '@grpc/grpc-js';
-import Client, {
-	SubscribeRequest,
-	SubscribeUpdate,
-	CommitmentLevel,
-} from '@triton-one/yellowstone-grpc';
-
-export class grpcProgramAccountSubscriber<
-	T,
-> extends WebSocketProgramAccountSubscriber<T> {
-	client: Client;
-	stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;
-	commitmentLevel: CommitmentLevel;
-	listenerId?: number;
-
-	public constructor(
-		grpcConfigs: GrpcConfigs,
-		subscriptionName: string,
-		accountDiscriminator: string,
-		program: Program,
-		decodeBufferFn: (accountName: string, ix: Buffer) => T,
-		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
-			filters: [],
-		},
-		resubOpts?: ResubOpts
-	) {
-		super(
-			subscriptionName,
-			accountDiscriminator,
-			program,
-			decodeBufferFn,
-			options,
-			resubOpts
-		);
-		this.client = new Client(
-			grpcConfigs.endpoint,
-			grpcConfigs.token,
-			grpcConfigs.channelOptions ?? {}
-		);
-		this.commitmentLevel =
-			grpcConfigs.commitmentLevel ?? CommitmentLevel.CONFIRMED;
-	}
-
-	async subscribe(
-		onChange: (
-			accountId: PublicKey,
-			data: T,
-			context: Context,
-			buffer: Buffer
-		) => void
-	): Promise<void> {
-		if (this.listenerId != null || this.isUnsubscribing) {
-			return;
-		}
-
-		this.onChange = onChange;
-
-		// Subscribe with grpc
-		this.stream = await this.client.subscribe();
-		const request: SubscribeRequest = {
-			slots: {
-				slots: {},
-			},
-			accounts: {
-				drift: {
-					account: [],
-					owner: [this.program.programId.toBase58()],
-					// @ts-ignore
-					filters: this.options.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 accountInfo = {
-				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),
-			};
-
-			if (this.resubOpts?.resubTimeoutMs) {
-				this.receivingData = true;
-				clearTimeout(this.timeoutId);
-				this.handleRpcResponse(
-					{
-						slot,
-					},
-					{
-						accountId: new PublicKey(chunk.account.account.pubkey),
-						accountInfo,
-					}
-				);
-				this.setTimeout();
-			} else {
-				this.handleRpcResponse(
-					{
-						slot,
-					},
-					{
-						accountId: new PublicKey(chunk.account.account.pubkey),
-						accountInfo,
-					}
-				);
-			}
-		});
-
-		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;
-		});
-	}
-
-	public async unsubscribe(onResub = false): Promise<void> {
-		if (!onResub && this.resubOpts) {
-			this.resubOpts.resubTimeoutMs = undefined;
-		}
-		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;
-		}
-	}
-}

package/src/accounts/grpcUserAccountSubscriber.ts

@@ -1,48 +0,0 @@
-import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
-import { PublicKey } from '@solana/web3.js';
-import { UserAccount } from '../types';
-import { WebSocketUserAccountSubscriber } from './webSocketUserAccountSubscriber';
-import { grpcAccountSubscriber } from './grpcAccountSubscriber';
-
-export class grpcUserAccountSubscriber extends WebSocketUserAccountSubscriber {
-	private grpcConfigs: GrpcConfigs;
-
-	public constructor(
-		grpcConfigs: GrpcConfigs,
-		program: Program,
-		userAccountPublicKey: PublicKey,
-		resubOpts?: ResubOpts
-	) {
-		super(program, userAccountPublicKey, resubOpts);
-		this.grpcConfigs = grpcConfigs;
-	}
-
-	async subscribe(userAccount?: UserAccount): Promise<boolean> {
-		if (this.isSubscribed) {
-			return true;
-		}
-
-		this.userDataAccountSubscriber = new grpcAccountSubscriber(
-			this.grpcConfigs,
-			'user',
-			this.program,
-			this.userAccountPublicKey,
-			undefined,
-			this.resubOpts
-		);
-
-		if (userAccount) {
-			this.userDataAccountSubscriber.setData(userAccount);
-		}
-
-		await this.userDataAccountSubscriber.subscribe((data: UserAccount) => {
-			this.eventEmitter.emit('userAccountUpdate', data);
-			this.eventEmitter.emit('update');
-		});
-
-		this.eventEmitter.emit('update');
-		this.isSubscribed = true;
-		return true;
-	}
-}

package/src/accounts/grpcUserStatsAccountSubscriber.ts

@@ -1,51 +0,0 @@
-import { ResubOpts, GrpcConfigs } from './types';
-import { Program } from '@coral-xyz/anchor';
-import { Commitment, PublicKey } from '@solana/web3.js';
-import { UserStatsAccount } from '../types';
-import { WebSocketUserStatsAccountSubscriber } from './webSocketUserStatsAccountSubsriber';
-import { grpcAccountSubscriber } from './grpcAccountSubscriber';
-
-export class grpcUserStatsAccountSubscriber extends WebSocketUserStatsAccountSubscriber {
-	private grpcConfigs: GrpcConfigs;
-
-	public constructor(
-		grpcConfigs: GrpcConfigs,
-		program: Program,
-		userStatsAccountPublicKey: PublicKey,
-		resubOpts?: ResubOpts,
-		commitment?: Commitment
-	) {
-		super(program, userStatsAccountPublicKey, resubOpts, commitment);
-		this.grpcConfigs = grpcConfigs;
-	}
-
-	async subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean> {
-		if (this.isSubscribed) {
-			return true;
-		}
-
-		this.userStatsAccountSubscriber = new grpcAccountSubscriber(
-			this.grpcConfigs,
-			'userStats',
-			this.program,
-			this.userStatsAccountPublicKey,
-			undefined,
-			this.resubOpts
-		);
-
-		if (userStatsAccount) {
-			this.userStatsAccountSubscriber.setData(userStatsAccount);
-		}
-
-		await this.userStatsAccountSubscriber.subscribe(
-			(data: UserStatsAccount) => {
-				this.eventEmitter.emit('userStatsAccountUpdate', data);
-				this.eventEmitter.emit('update');
-			}
-		);
-
-		this.eventEmitter.emit('update');
-		this.isSubscribed = true;
-		return true;
-	}
-}

package/src/orderSubscriber/grpcSubscription.ts

@@ -1,126 +0,0 @@
-import { Commitment, Context, PublicKey } from '@solana/web3.js';
-import { Buffer } from 'buffer';
-import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
-import { OrderSubscriber } from './OrderSubscriber';
-import { GrpcConfigs, ResubOpts } from '../accounts/types';
-import { UserAccount } from '../types';
-import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
-
-export class grpcSubscription {
-	private orderSubscriber: OrderSubscriber;
-	private commitment: Commitment;
-	private skipInitialLoad: boolean;
-	private resubOpts?: ResubOpts;
-	private resyncIntervalMs?: number;
-
-	private subscriber?: grpcProgramAccountSubscriber<UserAccount>;
-	private resyncTimeoutId?: NodeJS.Timeout;
-
-	private decoded?: boolean;
-
-	private grpcConfigs: GrpcConfigs;
-
-	constructor({
-		grpcConfigs,
-		orderSubscriber,
-		commitment,
-		skipInitialLoad = false,
-		resubOpts,
-		resyncIntervalMs,
-		decoded = true,
-	}: {
-		grpcConfigs: GrpcConfigs;
-		orderSubscriber: OrderSubscriber;
-		commitment: Commitment;
-		skipInitialLoad?: boolean;
-		resubOpts?: ResubOpts;
-		resyncIntervalMs?: number;
-		decoded?: boolean;
-	}) {
-		this.orderSubscriber = orderSubscriber;
-		this.commitment = commitment;
-		this.skipInitialLoad = skipInitialLoad;
-		this.resubOpts = resubOpts;
-		this.resyncIntervalMs = resyncIntervalMs;
-		this.decoded = decoded;
-		this.grpcConfigs = grpcConfigs;
-	}
-
-	public async subscribe(): Promise<void> {
-		if (this.subscriber) {
-			return;
-		}
-
-		this.subscriber = new grpcProgramAccountSubscriber<UserAccount>(
-			this.grpcConfigs,
-			'OrderSubscriber',
-			'User',
-			this.orderSubscriber.driftClient.program,
-			this.orderSubscriber.decodeFn,
-			{
-				filters: [getUserFilter(), getNonIdleUserFilter()],
-				commitment: this.commitment,
-			},
-			this.resubOpts
-		);
-
-		await this.subscriber.subscribe(
-			(
-				accountId: PublicKey,
-				account: UserAccount,
-				context: Context,
-				buffer: Buffer
-			) => {
-				const userKey = accountId.toBase58();
-				if (this.decoded ?? true) {
-					this.orderSubscriber.tryUpdateUserAccount(
-						userKey,
-						'decoded',
-						account,
-						context.slot
-					);
-				} else {
-					this.orderSubscriber.tryUpdateUserAccount(
-						userKey,
-						'buffer',
-						buffer,
-						context.slot
-					);
-				}
-			}
-		);
-
-		if (!this.skipInitialLoad) {
-			await this.orderSubscriber.fetch();
-		}
-
-		if (this.resyncIntervalMs) {
-			const recursiveResync = () => {
-				this.resyncTimeoutId = setTimeout(() => {
-					this.orderSubscriber
-						.fetch()
-						.catch((e) => {
-							console.error('Failed to resync in OrderSubscriber');
-							console.log(e);
-						})
-						.finally(() => {
-							// eslint-disable-next-line @typescript-eslint/no-unused-vars
-							if (!this.resyncTimeoutId) return;
-							recursiveResync();
-						});
-				}, this.resyncIntervalMs);
-			};
-			recursiveResync();
-		}
-	}
-
-	public async unsubscribe(): Promise<void> {
-		if (!this.subscriber) return;
-		await this.subscriber.unsubscribe();
-		this.subscriber = undefined;
-		if (this.resyncTimeoutId !== undefined) {
-			clearTimeout(this.resyncTimeoutId);
-			this.resyncTimeoutId = undefined;
-		}
-	}
-}

package/src/userMap/grpcSubscription.ts

@@ -1,83 +0,0 @@
-import { UserMap } from './userMap';
-import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
-import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
-import { UserAccount } from '../types';
-import { Commitment, Context, PublicKey } from '@solana/web3.js';
-import { GrpcConfigs, ResubOpts } from '../accounts/types';
-import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
-
-export class grpcSubscription {
-	private configs: GrpcConfigs;
-	private userMap: UserMap;
-	private commitment: Commitment;
-	private skipInitialLoad: boolean;
-	private resubOpts?: ResubOpts;
-	private includeIdle?: boolean;
-	private decodeFn: (name: string, data: Buffer) => UserAccount;
-
-	private subscriber: WebSocketProgramAccountSubscriber<UserAccount>;
-
-	constructor({
-		configs,
-		userMap,
-		commitment,
-		skipInitialLoad = false,
-		resubOpts,
-		includeIdle = false,
-		decodeFn,
-	}: {
-		configs: GrpcConfigs;
-		userMap: UserMap;
-		commitment: Commitment;
-		skipInitialLoad?: boolean;
-		resubOpts?: ResubOpts;
-		includeIdle?: boolean;
-		decodeFn: (name: string, data: Buffer) => UserAccount;
-	}) {
-		this.userMap = userMap;
-		this.commitment = commitment;
-		this.skipInitialLoad = skipInitialLoad;
-		this.resubOpts = resubOpts;
-		this.includeIdle = includeIdle || false;
-		this.decodeFn = decodeFn;
-		this.configs = configs;
-	}
-
-	public async subscribe(): Promise<void> {
-		if (!this.subscriber) {
-			const filters = [getUserFilter()];
-			if (!this.includeIdle) {
-				filters.push(getNonIdleUserFilter());
-			}
-			this.subscriber = new grpcProgramAccountSubscriber<UserAccount>(
-				this.configs,
-				'UserMap',
-				'User',
-				this.userMap.driftClient.program,
-				this.decodeFn,
-				{
-					filters,
-					commitment: this.commitment,
-				},
-				this.resubOpts
-			);
-		}
-
-		await this.subscriber.subscribe(
-			(accountId: PublicKey, account: UserAccount, context: Context) => {
-				const userKey = accountId.toBase58();
-				this.userMap.updateUserAccount(userKey, account, context.slot);
-			}
-		);
-
-		if (!this.skipInitialLoad) {
-			await this.userMap.sync();
-		}
-	}
-
-	public async unsubscribe(): Promise<void> {
-		if (!this.subscriber) return;
-		await this.subscriber.unsubscribe();
-		this.subscriber = undefined;
-	}
-}