@drift-labs/sdk 2.82.0-beta.2 → 2.82.0-beta.20

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -1,4 +1,9 @@
-import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import {
+	DataAndSlot,
+	BufferAndSlot,
+	ProgramAccountSubscriber,
+	ResubOpts,
+} from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
 import {
 	Commitment,
@@ -25,7 +30,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		buffer: Buffer
 	) => void;
 	listenerId?: number;
-	resubTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	isUnsubscribing = false;
 	timeoutId?: NodeJS.Timeout;
 	options: { filters: MemcmpFilter[]; commitment?: Commitment };
@@ -40,14 +45,14 @@ export class WebSocketProgramAccountSubscriber<T>
 		options: { filters: MemcmpFilter[]; commitment?: Commitment } = {
 			filters: [],
 		},
-		resubTimeoutMs?: number
+		resubOpts?: ResubOpts
 	) {
 		this.subscriptionName = subscriptionName;
 		this.accountDiscriminator = accountDiscriminator;
 		this.program = program;
 		this.decodeBuffer = decodeBufferFn;
-		this.resubTimeoutMs = resubTimeoutMs;
-		if (this.resubTimeoutMs < 1000) {
+		this.resubOpts = resubOpts;
+		if (this.resubOpts?.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -73,7 +78,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		this.listenerId = this.program.provider.connection.onProgramAccountChange(
 			this.program.programId,
 			(keyedAccountInfo, context) => {
-				if (this.resubTimeoutMs) {
+				if (this.resubOpts?.resubTimeoutMs) {
 					this.receivingData = true;
 					clearTimeout(this.timeoutId);
 					this.handleRpcResponse(context, keyedAccountInfo);
@@ -87,7 +92,7 @@ export class WebSocketProgramAccountSubscriber<T>
 			this.options.filters
 		);
 
-		if (this.resubTimeoutMs) {
+		if (this.resubOpts?.resubTimeoutMs) {
 			this.receivingData = true;
 			this.setTimeout();
 		}
@@ -97,21 +102,26 @@ export class WebSocketProgramAccountSubscriber<T>
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(async () => {
-			if (this.isUnsubscribing) {
-				// If we are in the process of unsubscribing, do not attempt to resubscribe
-				return;
-			}
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					// If we are in the process of unsubscribing, do not attempt to resubscribe
+					return;
+				}
 
-			if (this.receivingData) {
-				console.log(
-					`No ws data from ${this.subscriptionName} in ${this.resubTimeoutMs}ms, resubscribing`
-				);
-				await this.unsubscribe(true);
-				this.receivingData = false;
-				await this.subscribe(this.onChange);
-			}
-		}, this.resubTimeoutMs);
+				if (this.receivingData) {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
+						);
+					}
+					await this.unsubscribe(true);
+					this.receivingData = false;
+					await this.subscribe(this.onChange);
+				}
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
 	}
 
 	handleRpcResponse(
@@ -163,7 +173,7 @@ export class WebSocketProgramAccountSubscriber<T>
 
 	unsubscribe(onResub = false): Promise<void> {
 		if (!onResub) {
-			this.resubTimeoutMs = undefined;
+			this.resubOpts.resubTimeoutMs = undefined;
 		}
 		this.isUnsubscribing = true;
 		clearTimeout(this.timeoutId);

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -4,6 +4,7 @@ import {
 	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
+	ResubOpts,
 } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -14,7 +15,7 @@ import { UserAccount } from '../types';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
-	reconnectTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
@@ -25,14 +26,14 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	public constructor(
 		program: Program,
 		userAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
+		this.resubOpts = resubOpts;
 		this.userAccountPublicKey = userAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
-		this.reconnectTimeoutMs = reconnectTimeoutMs;
 		this.commitment = commitment;
 	}
 
@@ -46,7 +47,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			this.program,
 			this.userAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -4,6 +4,7 @@ import {
 	NotSubscribedError,
 	UserStatsAccountSubscriber,
 	UserStatsAccountEvents,
+	ResubOpts,
 } from './types';
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -16,7 +17,7 @@ export class WebSocketUserStatsAccountSubscriber
 	implements UserStatsAccountSubscriber
 {
 	isSubscribed: boolean;
-	reconnectTimeoutMs?: number;
+	resubOpts?: ResubOpts;
 	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
@@ -27,14 +28,14 @@ export class WebSocketUserStatsAccountSubscriber
 	public constructor(
 		program: Program,
 		userStatsAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number,
+		resubOpts?: ResubOpts,
 		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.userStatsAccountPublicKey = userStatsAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
-		this.reconnectTimeoutMs = reconnectTimeoutMs;
+		this.resubOpts = resubOpts;
 		this.commitment = commitment;
 	}
 
@@ -48,7 +49,7 @@ export class WebSocketUserStatsAccountSubscriber
 			this.program,
 			this.userStatsAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs,
+			this.resubOpts,
 			this.commitment
 		);
 

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -6,20 +6,26 @@ import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
 import { ConfirmOptions, Context, PublicKey } from '@solana/web3.js';
 import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
+import { ResubOpts } from '../accounts/types';
 
 export class AuctionSubscriber {
 	private driftClient: DriftClient;
 	private opts: ConfirmOptions;
-	private resubTimeoutMs?: number;
+	private resubOpts?: ResubOpts;
 
 	eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
 	private subscriber: WebSocketProgramAccountSubscriber<UserAccount>;
 
-	constructor({ driftClient, opts, resubTimeoutMs }: AuctionSubscriberConfig) {
+	constructor({
+		driftClient,
+		opts,
+		resubTimeoutMs,
+		logResubMessages,
+	}: AuctionSubscriberConfig) {
 		this.driftClient = driftClient;
 		this.opts = opts || this.driftClient.opts;
 		this.eventEmitter = new EventEmitter();
-		this.resubTimeoutMs = resubTimeoutMs;
+		this.resubOpts = { resubTimeoutMs, logResubMessages };
 	}
 
 	public async subscribe() {
@@ -35,7 +41,7 @@ export class AuctionSubscriber {
 					filters: [getUserFilter(), getUserWithAuctionFilter()],
 					commitment: this.opts.commitment,
 				},
-				this.resubTimeoutMs
+				this.resubOpts
 			);
 		}
 

package/src/auctionSubscriber/types.ts

@@ -6,6 +6,7 @@ export type AuctionSubscriberConfig = {
 	driftClient: DriftClient;
 	opts?: ConfirmOptions;
 	resubTimeoutMs?: number;
+	logResubMessages?: boolean;
 };
 
 export interface AuctionSubscriberEvents {

package/src/clock/clockSubscriber.ts

@@ -0,0 +1,113 @@
+import { Commitment, Connection, SYSVAR_CLOCK_PUBKEY } from '@solana/web3.js';
+import { EventEmitter } from 'events';
+import StrictEventEmitter from 'strict-event-emitter-types/types/src';
+import { BN } from '..';
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+type ClockSubscriberConfig = {
+	commitment: Commitment;
+	resubTimeoutMs?: number;
+};
+
+export interface ClockSubscriberEvent {
+	clockUpdate: (ts: number) => void;
+}
+
+export class ClockSubscriber {
+	private latestSlot: number;
+	currentTs: number;
+	private subscriptionId: number;
+	commitment: Commitment;
+	eventEmitter: StrictEventEmitter<EventEmitter, ClockSubscriberEvent>;
+
+	// Reconnection
+	private timeoutId?: NodeJS.Timeout;
+	private resubTimeoutMs?: number;
+	private isUnsubscribing = false;
+	private receivingData = false;
+
+	public constructor(
+		private connection: Connection,
+		config?: ClockSubscriberConfig
+	) {
+		this.eventEmitter = new EventEmitter();
+		this.resubTimeoutMs = config?.resubTimeoutMs;
+		this.commitment = config?.commitment || 'confirmed';
+		if (this.resubTimeoutMs < 1000) {
+			console.log(
+				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
+			);
+		}
+	}
+
+	public async subscribe(): Promise<void> {
+		if (this.subscriptionId != null) {
+			return;
+		}
+
+		this.subscriptionId = this.connection.onAccountChange(
+			SYSVAR_CLOCK_PUBKEY,
+			(acctInfo, context) => {
+				if (!this.latestSlot || this.latestSlot < context.slot) {
+					if (this.resubTimeoutMs && !this.isUnsubscribing) {
+						this.receivingData = true;
+						clearTimeout(this.timeoutId);
+						this.setTimeout();
+					}
+					this.latestSlot = context.slot;
+					this.currentTs = new BN(
+						acctInfo.data.subarray(32, 39),
+						undefined,
+						'le'
+					).toNumber();
+					this.eventEmitter.emit('clockUpdate', this.currentTs);
+				}
+			},
+			this.commitment
+		);
+
+		if (this.resubTimeoutMs) {
+			this.receivingData = true;
+			this.setTimeout();
+		}
+	}
+
+	private setTimeout(): void {
+		this.timeoutId = setTimeout(async () => {
+			if (this.isUnsubscribing) {
+				// If we are in the process of unsubscribing, do not attempt to resubscribe
+				return;
+			}
+
+			if (this.receivingData) {
+				console.log(
+					`No new slot in ${this.resubTimeoutMs}ms, slot subscriber resubscribing`
+				);
+				await this.unsubscribe(true);
+				this.receivingData = false;
+				await this.subscribe();
+			}
+		}, this.resubTimeoutMs);
+	}
+
+	public getUnixTs(): number {
+		return this.currentTs;
+	}
+
+	public async unsubscribe(onResub = false): Promise<void> {
+		if (!onResub) {
+			this.resubTimeoutMs = undefined;
+		}
+		this.isUnsubscribing = true;
+		clearTimeout(this.timeoutId);
+		this.timeoutId = undefined;
+
+		if (this.subscriptionId != null) {
+			await this.connection.removeAccountChangeListener(this.subscriptionId);
+			this.subscriptionId = undefined;
+			this.isUnsubscribing = false;
+		} else {
+			this.isUnsubscribing = false;
+		}
+	}
+}

package/src/constants/perpMarkets.ts

@@ -553,9 +553,9 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		symbol: 'KMNO-PERP',
 		baseAssetSymbol: 'KMNO',
 		marketIndex: 28,
-		oracle: new PublicKey('sDAQaZQJQ4RXAxH3x526mbEXyQZT15ktkL84d7hmk7M'),
+		oracle: new PublicKey('6ynsvjkE2UoiRScbDx7ZxbBsyn7wyvg5P1vENvhtkG1C'),
 		launchTs: 1712240681000,
-		oracleSource: OracleSource.Prelaunch,
+		oracleSource: OracleSource.SWITCHBOARD,
 	},
 	{
 		fullName: 'Tensor',

package/src/constants/spotMarkets.ts

@@ -240,6 +240,19 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		),
 		launchTs: 1712593532000,
 	},
+	{
+		symbol: 'DRIFT',
+		marketIndex: 15,
+		oracle: new PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+		oracleSource: OracleSource.SWITCHBOARD,
+		mint: new PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
+		precision: new BN(10).pow(SIX),
+		precisionExp: SIX,
+		phoenixMarket: new PublicKey(
+			'8BV6rrWsUabnTDA3dE6A69oUDJAj3hMhtBHTJyXB7czp'
+		),
+		launchTs: 1715860800000,
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/dlob/DLOB.ts

@@ -985,7 +985,7 @@ export class DLOB {
 
 		for (const bidGenerator of bidGenerators) {
 			for (const bid of bidGenerator) {
-				if (isOrderExpired(bid.order, ts, true)) {
+				if (isOrderExpired(bid.order, ts, true, 25)) {
 					nodesToFill.push({
 						node: bid,
 						makerNodes: [],
@@ -996,7 +996,7 @@ export class DLOB {
 
 		for (const askGenerator of askGenerators) {
 			for (const ask of askGenerator) {
-				if (isOrderExpired(ask.order, ts, true)) {
+				if (isOrderExpired(ask.order, ts, true, 25)) {
 					nodesToFill.push({
 						node: ask,
 						makerNodes: [],

package/src/dlob/orderBookLevels.ts

@@ -413,6 +413,8 @@ function groupL2Levels(
 					currentLevel.sources[source] = size;
 				}
 			}
+
+			groupedLevels[groupedLevels.length - 1] = currentLevel;
 		} else {
 			const groupedLevel = {
 				price: price,