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

package/lib/orderSubscriber/types.d.ts

@@ -1,21 +1,12 @@
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 export type OrderSubscriberConfig = {
     driftClient: DriftClient;
     subscriptionConfig: {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        skipInitialLoad?: boolean;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        resyncIntervalMs?: number;
-        configs: GrpcConfigs;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;

package/lib/user.js

@@ -15,7 +15,6 @@ const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
 const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 const fuel_1 = require("./math/fuel");
-const grpcUserAccountSubscriber_1 = require("./accounts/grpcUserAccountSubscriber");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -24,7 +23,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -34,17 +33,11 @@ class User {
         else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
             this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
         }
-        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'grpc') {
-            this.accountSubscriber = new grpcUserAccountSubscriber_1.grpcUserAccountSubscriber(config.accountSubscription.configs, config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.resubTimeoutMs,
-                logResubMessages: (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.logResubMessages,
-            });
-        }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, {
-                resubTimeoutMs: (_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.resubTimeoutMs,
-                logResubMessages: (_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.logResubMessages,
-            }, (_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.commitment);
+                resubTimeoutMs: (_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.resubTimeoutMs,
+                logResubMessages: (_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.logResubMessages,
+            }, (_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }

package/lib/userConfig.d.ts

@@ -1,7 +1,7 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
+import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
@@ -18,9 +18,4 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'custom';
     userAccountSubscriber: UserAccountSubscriber;
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/lib/userMap/userMap.js

@@ -9,7 +9,6 @@ const memcmp_1 = require("../memcmp");
 const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const PollingSubscription_1 = require("./PollingSubscription");
 const user_1 = require("../decode/user");
-const grpcSubscription_1 = require("./grpcSubscription");
 const MAX_USER_ACCOUNT_SIZE_BYTES = 4376;
 class UserMap {
     /**
@@ -53,19 +52,6 @@ class UserMap {
                 skipInitialLoad: config.skipInitialLoad,
             });
         }
-        else if (config.subscriptionConfig.type === 'grpc') {
-            this.subscription = new grpcSubscription_1.grpcSubscription({
-                configs: config.subscriptionConfig.configs,
-                userMap: this,
-                commitment: this.commitment,
-                resubOpts: {
-                    resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
-                    logResubMessages: config.subscriptionConfig.logResubMessages,
-                },
-                skipInitialLoad: config.skipInitialLoad,
-                decodeFn,
-            });
-        }
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 userMap: this,

package/lib/userMap/userMapConfig.d.ts

@@ -1,6 +1,5 @@
 import { Commitment, Connection } from '@solana/web3.js';
 import { DriftClient } from '../driftClient';
-import { GrpcConfigs } from '../accounts/types';
 export type UserAccountFilterCriteria = {
     hasOpenOrders: boolean;
 };
@@ -18,12 +17,6 @@ export type UserMapConfig = {
         type: 'polling';
         frequency: number;
         commitment?: Commitment;
-    } | {
-        type: 'grpc';
-        configs: GrpcConfigs;
-        resubTimeoutMs?: number;
-        logResubMessages?: boolean;
-        commitment?: Commitment;
     } | {
         type: 'websocket';
         resubTimeoutMs?: number;

package/lib/userStatsConfig.d.ts

@@ -1,7 +1,6 @@
 import { DriftClient } from './driftClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-import { GrpcConfigs } from './accounts/types';
 export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
@@ -17,9 +16,4 @@ export type UserStatsSubscriptionConfig = {
     accountLoader: BulkAccountLoader;
 } | {
     type: 'custom';
-} | {
-    type: 'grpc';
-    resubTimeoutMs?: number;
-    logResubMessages?: boolean;
-    configs: GrpcConfigs;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.96.0-beta.1",
+	"version": "2.96.0-beta.3",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -37,7 +37,6 @@
 		"@coral-xyz/anchor": "0.28.0",
 		"@coral-xyz/anchor-30": "npm:@coral-xyz/anchor@0.30.1",
 		"@ellipsis-labs/phoenix-sdk": "^1.4.2",
-		"@grpc/grpc-js": "^1.11.2",
 		"@openbook-dex/openbook-v2": "^0.2.10",
 		"@project-serum/serum": "^0.13.38",
 		"@pythnetwork/client": "2.5.3",
@@ -46,7 +45,6 @@
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
 		"@switchboard-xyz/on-demand": "1.2.32",
-		"@triton-one/yellowstone-grpc": "^0.6.0",
 		"anchor-bankrun": "^0.3.0",
 		"node-cache": "^5.1.2",
 		"rpc-websockets": "7.5.1",

package/src/accounts/types.ts

@@ -12,8 +12,6 @@ import { EventEmitter } from 'events';
 import { Context, PublicKey } from '@solana/web3.js';
 import { Account } from '@solana/spl-token';
 import { OracleInfo, OraclePriceData } from '..';
-import { CommitmentLevel } from '@triton-one/yellowstone-grpc';
-import { ChannelOptions } from '@grpc/grpc-js';
 
 export interface AccountSubscriber<T> {
 	dataAndSlot?: DataAndSlot<T>;
@@ -203,10 +201,3 @@ export interface UserStatsAccountSubscriber {
 
 	getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
 }
-
-export type GrpcConfigs = {
-	endpoint: string;
-	token: string;
-	commitmentLevel?: CommitmentLevel;
-	channelOptions?: ChannelOptions;
-};

package/src/accounts/webSocketAccountSubscriber.ts

@@ -94,7 +94,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		};
 	}
 
-	protected setTimeout(): void {
+	private setTimeout(): void {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}

package/src/accounts/webSocketDriftClientAccountSubscriber.ts

@@ -60,9 +60,9 @@ export class WebSocketDriftClientAccountSubscriber
 	initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
 	initialOraclePriceData: Map<string, OraclePriceData>;
 
-	protected isSubscribing = false;
-	protected subscriptionPromise: Promise<boolean>;
-	protected subscriptionPromiseResolver: (val: boolean) => void;
+	private isSubscribing = false;
+	private subscriptionPromise: Promise<boolean>;
+	private subscriptionPromiseResolver: (val: boolean) => void;
 
 	public constructor(
 		program: Program,

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -98,7 +98,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		}
 	}
 
-	protected setTimeout(): void {
+	private setTimeout(): void {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}

package/src/driftClient.ts

@@ -152,7 +152,6 @@ import { isVersionedTransaction } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';
 import switchboardOnDemandIdl from './idl/switchboard_on_demand_30.json';
-import { gprcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -293,19 +292,6 @@ export class DriftClient {
 				type: 'polling',
 				accountLoader: config.accountSubscription.accountLoader,
 			};
-		} else if (config.accountSubscription?.type === 'grpc') {
-			this.userAccountSubscriptionConfig = {
-				type: 'grpc',
-				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-				logResubMessages: config.accountSubscription?.logResubMessages,
-				configs: config.accountSubscription?.configs,
-			};
-			this.userStatsAccountSubscriptionConfig = {
-				type: 'grpc',
-				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-				logResubMessages: config.accountSubscription?.logResubMessages,
-				configs: config.accountSubscription?.configs,
-			};
 		} else {
 			this.userAccountSubscriptionConfig = {
 				type: 'websocket',
@@ -352,19 +338,6 @@ export class DriftClient {
 				config.oracleInfos ?? [],
 				noMarketsAndOraclesSpecified
 			);
-		} else if (config.accountSubscription?.type === 'grpc') {
-			this.accountSubscriber = new gprcDriftClientAccountSubscriber(
-				config.accountSubscription.configs,
-				this.program,
-				config.perpMarketIndexes ?? [],
-				config.spotMarketIndexes ?? [],
-				config.oracleInfos ?? [],
-				noMarketsAndOraclesSpecified,
-				{
-					resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
-					logResubMessages: config.accountSubscription?.logResubMessages,
-				}
-			);
 		} else {
 			this.accountSubscriber = new WebSocketDriftClientAccountSubscriber(
 				this.program,
@@ -379,7 +352,6 @@ export class DriftClient {
 				config.accountSubscription?.commitment
 			);
 		}
-
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
 
 		this.metricsEventEmitter = new EventEmitter();

package/src/driftClientConfig.ts

@@ -11,7 +11,6 @@ import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
 import { TxHandler, TxHandlerConfig } from './tx/txHandler';
-import { GrpcConfigs } from './accounts/types';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -49,10 +48,4 @@ export type DriftClientSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
-	  }
-	| {
-			type: 'grpc';
-			configs: GrpcConfigs;
-			resubTimeoutMs?: number;
-			logResubMessages?: boolean;
 	  };

package/src/events/eventSubscriber.ts

@@ -9,6 +9,10 @@ import {
 	LogProvider,
 	EventSubscriberEvents,
 	WebSocketLogProviderConfig,
+	PollingLogProviderConfig,
+	EventsServerLogProviderConfig,
+	LogProviderType,
+	StreamingLogProviderConfig,
 } from './types';
 import { TxEventCache } from './txEventCache';
 import { EventList } from './eventList';
@@ -19,6 +23,7 @@ import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { getSortFn } from './sort';
 import { parseLogs } from './parse';
+import { EventsServerLogProvider } from './eventsServerLogProvider';
 
 export class EventSubscriber {
 	private address: PublicKey;
@@ -27,6 +32,7 @@ export class EventSubscriber {
 	private awaitTxPromises = new Map<string, Promise<void>>();
 	private awaitTxResolver = new Map<string, () => void>();
 	private logProvider: LogProvider;
+	private currentProviderType: LogProviderType;
 	public eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
 	private lastSeenSlot: number;
 	private lastSeenBlockTime: number | undefined;
@@ -43,22 +49,57 @@ export class EventSubscriber {
 		this.eventListMap = new Map<EventType, EventList<EventType>>();
 		this.eventEmitter = new EventEmitter();
 
-		if (this.options.logProviderConfig.type === 'websocket') {
+		this.currentProviderType = this.options.logProviderConfig.type;
+		this.initializeLogProvider();
+	}
+
+	private initializeLogProvider(subscribe = false) {
+		if (this.currentProviderType === 'websocket') {
+			const logProviderConfig = this.options
+				.logProviderConfig as WebSocketLogProviderConfig;
 			this.logProvider = new WebSocketLogProvider(
 				// @ts-ignore
 				this.connection,
 				this.address,
 				this.options.commitment,
-				this.options.logProviderConfig.resubTimeoutMs
+				logProviderConfig.resubTimeoutMs
 			);
-		} else {
+		} else if (this.currentProviderType === 'polling') {
+			const logProviderConfig = this.options
+				.logProviderConfig as PollingLogProviderConfig;
 			this.logProvider = new PollingLogProvider(
 				// @ts-ignore
 				this.connection,
 				this.address,
-				options.commitment,
-				this.options.logProviderConfig.frequency,
-				this.options.logProviderConfig.batchSize
+				this.options.commitment,
+				logProviderConfig.frequency,
+				logProviderConfig.batchSize
+			);
+		} else if (this.currentProviderType === 'events-server') {
+			const logProviderConfig = this.options
+				.logProviderConfig as EventsServerLogProviderConfig;
+			this.logProvider = new EventsServerLogProvider(
+				logProviderConfig.url,
+				this.options.eventTypes,
+				this.options.address ? this.options.address.toString() : undefined
+			);
+		} else {
+			throw new Error(`Invalid log provider type: ${this.currentProviderType}`);
+		}
+
+		if (subscribe) {
+			this.logProvider.subscribe(
+				(txSig, slot, logs, mostRecentBlockTime, txSigIndex) => {
+					this.handleTxLogs(
+						txSig,
+						slot,
+						logs,
+						mostRecentBlockTime,
+						this.currentProviderType === 'events-server',
+						txSigIndex
+					);
+				},
+				true
 			);
 		}
 	}
@@ -77,6 +118,33 @@ export class EventSubscriber {
 		}
 	}
 
+	/**
+	 * Implements fallback logic for reconnecting to LogProvider. Currently terminates at polling,
+	 * could be improved to try the original type again after some cooldown.
+	 */
+	private updateFallbackProviderType(
+		reconnectAttempts: number,
+		maxReconnectAttempts: number
+	) {
+		if (reconnectAttempts < maxReconnectAttempts) {
+			return;
+		}
+
+		let nextProviderType = this.currentProviderType;
+		if (this.currentProviderType === 'events-server') {
+			nextProviderType = 'websocket';
+		} else if (this.currentProviderType === 'websocket') {
+			nextProviderType = 'polling';
+		} else if (this.currentProviderType === 'polling') {
+			nextProviderType = 'polling';
+		}
+
+		console.log(
+			`EventSubscriber: Failing over providerType ${this.currentProviderType} to ${nextProviderType}`
+		);
+		this.currentProviderType = nextProviderType;
+	}
+
 	public async subscribe(): Promise<boolean> {
 		try {
 			if (this.logProvider.isSubscribed()) {
@@ -85,52 +153,46 @@ export class EventSubscriber {
 
 			this.populateInitialEventListMap();
 
-			if (this.options.logProviderConfig.type === 'websocket') {
-				if (this.options.logProviderConfig.resubTimeoutMs) {
-					if (
-						this.options.logProviderConfig.maxReconnectAttempts &&
-						this.options.logProviderConfig.maxReconnectAttempts > 0
-					) {
-						const logProviderConfig = this.options
-							.logProviderConfig as WebSocketLogProviderConfig;
-						this.logProvider.eventEmitter.on(
-							'reconnect',
-							(reconnectAttempts) => {
-								if (
-									reconnectAttempts > logProviderConfig.maxReconnectAttempts
-								) {
-									console.log('Failing over to polling');
-									this.logProvider.eventEmitter.removeAllListeners('reconnect');
-									this.unsubscribe().then(() => {
-										this.logProvider = new PollingLogProvider(
-											// @ts-ignore
-											this.connection,
-											this.address,
-											this.options.commitment,
-											logProviderConfig.fallbackFrequency,
-											logProviderConfig.fallbackBatchSize
-										);
-										this.logProvider.subscribe(
-											(txSig, slot, logs, mostRecentBlockTime) => {
-												this.handleTxLogs(
-													txSig,
-													slot,
-													logs,
-													mostRecentBlockTime
-												);
-											},
-											true
-										);
-									});
-								}
+			if (
+				this.options.logProviderConfig.type === 'websocket' ||
+				this.options.logProviderConfig.type === 'events-server'
+			) {
+				const logProviderConfig = this.options
+					.logProviderConfig as StreamingLogProviderConfig;
+
+				if (this.logProvider.eventEmitter) {
+					this.logProvider.eventEmitter.on(
+						'reconnect',
+						async (reconnectAttempts) => {
+							if (reconnectAttempts > logProviderConfig.maxReconnectAttempts) {
+								console.log(
+									`EventSubscriber: Reconnect attempts ${reconnectAttempts}/${logProviderConfig.maxReconnectAttempts}, reconnecting...`
+								);
+								this.logProvider.eventEmitter.removeAllListeners('reconnect');
+								await this.unsubscribe();
+								this.updateFallbackProviderType(
+									reconnectAttempts,
+									logProviderConfig.maxReconnectAttempts
+								);
+								this.initializeLogProvider(true);
 							}
-						);
-					}
+						}
+					);
 				}
 			}
-			this.logProvider.subscribe((txSig, slot, logs, mostRecentBlockTime) => {
-				this.handleTxLogs(txSig, slot, logs, mostRecentBlockTime);
-			}, true);
+			this.logProvider.subscribe(
+				(txSig, slot, logs, mostRecentBlockTime, txSigIndex) => {
+					this.handleTxLogs(
+						txSig,
+						slot,
+						logs,
+						mostRecentBlockTime,
+						this.currentProviderType === 'events-server',
+						txSigIndex
+					);
+				},
+				true
+			);
 
 			return true;
 		} catch (e) {
@@ -144,13 +206,20 @@ export class EventSubscriber {
 		txSig: TransactionSignature,
 		slot: number,
 		logs: string[],
-		mostRecentBlockTime: number | undefined
+		mostRecentBlockTime: number | undefined,
+		fromEventsServer = false,
+		txSigIndex: number | undefined = undefined
 	): void {
-		if (this.txEventCache.has(txSig)) {
+		if (!fromEventsServer && this.txEventCache.has(txSig)) {
 			return;
 		}
 
-		const wrappedEvents = this.parseEventsFromLogs(txSig, slot, logs);
+		const wrappedEvents = this.parseEventsFromLogs(
+			txSig,
+			slot,
+			logs,
+			txSigIndex
+		);
 
 		for (const wrappedEvent of wrappedEvents) {
 			this.eventListMap.get(wrappedEvent.eventType).insert(wrappedEvent);
@@ -225,7 +294,8 @@ export class EventSubscriber {
 	private parseEventsFromLogs(
 		txSig: TransactionSignature,
 		slot: number,
-		logs: string[]
+		logs: string[],
+		txSigIndex: number | undefined
 	): WrappedEvents {
 		const records = [];
 		// @ts-ignore
@@ -238,7 +308,8 @@ export class EventSubscriber {
 				event.data.txSig = txSig;
 				event.data.slot = slot;
 				event.data.eventType = event.name;
-				event.data.txSigIndex = runningEventIndex;
+				event.data.txSigIndex =
+					txSigIndex !== undefined ? txSigIndex : runningEventIndex;
 				records.push(event.data);
 			}
 			runningEventIndex++;