@drift-labs/sdk 2.47.0-beta.0 → 2.47.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.47.0-beta.0
+2.47.0-beta.2

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
 import { Program } from '@coral-xyz/anchor';
-import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
 export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
     dataAndSlot?: DataAndSlot<T>;
     bufferAndSlot?: BufferAndSlot;
@@ -13,10 +13,11 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     onChange: (data: T) => void;
     listenerId?: number;
     resubTimeoutMs?: number;
+    commitment?: Commitment;
     isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     receivingData: boolean;
-    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number);
+    constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(onChange: (data: T) => void): Promise<void>;
     setData(data: T, slot?: number): void;
     private setTimeout;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
-    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs) {
+    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs, commitment) {
         this.isUnsubscribing = false;
         this.accountName = accountName;
         this.program = program;
@@ -11,6 +11,8 @@ class WebSocketAccountSubscriber {
         this.decodeBufferFn = decodeBuffer;
         this.resubTimeoutMs = resubTimeoutMs;
         this.receivingData = false;
+        this.commitment =
+            commitment !== null && commitment !== void 0 ? commitment : this.program.provider.opts.commitment;
     }
     async subscribe(onChange) {
         if (this.listenerId || this.isUnsubscribing) {
@@ -30,7 +32,7 @@ class WebSocketAccountSubscriber {
             else {
                 this.handleRpcResponse(context, accountInfo);
             }
-        }, this.program.provider.opts.commitment);
+        }, this.commitment);
         if (this.resubTimeoutMs) {
             this.setTimeout();
         }

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -3,16 +3,17 @@ import { DataAndSlot, AccountSubscriber, UserAccountEvents, UserAccountSubscribe
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserAccount } from '../types';
 export declare class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
     isSubscribed: boolean;
     reconnectTimeoutMs?: number;
+    commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
-    constructor(program: Program, userAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
+    constructor(program: Program, userAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
     subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -5,18 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, userAccountPublicKey, reconnectTimeoutMs) {
+    constructor(program, userAccountPublicKey, reconnectTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
         this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.commitment = commitment;
     }
     async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.reconnectTimeoutMs);
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
         if (userAccount) {
             this.userDataAccountSubscriber.setData(userAccount);
         }

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -3,16 +3,17 @@ import { DataAndSlot, AccountSubscriber, UserStatsAccountSubscriber, UserStatsAc
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { UserStatsAccount } from '../types';
 export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAccountSubscriber {
     isSubscribed: boolean;
     reconnectTimeoutMs?: number;
+    commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
-    constructor(program: Program, userStatsAccountPublicKey: PublicKey, reconnectTimeoutMs?: number);
+    constructor(program: Program, userStatsAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
     subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,18 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
-    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs) {
+    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
         this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.commitment = commitment;
     }
     async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
-        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.reconnectTimeoutMs);
+        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
         if (userStatsAccount) {
             this.userStatsAccountSubscriber.setData(userStatsAccount);
         }

package/lib/driftClient.js

@@ -66,7 +66,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, _t, _u, _v;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -116,9 +116,13 @@ class DriftClient {
         else {
             this.userAccountSubscriptionConfig = {
                 type: 'websocket',
+                resubTimeoutMs: (_m = config.accountSubscription) === null || _m === void 0 ? void 0 : _m.resubTimeoutMs,
+                commitment: (_o = config.accountSubscription) === null || _o === void 0 ? void 0 : _o.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
+                resubTimeoutMs: (_p = config.accountSubscription) === null || _p === void 0 ? void 0 : _p.resubTimeoutMs,
+                commitment: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.commitment,
             };
         }
         if (config.userStats) {
@@ -135,15 +139,15 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_m = config.accountSubscription) === null || _m === void 0 ? void 0 : _m.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_o = config.perpMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.spotMarketIndexes) !== null && _p !== void 0 ? _p : [], (_q = config.oracleInfos) !== null && _q !== void 0 ? _q : [], noMarketsAndOraclesSpecified);
+        if (((_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_s = config.perpMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.spotMarketIndexes) !== null && _t !== void 0 ? _t : [], (_u = config.oracleInfos) !== null && _u !== void 0 ? _u : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_r = config.perpMarketIndexes) !== null && _r !== void 0 ? _r : [], (_s = config.spotMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.oracleInfos) !== null && _t !== void 0 ? _t : [], noMarketsAndOraclesSpecified, (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.resubTimeoutMs);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_v = config.perpMarketIndexes) !== null && _v !== void 0 ? _v : [], (_w = config.spotMarketIndexes) !== null && _w !== void 0 ? _w : [], (_x = config.oracleInfos) !== null && _x !== void 0 ? _x : [], noMarketsAndOraclesSpecified, (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.resubTimeoutMs);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender =
-            (_v = config.txSender) !== null && _v !== void 0 ? _v : new retryTxSender_1.RetryTxSender({
+            (_z = config.txSender) !== null && _z !== void 0 ? _z : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,

package/lib/driftClientConfig.d.ts

@@ -1,4 +1,4 @@
-import { ConfirmOptions, Connection, PublicKey, TransactionVersion } from '@solana/web3.js';
+import { Commitment, ConfirmOptions, Connection, PublicKey, TransactionVersion } from '@solana/web3.js';
 import { IWallet, TxParams } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
@@ -29,6 +29,7 @@ export type DriftClientConfig = {
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
+    commitment?: Commitment;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;

package/lib/jupiter/jupiterClient.js

@@ -65,6 +65,7 @@ class JupiterClient {
      * @param slippageBps the slippage tolerance in basis points
      */
     async getSwap({ quote, userPublicKey, slippageBps = 50, }) {
+        var _a;
         if (!quote) {
             throw new Error('Jupiter swap quote not provided. Please try again.');
         }
@@ -79,6 +80,9 @@ class JupiterClient {
                 slippageBps,
             }),
         })).json();
+        if (!('swapTransaction' in resp)) {
+            throw new Error(`swapTransaction not found, error from Jupiter: ${resp.error} ${(_a = ', ' + resp.message) !== null && _a !== void 0 ? _a : ''}`);
+        }
         const { swapTransaction } = resp;
         try {
             const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');

package/lib/math/auction.js

@@ -25,7 +25,7 @@ function getAuctionPrice(order, slot, oraclePrice) {
         return getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice);
     }
     else {
-        throw Error(`Cant get auction price for order type ${order.orderType}`);
+        throw Error(`Cant get auction price for order type ${(0, _1.getVariant)(order.orderType)}`);
     }
 }
 exports.getAuctionPrice = getAuctionPrice;

package/lib/user.js

@@ -22,7 +22,7 @@ class User {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c;
         this._isSubscribed = false;
         this.driftClient = config.driftClient;
         this.userAccountPublicKey = config.userAccountPublicKey;
@@ -32,8 +32,8 @@ class User {
         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);
+        else if (((_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type) === 'websocket') {
+            this.accountSubscriber = new webSocketUserAccountSubscriber_1.WebSocketUserAccountSubscriber(config.driftClient.program, config.userAccountPublicKey, config.accountSubscription.resubTimeoutMs, config.accountSubscription.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }

package/lib/userConfig.d.ts

@@ -1,5 +1,5 @@
 import { DriftClient } from './driftClient';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { UserAccountSubscriber } from './accounts/types';
 export type UserConfig = {
@@ -9,6 +9,8 @@ export type UserConfig = {
 };
 export type UserSubscriptionConfig = {
     type: 'websocket';
+    resubTimeoutMs?: number;
+    commitment?: Commitment;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;

package/lib/userStats.js

@@ -7,17 +7,17 @@ const webSocketUserStatsAccountSubsriber_1 = require("./accounts/webSocketUserSt
 const pda_1 = require("./addresses/pda");
 class UserStats {
     constructor(config) {
-        var _a, _b;
+        var _a, _b, _c;
         this.driftClient = config.driftClient;
         this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
         if (((_a = config.accountSubscription) === null || _a === void 0 ? void 0 : _a.type) === 'polling') {
             this.accountSubscriber = new pollingUserStatsAccountSubscriber_1.PollingUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, config.accountSubscription.accountLoader);
         }
-        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'custom') {
-            throw new Error('Custom account subscription not yet implemented for user stats');
+        else if (((_b = config.accountSubscription) === null || _b === void 0 ? void 0 : _b.type) === 'websocket') {
+            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey, config.accountSubscription.resubTimeoutMs, config.accountSubscription.commitment);
         }
         else {
-            this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey);
+            throw new Error(`Unknown user stats account subscription type: ${(_c = config.accountSubscription) === null || _c === void 0 ? void 0 : _c.type}`);
         }
     }
     async subscribe(userStatsAccount) {

package/lib/userStatsConfig.d.ts

@@ -1,5 +1,5 @@
 import { DriftClient } from './driftClient';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
@@ -8,6 +8,8 @@ export type UserStatsConfig = {
 };
 export type UserStatsSubscriptionConfig = {
     type: 'websocket';
+    resubTimeoutMs?: number;
+    commitment?: Commitment;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;

package/package.json

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

package/src/accounts/webSocketAccountSubscriber.ts

@@ -1,6 +1,6 @@
 import { DataAndSlot, BufferAndSlot, AccountSubscriber } from './types';
 import { AnchorProvider, Program } from '@coral-xyz/anchor';
-import { AccountInfo, Context, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Commitment, Context, PublicKey } from '@solana/web3.js';
 import { capitalize } from './utils';
 import * as Buffer from 'buffer';
 
@@ -14,6 +14,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	onChange: (data: T) => void;
 	listenerId?: number;
 	resubTimeoutMs?: number;
+	commitment?: Commitment;
 	isUnsubscribing = false;
 
 	timeoutId?: NodeJS.Timeout;
@@ -25,7 +26,8 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		program: Program,
 		accountPublicKey: PublicKey,
 		decodeBuffer?: (buffer: Buffer) => T,
-		resubTimeoutMs?: number
+		resubTimeoutMs?: number,
+		commitment?: Commitment
 	) {
 		this.accountName = accountName;
 		this.program = program;
@@ -33,6 +35,8 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		this.decodeBufferFn = decodeBuffer;
 		this.resubTimeoutMs = resubTimeoutMs;
 		this.receivingData = false;
+		this.commitment =
+			commitment ?? (this.program.provider as AnchorProvider).opts.commitment;
 	}
 
 	async subscribe(onChange: (data: T) => void): Promise<void> {
@@ -57,7 +61,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 					this.handleRpcResponse(context, accountInfo);
 				}
 			},
-			(this.program.provider as AnchorProvider).opts.commitment
+			this.commitment
 		);
 
 		if (this.resubTimeoutMs) {

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -8,13 +8,14 @@ import {
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { UserAccount } from '../types';
 
 export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	reconnectTimeoutMs?: number;
+	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
@@ -24,13 +25,15 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	public constructor(
 		program: Program,
 		userAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number
+		reconnectTimeoutMs?: number,
+		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.userAccountPublicKey = userAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
 		this.reconnectTimeoutMs = reconnectTimeoutMs;
+		this.commitment = commitment;
 	}
 
 	async subscribe(userAccount?: UserAccount): Promise<boolean> {
@@ -43,7 +46,8 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			this.program,
 			this.userAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs
+			this.reconnectTimeoutMs,
+			this.commitment
 		);
 
 		if (userAccount) {

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -8,7 +8,7 @@ import {
 import { Program } from '@coral-xyz/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
 import { UserStatsAccount } from '../types';
 
@@ -17,6 +17,7 @@ export class WebSocketUserStatsAccountSubscriber
 {
 	isSubscribed: boolean;
 	reconnectTimeoutMs?: number;
+	commitment?: Commitment;
 	program: Program;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
 	userStatsAccountPublicKey: PublicKey;
@@ -26,13 +27,15 @@ export class WebSocketUserStatsAccountSubscriber
 	public constructor(
 		program: Program,
 		userStatsAccountPublicKey: PublicKey,
-		reconnectTimeoutMs?: number
+		reconnectTimeoutMs?: number,
+		commitment?: Commitment
 	) {
 		this.isSubscribed = false;
 		this.program = program;
 		this.userStatsAccountPublicKey = userStatsAccountPublicKey;
 		this.eventEmitter = new EventEmitter();
 		this.reconnectTimeoutMs = reconnectTimeoutMs;
+		this.commitment = commitment;
 	}
 
 	async subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean> {
@@ -45,7 +48,8 @@ export class WebSocketUserStatsAccountSubscriber
 			this.program,
 			this.userStatsAccountPublicKey,
 			undefined,
-			this.reconnectTimeoutMs
+			this.reconnectTimeoutMs,
+			this.commitment
 		);
 
 		if (userStatsAccount) {

package/src/driftClient.ts

@@ -235,9 +235,13 @@ export class DriftClient {
 		} else {
 			this.userAccountSubscriptionConfig = {
 				type: 'websocket',
+				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
+				commitment: config.accountSubscription?.commitment,
 			};
 			this.userStatsAccountSubscriptionConfig = {
 				type: 'websocket',
+				resubTimeoutMs: config.accountSubscription?.resubTimeoutMs,
+				commitment: config.accountSubscription?.commitment,
 			};
 		}
 

package/src/driftClientConfig.ts

@@ -1,4 +1,5 @@
 import {
+	Commitment,
 	ConfirmOptions,
 	Connection,
 	PublicKey,
@@ -37,6 +38,7 @@ export type DriftClientSubscriptionConfig =
 	| {
 			type: 'websocket';
 			resubTimeoutMs?: number;
+			commitment?: Commitment;
 	  }
 	| {
 			type: 'polling';

package/src/jupiter/jupiterClient.ts

@@ -336,6 +336,13 @@ export class JupiterClient {
 				}),
 			})
 		).json();
+		if (!('swapTransaction' in resp)) {
+			throw new Error(
+				`swapTransaction not found, error from Jupiter: ${resp.error} ${
+					', ' + resp.message ?? ''
+				}`
+			);
+		}
 		const { swapTransaction } = resp;
 
 		try {

package/src/math/auction.ts

@@ -1,5 +1,5 @@
 import { isOneOfVariant, isVariant, Order, PositionDirection } from '../types';
-import { BN, ONE, ZERO } from '../.';
+import { BN, getVariant, ONE, ZERO } from '../.';
 
 export function isAuctionComplete(order: Order, slot: number): boolean {
 	if (order.auctionDuration === 0) {
@@ -31,7 +31,9 @@ export function getAuctionPrice(
 	} else if (isVariant(order.orderType, 'oracle')) {
 		return getAuctionPriceForOracleOffsetAuction(order, slot, oraclePrice);
 	} else {
-		throw Error(`Cant get auction price for order type ${order.orderType}`);
+		throw Error(
+			`Cant get auction price for order type ${getVariant(order.orderType)}`
+		);
 	}
 }
 

package/src/user.ts

@@ -109,10 +109,12 @@ export class User {
 			);
 		} else if (config.accountSubscription?.type === 'custom') {
 			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
-		} else {
+		} else if (config.accountSubscription?.type === 'websocket') {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
-				config.userAccountPublicKey
+				config.userAccountPublicKey,
+				config.accountSubscription.resubTimeoutMs,
+				config.accountSubscription.commitment
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;

package/src/userConfig.ts

@@ -1,5 +1,5 @@
 import { DriftClient } from './driftClient';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { UserAccountSubscriber } from './accounts/types';
 
@@ -12,6 +12,8 @@ export type UserConfig = {
 export type UserSubscriptionConfig =
 	| {
 			type: 'websocket';
+			resubTimeoutMs?: number;
+			commitment?: Commitment;
 	  }
 	| {
 			type: 'polling';

package/src/userStats.ts

@@ -25,14 +25,16 @@ export class UserStats {
 				config.userStatsAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
-		} else if (config.accountSubscription?.type === 'custom') {
-			throw new Error(
-				'Custom account subscription not yet implemented for user stats'
-			);
-		} else {
+		} else if (config.accountSubscription?.type === 'websocket') {
 			this.accountSubscriber = new WebSocketUserStatsAccountSubscriber(
 				config.driftClient.program,
-				config.userStatsAccountPublicKey
+				config.userStatsAccountPublicKey,
+				config.accountSubscription.resubTimeoutMs,
+				config.accountSubscription.commitment
+			);
+		} else {
+			throw new Error(
+				`Unknown user stats account subscription type: ${config.accountSubscription?.type}`
 			);
 		}
 	}

package/src/userStatsConfig.ts

@@ -1,5 +1,5 @@
 import { DriftClient } from './driftClient';
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 
 export type UserStatsConfig = {
@@ -11,6 +11,8 @@ export type UserStatsConfig = {
 export type UserStatsSubscriptionConfig =
 	| {
 			type: 'websocket';
+			resubTimeoutMs?: number;
+			commitment?: Commitment;
 	  }
 	| {
 			type: 'polling';