@drift-labs/sdk 2.82.0-beta.4 → 2.82.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.82.0-beta.4
+2.82.0-beta.6

package/lib/accounts/types.d.ts

@@ -126,6 +126,10 @@ export type DataAndSlot<T> = {
     data: T;
     slot: number;
 };
+export type ResubOpts = {
+    resubTimeoutMs?: number;
+    logResubMessages?: boolean;
+};
 export interface UserStatsAccountEvents {
     userStatsAccountUpdate: (payload: UserStatsAccount) => void;
     update: void;

package/lib/accounts/webSocketAccountSubscriber.d.ts

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

package/lib/accounts/webSocketAccountSubscriber.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketAccountSubscriber = void 0;
 const utils_1 = require("./utils");
 class WebSocketAccountSubscriber {
-    constructor(accountName, program, accountPublicKey, decodeBuffer, resubTimeoutMs, commitment) {
+    constructor(accountName, program, accountPublicKey, decodeBuffer, resubOpts, commitment) {
+        var _a;
         this.isUnsubscribing = false;
         this.accountName = accountName;
         this.program = program;
         this.accountPublicKey = accountPublicKey;
         this.decodeBufferFn = decodeBuffer;
-        this.resubTimeoutMs = resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        this.resubOpts = resubOpts;
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.receivingData = false;
@@ -18,6 +19,7 @@ class WebSocketAccountSubscriber {
             commitment !== null && commitment !== void 0 ? commitment : this.program.provider.opts.commitment;
     }
     async subscribe(onChange) {
+        var _a;
         if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
@@ -26,7 +28,8 @@ class WebSocketAccountSubscriber {
             await this.fetch();
         }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
-            if (this.resubTimeoutMs) {
+            var _a;
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
                 this.receivingData = true;
                 clearTimeout(this.timeoutId);
                 this.handleRpcResponse(context, accountInfo);
@@ -36,7 +39,7 @@ class WebSocketAccountSubscriber {
                 this.handleRpcResponse(context, accountInfo);
             }
         }, this.commitment);
-        if (this.resubTimeoutMs) {
+        if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
             this.receivingData = true;
             this.setTimeout();
         }
@@ -52,21 +55,25 @@ class WebSocketAccountSubscriber {
         };
     }
     setTimeout() {
+        var _a;
         if (!this.onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            var _a;
             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.accountName} in ${this.resubTimeoutMs}ms, resubscribing`);
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                    console.log(`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`);
+                }
                 await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
-        }, this.resubTimeoutMs);
+        }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
@@ -120,7 +127,7 @@ class WebSocketAccountSubscriber {
     }
     unsubscribe(onResub = false) {
         if (!onResub) {
-            this.resubTimeoutMs = undefined;
+            this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './types';
+import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot, ResubOpts } from './types';
 import { AccountSubscriber } from './types';
 import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
 import { Program } from '@coral-xyz/anchor';
@@ -16,7 +16,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
     oracleClientCache: OracleClientCache;
-    resubTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     shouldFindAllMarketsAndOracles: boolean;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
     stateAccountSubscriber?: AccountSubscriber<StateAccount>;
@@ -28,7 +28,7 @@ export declare class WebSocketDriftClientAccountSubscriber implements DriftClien
     private isSubscribing;
     private subscriptionPromise;
     private subscriptionPromiseResolver;
-    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubOpts?: ResubOpts, commitment?: Commitment);
     subscribe(): Promise<boolean>;
     subscribeToPerpMarketAccounts(): Promise<boolean>;
     subscribeToPerpMarketAccount(marketIndex: number): Promise<boolean>;

package/lib/accounts/webSocketDriftClientAccountSubscriber.js

@@ -10,7 +10,7 @@ const oracleClientCache_1 = require("../oracles/oracleClientCache");
 const quoteAssetOracleClient_1 = require("../oracles/quoteAssetOracleClient");
 const config_1 = require("../config");
 class WebSocketDriftClientAccountSubscriber {
-    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs, commitment) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubOpts, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.perpOracleMap = new Map();
@@ -25,7 +25,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.spotMarketIndexes = spotMarketIndexes;
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = resubOpts;
         this.commitment = commitment;
     }
     async subscribe() {
@@ -74,7 +74,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToPerpMarketAccount(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -90,7 +90,7 @@ class WebSocketDriftClientAccountSubscriber {
     }
     async subscribeToSpotMarketAccount(marketIndex) {
         const marketPublicKey = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, marketIndex);
-        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -110,7 +110,7 @@ class WebSocketDriftClientAccountSubscriber {
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection, this.program);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
-        }, this.resubTimeoutMs, this.commitment);
+        }, this.resubOpts, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts

@@ -7,13 +7,13 @@ import { Commitment, PublicKey } from '@solana/web3.js';
 import { InsuranceFundStake } from '../types';
 export declare class WebSocketInsuranceFundStakeAccountSubscriber implements InsuranceFundStakeAccountSubscriber {
     isSubscribed: boolean;
-    reconnectTimeoutMs?: number;
+    resubTimeoutMs?: number;
     commitment?: Commitment;
     program: Program;
     eventEmitter: StrictEventEmitter<EventEmitter, InsuranceFundStakeAccountEvents>;
     insuranceFundStakeAccountPublicKey: PublicKey;
     insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
-    constructor(program: Program, insuranceFundStakeAccountPublicKey: PublicKey, reconnectTimeoutMs?: number, commitment?: Commitment);
+    constructor(program: Program, insuranceFundStakeAccountPublicKey: PublicKey, resubTimeoutMs?: number, commitment?: Commitment);
     subscribe(insuranceFundStakeAccount?: InsuranceFundStake): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/webSocketInsuranceFundStakeAccountSubscriber.js

@@ -5,13 +5,13 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketInsuranceFundStakeAccountSubscriber {
-    constructor(program, insuranceFundStakeAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, insuranceFundStakeAccountPublicKey, resubTimeoutMs, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.insuranceFundStakeAccountPublicKey =
             insuranceFundStakeAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
-        this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.resubTimeoutMs = resubTimeoutMs;
         this.commitment = commitment;
     }
     async subscribe(insuranceFundStakeAccount) {
@@ -19,7 +19,9 @@ class WebSocketInsuranceFundStakeAccountSubscriber {
             return true;
         }
         this.insuranceFundStakeDataAccountSubscriber =
-            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('insuranceFundStake', this.program, this.insuranceFundStakeAccountPublicKey, undefined, this.reconnectTimeoutMs, this.commitment);
+            new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('insuranceFundStake', this.program, this.insuranceFundStakeAccountPublicKey, undefined, {
+                resubTimeoutMs: this.resubTimeoutMs,
+            }, this.commitment);
         if (insuranceFundStakeAccount) {
             this.insuranceFundStakeDataAccountSubscriber.setData(insuranceFundStakeAccount);
         }

package/lib/accounts/webSocketProgramAccountSubscriber.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber } from './types';
+import { DataAndSlot, BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, KeyedAccountInfo, MemcmpFilter, PublicKey } from '@solana/web3.js';
 export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAccountSubscriber<T> {
@@ -14,7 +14,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     decodeBuffer: (accountName: string, ix: Buffer) => T;
     onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void;
     listenerId?: number;
-    resubTimeoutMs?: number;
+    resubOpts?: ResubOpts;
     isUnsubscribing: boolean;
     timeoutId?: NodeJS.Timeout;
     options: {
@@ -25,7 +25,7 @@ export declare class WebSocketProgramAccountSubscriber<T> implements ProgramAcco
     constructor(subscriptionName: string, accountDiscriminator: string, program: Program, decodeBufferFn: (accountName: string, ix: Buffer) => T, options?: {
         filters: MemcmpFilter[];
         commitment?: Commitment;
-    }, resubTimeoutMs?: number);
+    }, resubOpts?: ResubOpts);
     subscribe(onChange: (accountId: PublicKey, data: T, context: Context, buffer: Buffer) => void): Promise<void>;
     private setTimeout;
     handleRpcResponse(context: Context, keyedAccountInfo: KeyedAccountInfo): void;

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -4,28 +4,30 @@ exports.WebSocketProgramAccountSubscriber = void 0;
 class WebSocketProgramAccountSubscriber {
     constructor(subscriptionName, accountDiscriminator, program, decodeBufferFn, options = {
         filters: [],
-    }, resubTimeoutMs) {
+    }, resubOpts) {
+        var _a;
         this.isUnsubscribing = false;
         this.receivingData = false;
         this.subscriptionName = subscriptionName;
         this.accountDiscriminator = accountDiscriminator;
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
-        this.resubTimeoutMs = resubTimeoutMs;
-        if (this.resubTimeoutMs < 1000) {
+        this.resubOpts = resubOpts;
+        if (((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) < 1000) {
             console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
         }
         this.options = options;
         this.receivingData = false;
     }
     async subscribe(onChange) {
-        var _a;
+        var _a, _b;
         if (this.listenerId != null || this.isUnsubscribing) {
             return;
         }
         this.onChange = onChange;
         this.listenerId = this.program.provider.connection.onProgramAccountChange(this.program.programId, (keyedAccountInfo, context) => {
-            if (this.resubTimeoutMs) {
+            var _a;
+            if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs) {
                 this.receivingData = true;
                 clearTimeout(this.timeoutId);
                 this.handleRpcResponse(context, keyedAccountInfo);
@@ -35,27 +37,31 @@ class WebSocketProgramAccountSubscriber {
                 this.handleRpcResponse(context, keyedAccountInfo);
             }
         }, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : this.program.provider.opts.commitment, this.options.filters);
-        if (this.resubTimeoutMs) {
+        if ((_b = this.resubOpts) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs) {
             this.receivingData = true;
             this.setTimeout();
         }
     }
     setTimeout() {
+        var _a;
         if (!this.onChange) {
             throw new Error('onChange callback function must be set');
         }
         this.timeoutId = setTimeout(async () => {
+            var _a, _b;
             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`);
+                if ((_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.logResubMessages) {
+                    console.log(`No ws data from ${this.subscriptionName} in ${(_b = this.resubOpts) === null || _b === void 0 ? void 0 : _b.resubTimeoutMs}ms, resubscribing`);
+                }
                 await this.unsubscribe(true);
                 this.receivingData = false;
                 await this.subscribe(this.onChange);
             }
-        }, this.resubTimeoutMs);
+        }, (_a = this.resubOpts) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs);
     }
     handleRpcResponse(context, keyedAccountInfo) {
         const newSlot = context.slot;
@@ -99,7 +105,7 @@ class WebSocketProgramAccountSubscriber {
     }
     unsubscribe(onResub = false) {
         if (!onResub) {
-            this.resubTimeoutMs = undefined;
+            this.resubOpts.resubTimeoutMs = undefined;
         }
         this.isUnsubscribing = true;
         clearTimeout(this.timeoutId);

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

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

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -5,19 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserAccountSubscriber {
-    constructor(program, userAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, userAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;
+        this.resubOpts = resubOpts;
         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.commitment);
+        this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey, undefined, this.resubOpts, this.commitment);
         if (userAccount) {
             this.userDataAccountSubscriber.setData(userAccount);
         }

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

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

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -5,19 +5,19 @@ const types_1 = require("./types");
 const events_1 = require("events");
 const webSocketAccountSubscriber_1 = require("./webSocketAccountSubscriber");
 class WebSocketUserStatsAccountSubscriber {
-    constructor(program, userStatsAccountPublicKey, reconnectTimeoutMs, commitment) {
+    constructor(program, userStatsAccountPublicKey, resubOpts, commitment) {
         this.isSubscribed = false;
         this.program = program;
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
-        this.reconnectTimeoutMs = reconnectTimeoutMs;
+        this.resubOpts = resubOpts;
         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.commitment);
+        this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey, undefined, this.resubOpts, this.commitment);
         if (userStatsAccount) {
             this.userStatsAccountSubscriber.setData(userStatsAccount);
         }

package/lib/auctionSubscriber/auctionSubscriber.d.ts

@@ -5,10 +5,10 @@ import { EventEmitter } from 'events';
 export declare class AuctionSubscriber {
     private driftClient;
     private opts;
-    private resubTimeoutMs?;
+    private resubOpts?;
     eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
     private subscriber;
-    constructor({ driftClient, opts, resubTimeoutMs }: AuctionSubscriberConfig);
+    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }: AuctionSubscriberConfig);
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
 }

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -5,18 +5,18 @@ const memcmp_1 = require("../memcmp");
 const events_1 = require("events");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class AuctionSubscriber {
-    constructor({ driftClient, opts, resubTimeoutMs }) {
+    constructor({ driftClient, opts, resubTimeoutMs, logResubMessages, }) {
         this.driftClient = driftClient;
         this.opts = opts || this.driftClient.opts;
         this.eventEmitter = new events_1.EventEmitter();
-        this.resubTimeoutMs = resubTimeoutMs;
+        this.resubOpts = { resubTimeoutMs, logResubMessages };
     }
     async subscribe() {
         if (!this.subscriber) {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'User', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
                 commitment: this.opts.commitment,
-            }, this.resubTimeoutMs);
+            }, this.resubOpts);
         }
         await this.subscriber.subscribe((accountId, data, context) => {
             this.eventEmitter.emit('onAccountUpdate', data, accountId, context.slot);

package/lib/auctionSubscriber/types.d.ts

@@ -5,6 +5,7 @@ export type AuctionSubscriberConfig = {
     driftClient: DriftClient;
     opts?: ConfirmOptions;
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
 };
 export interface AuctionSubscriberEvents {
     onAccountUpdate: (account: UserAccount, pubkey: PublicKey, slot: number) => void;

package/lib/driftClient.d.ts

@@ -657,6 +657,16 @@ export declare class DriftClient {
     getDepositIntoSpotMarketRevenuePoolIx(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionInstruction>;
     depositIntoSpotMarketRevenuePool(marketIndex: number, amount: BN, userTokenAccountPublicKey: PublicKey): Promise<TransactionSignature>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType: MarketType, marketIndex?: number, user?: User): {
+        takerFee: number;
+        makerFee: number;
+    };
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/driftClient.js

@@ -70,7 +70,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, _w, _x, _y, _z, _0, _1, _2;
+        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, _0, _1, _2, _3, _4, _5;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -125,12 +125,14 @@ class DriftClient {
             this.userAccountSubscriptionConfig = {
                 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,
+                logResubMessages: (_q = config.accountSubscription) === null || _q === void 0 ? void 0 : _q.logResubMessages,
+                commitment: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.commitment,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_r = config.accountSubscription) === null || _r === void 0 ? void 0 : _r.resubTimeoutMs,
-                commitment: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.commitment,
+                resubTimeoutMs: (_s = config.accountSubscription) === null || _s === void 0 ? void 0 : _s.resubTimeoutMs,
+                logResubMessages: (_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.logResubMessages,
+                commitment: (_u = config.accountSubscription) === null || _u === void 0 ? void 0 : _u.commitment,
             };
         }
         if (config.userStats) {
@@ -147,11 +149,14 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_t = config.accountSubscription) === null || _t === void 0 ? void 0 : _t.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_u = config.perpMarketIndexes) !== null && _u !== void 0 ? _u : [], (_v = config.spotMarketIndexes) !== null && _v !== void 0 ? _v : [], (_w = config.oracleInfos) !== null && _w !== void 0 ? _w : [], noMarketsAndOraclesSpecified);
+        if (((_v = config.accountSubscription) === null || _v === void 0 ? void 0 : _v.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_w = config.perpMarketIndexes) !== null && _w !== void 0 ? _w : [], (_x = config.spotMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.oracleInfos) !== null && _y !== void 0 ? _y : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_x = config.perpMarketIndexes) !== null && _x !== void 0 ? _x : [], (_y = config.spotMarketIndexes) !== null && _y !== void 0 ? _y : [], (_z = config.oracleInfos) !== null && _z !== void 0 ? _z : [], noMarketsAndOraclesSpecified, (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.resubTimeoutMs, (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.commitment);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_z = config.perpMarketIndexes) !== null && _z !== void 0 ? _z : [], (_0 = config.spotMarketIndexes) !== null && _0 !== void 0 ? _0 : [], (_1 = config.oracleInfos) !== null && _1 !== void 0 ? _1 : [], noMarketsAndOraclesSpecified, {
+                resubTimeoutMs: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.resubTimeoutMs,
+                logResubMessages: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.logResubMessages,
+            }, (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         if (config.enableMetricsEvents) {
@@ -159,7 +164,7 @@ class DriftClient {
             this.metricsEventEmitter = new events_1.EventEmitter();
         }
         this.txSender =
-            (_2 = config.txSender) !== null && _2 !== void 0 ? _2 : new retryTxSender_1.RetryTxSender({
+            (_5 = config.txSender) !== null && _5 !== void 0 ? _5 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -3548,6 +3553,41 @@ class DriftClient {
         };
         return extendedInfo;
     }
+    /**
+     * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
+     * @param marketType
+     * @param positionMarketIndex
+     * @returns : {takerFee: number, makerFee: number} Precision None
+     */
+    getMarketFees(marketType, marketIndex, user) {
+        let feeTier;
+        if (user) {
+            feeTier = user.getUserFeeTier(marketType);
+        }
+        else {
+            const state = this.getStateAccount();
+            feeTier = (0, types_1.isVariant)(marketType, 'perp')
+                ? state.perpFeeStructure.feeTiers[0]
+                : state.spotFeeStructure.feeTiers[0];
+        }
+        let takerFee = feeTier.feeNumerator / feeTier.feeDenominator;
+        let makerFee = feeTier.makerRebateNumerator / feeTier.makerRebateDenominator;
+        if (marketIndex !== undefined) {
+            let marketAccount = null;
+            if ((0, types_1.isVariant)(marketType, 'perp')) {
+                marketAccount = this.getPerpMarketAccount(marketIndex);
+            }
+            else {
+                marketAccount = this.getSpotMarketAccount(marketIndex);
+            }
+            takerFee += (takerFee * marketAccount.feeAdjustment) / 100;
+            makerFee += (makerFee * marketAccount.feeAdjustment) / 100;
+        }
+        return {
+            takerFee,
+            makerFee,
+        };
+    }
     /**
      * Returns the market index and type for a given market name
      * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }

package/lib/driftClientConfig.d.ts

@@ -30,6 +30,7 @@ export type DriftClientConfig = {
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';
     resubTimeoutMs?: number;
+    logResubMessages?: boolean;
     commitment?: Commitment;
 } | {
     type: 'polling';

package/lib/orderSubscriber/OrderSubscriber.js

@@ -12,7 +12,7 @@ const index_1 = require("../index");
 const user_1 = require("../decode/user");
 class OrderSubscriber {
     constructor(config) {
-        var _a;
+        var _a, _b, _c;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -27,12 +27,15 @@ class OrderSubscriber {
                 orderSubscriber: this,
                 commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
-                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                resubOpts: {
+                    resubTimeoutMs: (_a = config.subscriptionConfig) === null || _a === void 0 ? void 0 : _a.resubTimeoutMs,
+                    logResubMessages: (_b = config.subscriptionConfig) === null || _b === void 0 ? void 0 : _b.logResubMessages,
+                },
                 resyncIntervalMs: config.subscriptionConfig.resyncIntervalMs,
                 decoded: config.decodeData,
             });
         }
-        if ((_a = config.fastDecode) !== null && _a !== void 0 ? _a : true) {
+        if ((_c = config.fastDecode) !== null && _c !== void 0 ? _c : true) {
             this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
         }
         else {