@drift-labs/sdk 2.82.0-beta.16 → 2.82.0-beta.18

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.16
+2.82.0-beta.18

package/lib/clock/clockSubscriber.d.ts

@@ -0,0 +1,29 @@
+/// <reference types="node" />
+import { Commitment, Connection } from '@solana/web3.js';
+import { EventEmitter } from 'events';
+import StrictEventEmitter from 'strict-event-emitter-types/types/src';
+type ClockSubscriberConfig = {
+    commitment: Commitment;
+    resubTimeoutMs?: number;
+};
+export interface ClockSubscriberEvent {
+    clockUpdate: (ts: number) => void;
+}
+export declare class ClockSubscriber {
+    private connection;
+    private latestSlot;
+    currentTs: number;
+    private subscriptionId;
+    commitment: Commitment;
+    eventEmitter: StrictEventEmitter<EventEmitter, ClockSubscriberEvent>;
+    private timeoutId?;
+    private resubTimeoutMs?;
+    private isUnsubscribing;
+    private receivingData;
+    constructor(connection: Connection, config?: ClockSubscriberConfig);
+    subscribe(): Promise<void>;
+    private setTimeout;
+    getUnixTs(): number;
+    unsubscribe(onResub?: boolean): Promise<void>;
+}
+export {};

package/lib/clock/clockSubscriber.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClockSubscriber = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const events_1 = require("events");
+const __1 = require("..");
+class ClockSubscriber {
+    constructor(connection, config) {
+        this.connection = connection;
+        this.isUnsubscribing = false;
+        this.receivingData = false;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.resubTimeoutMs = config === null || config === void 0 ? void 0 : config.resubTimeoutMs;
+        this.commitment = (config === null || config === void 0 ? void 0 : config.commitment) || 'confirmed';
+        if (this.resubTimeoutMs < 1000) {
+            console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
+        }
+    }
+    async subscribe() {
+        if (this.subscriptionId != null) {
+            return;
+        }
+        this.subscriptionId = this.connection.onAccountChange(web3_js_1.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 __1.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();
+        }
+    }
+    setTimeout() {
+        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);
+    }
+    getUnixTs() {
+        return this.currentTs;
+    }
+    async unsubscribe(onResub = false) {
+        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;
+        }
+    }
+}
+exports.ClockSubscriber = ClockSubscriber;

package/lib/constants/spotMarkets.js

@@ -197,6 +197,16 @@ exports.MainnetSpotMarkets = [
         phoenixMarket: new web3_js_1.PublicKey('AbJCZ9TAJiby5AY3cHcXS2gUdENC6mtsm6m7XpC2ZMvE'),
         launchTs: 1712593532000,
     },
+    {
+        symbol: 'DRIFT',
+        marketIndex: 15,
+        oracle: new web3_js_1.PublicKey('PeNpQeGEm9UEFJ6MBCMauY4WW4h3YxoESPWbsqVKucE'),
+        oracleSource: __1.OracleSource.SWITCHBOARD,
+        mint: new web3_js_1.PublicKey('DriFtupJYLTosbwoN8koMbEYSx54aFAVLddWsbksjwg7'),
+        precision: new __1.BN(10).pow(numericConstants_1.SIX),
+        precisionExp: numericConstants_1.SIX,
+        launchTs: 1715860800000,
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/index.d.ts

@@ -101,4 +101,5 @@ export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
+export * from './clock/clockSubscriber';
 export { BN, PublicKey, pyth };

package/lib/index.js

@@ -124,3 +124,4 @@ __exportStar(require("./auctionSubscriber/types"), exports);
 __exportStar(require("./memcmp"), exports);
 __exportStar(require("./decode/user"), exports);
 __exportStar(require("./blockhashSubscriber"), exports);
+__exportStar(require("./clock/clockSubscriber"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.82.0-beta.16",
+	"version": "2.82.0-beta.18",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

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/spotMarkets.ts

@@ -240,6 +240,16 @@ 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,
+		launchTs: 1715860800000,
+	},
 ];
 
 export const SpotMarkets: { [key in DriftEnv]: SpotMarketConfig[] } = {

package/src/index.ts

@@ -102,5 +102,6 @@ export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
+export * from './clock/clockSubscriber';
 
 export { BN, PublicKey, pyth };

package/tests/dlob/helpers.ts

@@ -350,6 +350,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			lastIndexPriceTwapTs: new BN(0),
 		},
 		pausedOperations: 0,
+		ifPausedOperations: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -432,6 +433,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			lastIndexPriceTwapTs: new BN(0),
 		},
 		pausedOperations: 0,
+		ifPausedOperations: 0,
 	},
 	{
 		status: MarketStatus.ACTIVE,
@@ -514,6 +516,7 @@ export const mockSpotMarkets: Array<SpotMarketAccount> = [
 			lastIndexPriceTwapTs: new BN(0),
 		},
 		pausedOperations: 0,
+		ifPausedOperations: 0,
 	},
 ];