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

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;
-	}
-}