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

package/VERSION

@@ -1 +1 @@
-2.31.1-beta.1
+2.31.1-beta.3

package/lib/accounts/mockUserAccountSubscriber.d.ts

@@ -0,0 +1,23 @@
+/// <reference types="node" />
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
+import { PublicKey } from '@solana/web3.js';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { UserAccount } from '../types';
+export declare class MockUserAccountSubscriber implements UserAccountSubscriber {
+    isSubscribed: boolean;
+    eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+    userAccountPublicKey: PublicKey;
+    callbackId?: string;
+    errorCallbackId?: string;
+    user: DataAndSlot<UserAccount>;
+    constructor(userAccountPublicKey: PublicKey, data: UserAccount, slot: number);
+    subscribe(_userAccount?: UserAccount): Promise<boolean>;
+    addToAccountLoader(): Promise<void>;
+    fetch(): Promise<void>;
+    doesAccountExist(): boolean;
+    unsubscribe(): Promise<void>;
+    assertIsSubscribed(): void;
+    getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+    updateData(userAccount: UserAccount, slot: number): void;
+}

package/lib/accounts/mockUserAccountSubscriber.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MockUserAccountSubscriber = void 0;
+const events_1 = require("events");
+class MockUserAccountSubscriber {
+    constructor(userAccountPublicKey, data, slot) {
+        this.isSubscribed = true;
+        this.eventEmitter = new events_1.EventEmitter();
+        this.userAccountPublicKey = userAccountPublicKey;
+        this.user = { data, slot };
+    }
+    async subscribe(_userAccount) {
+        return true;
+    }
+    async addToAccountLoader() { }
+    async fetch() { }
+    doesAccountExist() {
+        return this.user !== undefined;
+    }
+    async unsubscribe() { }
+    assertIsSubscribed() { }
+    getUserAccountAndSlot() {
+        return this.user;
+    }
+    updateData(userAccount, slot) {
+        this.user = { data: userAccount, slot };
+        this.eventEmitter.emit('userAccountUpdate', userAccount);
+        this.eventEmitter.emit('update');
+    }
+}
+exports.MockUserAccountSubscriber = MockUserAccountSubscriber;

package/lib/driftClient.d.ts

@@ -14,6 +14,7 @@ import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { UserStats } from './userStats';
 import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
+import { UserStatsSubscriptionConfig } from './userStatsConfig';
 type RemainingAccountParams = {
     userAccounts: UserAccount[];
     writablePerpMarketIndexes?: number[];
@@ -36,6 +37,7 @@ export declare class DriftClient {
     userStats?: UserStats;
     activeSubAccountId: number;
     userAccountSubscriptionConfig: UserSubscriptionConfig;
+    userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
     accountSubscriber: DriftClientAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     _isSubscribed: boolean;

package/lib/driftClient.js

@@ -64,7 +64,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -93,15 +93,24 @@ class DriftClient {
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
         this.includeDelegates = (_f = config.includeDelegates) !== null && _f !== void 0 ? _f : false;
-        this.userAccountSubscriptionConfig =
-            ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling'
-                ? {
-                    type: 'polling',
-                    accountLoader: config.accountSubscription.accountLoader,
-                }
-                : {
-                    type: 'websocket',
-                };
+        if (((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling') {
+            this.userAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+        }
+        else {
+            this.userAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+        }
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
                 driftClient: this,
@@ -123,7 +132,7 @@ class DriftClient {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_m = config.perpMarketIndexes) !== null && _m !== void 0 ? _m : [], (_o = config.spotMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.oracleInfos) !== null && _p !== void 0 ? _p : [], noMarketsAndOraclesSpecified);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_q = config.txSenderConfig) === null || _q === void 0 ? void 0 : _q.timeout, (_r = config.txSenderConfig) === null || _r === void 0 ? void 0 : _r.retrySleep, (_s = config.txSenderConfig) === null || _s === void 0 ? void 0 : _s.additionalConnections);
+        this.txSender = (_q = config.txSender) !== null && _q !== void 0 ? _q : new retryTxSender_1.RetryTxSender(this.provider);
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -304,7 +313,7 @@ class DriftClient {
                 this.userStats = new userStats_1.UserStats({
                     driftClient: this,
                     userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-                    accountSubscription: this.userAccountSubscriptionConfig,
+                    accountSubscription: this.userStatsAccountSubscriptionConfig,
                 });
                 await this.userStats.subscribe();
             }

package/lib/driftClientConfig.d.ts

@@ -3,6 +3,7 @@ import { IWallet } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
+import { TxSender } from './tx/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -10,7 +11,7 @@ export type DriftClientConfig = {
     programID?: PublicKey;
     accountSubscription?: DriftClientSubscriptionConfig;
     opts?: ConfirmOptions;
-    txSenderConfig?: TxSenderConfig;
+    txSender?: TxSender;
     subAccountIds?: number[];
     activeSubAccountId?: number;
     perpMarketIndexes?: number[];
@@ -30,10 +31,3 @@ export type DriftClientSubscriptionConfig = {
     type: 'polling';
     accountLoader: BulkAccountLoader;
 };
-type TxSenderConfig = {
-    type: 'retry';
-    timeout?: number;
-    retrySleep?: number;
-    additionalConnections?: Connection[];
-};
-export {};

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.1-beta.0",
+    "version": "2.31.1-beta.2",
     "name": "drift",
     "instructions": [
         {

package/lib/tx/retryTxSender.d.ts

@@ -10,6 +10,7 @@ export declare class RetryTxSender implements TxSender {
     timeout: number;
     retrySleep: number;
     additionalConnections: Connection[];
+    timoutCount: number;
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
@@ -22,5 +23,6 @@ export declare class RetryTxSender implements TxSender {
     promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;
     addAdditionalConnection(newConnection: Connection): void;
+    getTimeoutCount(): number;
 }
 export {};

package/lib/tx/retryTxSender.js

@@ -11,6 +11,7 @@ const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
 class RetryTxSender {
     constructor(provider, timeout, retrySleep, additionalConnections = new Array()) {
+        this.timoutCount = 0;
         this.provider = provider;
         this.timeout = timeout !== null && timeout !== void 0 ? timeout : DEFAULT_TIMEOUT;
         this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
@@ -174,6 +175,7 @@ class RetryTxSender {
             }
         }
         if (response === null) {
+            this.timoutCount += 1;
             const duration = (Date.now() - start) / 1000;
             throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
         }
@@ -217,5 +219,8 @@ class RetryTxSender {
             this.additionalConnections.push(newConnection);
         }
     }
+    getTimeoutCount() {
+        return this.timoutCount;
+    }
 }
 exports.RetryTxSender = RetryTxSender;

package/lib/tx/types.d.ts

@@ -11,4 +11,5 @@ export interface TxSender {
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
+    getTimeoutCount(): number;
 }

package/lib/user.js

@@ -20,13 +20,16 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a;
+        var _a, _b;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserAccountSubscriber_1.PollingUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.accountLoader);
         }
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
+            this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
+        }
         else {
             this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey);
         }

package/lib/userConfig.d.ts

@@ -1,6 +1,7 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
@@ -11,4 +12,7 @@ export type UserSubscriptionConfig = {
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;
+} | {
+    type: 'custom';
+    userAccountSubscriber: UserAccountSubscriber;
 };

package/package.json

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

package/src/accounts/mockUserAccountSubscriber.ts

@@ -0,0 +1,53 @@
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './types';
+import { PublicKey } from '@solana/web3.js';
+import StrictEventEmitter from 'strict-event-emitter-types';
+import { EventEmitter } from 'events';
+import { UserAccount } from '../types';
+
+export class MockUserAccountSubscriber implements UserAccountSubscriber {
+	isSubscribed: boolean;
+	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
+	userAccountPublicKey: PublicKey;
+
+	callbackId?: string;
+	errorCallbackId?: string;
+
+	user: DataAndSlot<UserAccount>;
+
+	public constructor(
+		userAccountPublicKey: PublicKey,
+		data: UserAccount,
+		slot: number
+	) {
+		this.isSubscribed = true;
+		this.eventEmitter = new EventEmitter();
+		this.userAccountPublicKey = userAccountPublicKey;
+		this.user = { data, slot };
+	}
+
+	async subscribe(_userAccount?: UserAccount): Promise<boolean> {
+		return true;
+	}
+
+	async addToAccountLoader(): Promise<void> {}
+
+	async fetch(): Promise<void> {}
+
+	doesAccountExist(): boolean {
+		return this.user !== undefined;
+	}
+
+	async unsubscribe(): Promise<void> {}
+
+	assertIsSubscribed(): void {}
+
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
+		return this.user;
+	}
+
+	public updateData(userAccount: UserAccount, slot: number): void {
+		this.user = { data: userAccount, slot };
+		this.eventEmitter.emit('userAccountUpdate', userAccount);
+		this.eventEmitter.emit('update');
+	}
+}

package/src/driftClient.ts

@@ -115,6 +115,7 @@ import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
 import { JupiterClient, Route, SwapMode } from './jupiter/jupiterClient';
 import { getNonIdleUserFilter } from './memcmp';
+import { UserStatsSubscriptionConfig } from './userStatsConfig';
 
 type RemainingAccountParams = {
 	userAccounts: UserAccount[];
@@ -139,6 +140,7 @@ export class DriftClient {
 	userStats?: UserStats;
 	activeSubAccountId: number;
 	userAccountSubscriptionConfig: UserSubscriptionConfig;
+	userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
 	accountSubscriber: DriftClientAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	_isSubscribed = false;
@@ -206,15 +208,23 @@ export class DriftClient {
 			: new Map<string, number[]>();
 
 		this.includeDelegates = config.includeDelegates ?? false;
-		this.userAccountSubscriptionConfig =
-			config.accountSubscription?.type === 'polling'
-				? {
-						type: 'polling',
-						accountLoader: config.accountSubscription.accountLoader,
-				  }
-				: {
-						type: 'websocket',
-				  };
+		if (config.accountSubscription?.type === 'polling') {
+			this.userAccountSubscriptionConfig = {
+				type: 'polling',
+				accountLoader: config.accountSubscription.accountLoader,
+			};
+			this.userStatsAccountSubscriptionConfig = {
+				type: 'polling',
+				accountLoader: config.accountSubscription.accountLoader,
+			};
+		} else {
+			this.userAccountSubscriptionConfig = {
+				type: 'websocket',
+			};
+			this.userStatsAccountSubscriptionConfig = {
+				type: 'websocket',
+			};
+		}
 
 		if (config.userStats) {
 			this.userStats = new UserStats({
@@ -257,12 +267,7 @@ export class DriftClient {
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
-		this.txSender = new RetryTxSender(
-			this.provider,
-			config.txSenderConfig?.timeout,
-			config.txSenderConfig?.retrySleep,
-			config.txSenderConfig?.additionalConnections
-		);
+		this.txSender = config.txSender ?? new RetryTxSender(this.provider);
 	}
 
 	public getUserMapKey(subAccountId: number, authority: PublicKey): string {
@@ -547,7 +552,7 @@ export class DriftClient {
 				this.userStats = new UserStats({
 					driftClient: this,
 					userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-					accountSubscription: this.userAccountSubscriptionConfig,
+					accountSubscription: this.userStatsAccountSubscriptionConfig,
 				});
 
 				await this.userStats.subscribe();

package/src/driftClientConfig.ts

@@ -8,6 +8,7 @@ import { IWallet } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
+import { TxSender } from './tx/types';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -16,7 +17,7 @@ export type DriftClientConfig = {
 	programID?: PublicKey;
 	accountSubscription?: DriftClientSubscriptionConfig;
 	opts?: ConfirmOptions;
-	txSenderConfig?: TxSenderConfig;
+	txSender?: TxSender;
 	subAccountIds?: number[];
 	activeSubAccountId?: number;
 	perpMarketIndexes?: number[];
@@ -39,10 +40,3 @@ export type DriftClientSubscriptionConfig =
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
 	  };
-
-type TxSenderConfig = {
-	type: 'retry';
-	timeout?: number;
-	retrySleep?: number;
-	additionalConnections?: Connection[];
-};

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.1-beta.1",
+  "version": "2.31.1-beta.3",
   "name": "drift",
   "instructions": [
     {

package/src/tx/retryTxSender.ts

@@ -30,6 +30,7 @@ export class RetryTxSender implements TxSender {
 	timeout: number;
 	retrySleep: number;
 	additionalConnections: Connection[];
+	timoutCount = 0;
 
 	public constructor(
 		provider: AnchorProvider,
@@ -260,6 +261,7 @@ export class RetryTxSender implements TxSender {
 		}
 
 		if (response === null) {
+			this.timoutCount += 1;
 			const duration = (Date.now() - start) / 1000;
 			throw new Error(
 				`Transaction was not confirmed in ${duration.toFixed(
@@ -325,4 +327,8 @@ export class RetryTxSender implements TxSender {
 			this.additionalConnections.push(newConnection);
 		}
 	}
+
+	public getTimeoutCount(): number {
+		return this.timoutCount;
+	}
 }

package/src/tx/types.ts

@@ -42,4 +42,6 @@ export interface TxSender {
 		rawTransaction: Buffer | Uint8Array,
 		opts: ConfirmOptions
 	): Promise<TxSigAndSlot>;
+
+	getTimeoutCount(): number;
 }

package/src/user.ts

@@ -97,6 +97,8 @@ export class User {
 				config.userAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
+		} else if (config.accountSubscription?.type === 'custom') {
+			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,

package/src/userConfig.ts

@@ -1,6 +1,7 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { UserAccountSubscriber } from './accounts/types';
 
 export type UserConfig = {
 	accountSubscription?: UserSubscriptionConfig;
@@ -15,4 +16,8 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+	  }
+	| {
+			type: 'custom';
+			userAccountSubscriber: UserAccountSubscriber;
 	  };