@drift-labs/sdk 2.48.0-beta.2 → 2.48.0-beta.21

package/VERSION

@@ -1 +1 @@
-2.48.0-beta.2
+2.48.0-beta.21

package/lib/accounts/bulkAccountLoader.js

@@ -139,7 +139,7 @@ class BulkAccountLoader {
             accountsToLoad.forEach((accountToLoad, j) => {
                 const key = accountToLoad.publicKey.toBase58();
                 const oldRPCResponse = this.bufferAndSlotMap.get(key);
-                if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
+                if (oldRPCResponse && newSlot < oldRPCResponse.slot) {
                     return;
                 }
                 let newBuffer = undefined;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -53,12 +53,17 @@ class PollingUserAccountSubscriber {
     }
     async fetch() {
         var _a, _b;
-        await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.userAccountPublicKey);
-        const currentSlot = (_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0;
-        if (buffer && slot > currentSlot) {
-            const account = this.program.account.user.coder.accounts.decode('User', buffer);
-            this.user = { data: account, slot };
+        try {
+            const dataAndContext = await this.program.account.user.fetchAndContext(this.userAccountPublicKey, this.accountLoader.commitment);
+            if (dataAndContext.context.slot > ((_b = (_a = this.user) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
+                this.user = {
+                    data: dataAndContext.data,
+                    slot: dataAndContext.context.slot,
+                };
+            }
+        }
+        catch (e) {
+            console.log(`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`);
         }
     }
     doesAccountExist() {
@@ -80,7 +85,9 @@ class PollingUserAccountSubscriber {
         }
     }
     getUserAccountAndSlot() {
-        this.assertIsSubscribed();
+        if (!this.doesAccountExist()) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` or `fetch` before using this function');
+        }
         return this.user;
     }
     updateData(userAccount, slot) {

package/lib/accounts/pollingUserStatsAccountSubscriber.js

@@ -53,12 +53,17 @@ class PollingUserStatsAccountSubscriber {
     }
     async fetch() {
         var _a, _b;
-        await this.accountLoader.load();
-        const { buffer, slot } = this.accountLoader.getBufferAndSlot(this.userStatsAccountPublicKey);
-        const currentSlot = (_b = (_a = this.userStats) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0;
-        if (buffer && slot > currentSlot) {
-            const account = this.program.account.userStats.coder.accounts.decodeUnchecked('UserStats', buffer);
-            this.userStats = { data: account, slot };
+        try {
+            const dataAndContext = await this.program.account.userStats.fetchAndContext(this.userStatsAccountPublicKey, this.accountLoader.commitment);
+            if (dataAndContext.context.slot > ((_b = (_a = this.userStats) === null || _a === void 0 ? void 0 : _a.slot) !== null && _b !== void 0 ? _b : 0)) {
+                this.userStats = {
+                    data: dataAndContext.data,
+                    slot: dataAndContext.context.slot,
+                };
+            }
+        }
+        catch (e) {
+            console.log(`PollingUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e.message}`);
         }
     }
     doesAccountExist() {
@@ -80,7 +85,9 @@ class PollingUserStatsAccountSubscriber {
         }
     }
     getUserStatsAccountAndSlot() {
-        this.assertIsSubscribed();
+        if (!this.doesAccountExist()) {
+            throw new types_1.NotSubscribedError('You must call `subscribe` or `fetch` before using this function');
+        }
         return this.userStats;
     }
 }

package/lib/accounts/webSocketAccountSubscriber.js

@@ -89,7 +89,7 @@ class WebSocketAccountSubscriber {
             }
             return;
         }
-        if (newSlot <= this.bufferAndSlot.slot) {
+        if (newSlot < this.bufferAndSlot.slot) {
             return;
         }
         const oldBuffer = this.bufferAndSlot.buffer;

package/lib/accounts/webSocketDriftClientAccountSubscriber.d.ts

@@ -5,12 +5,13 @@ import { SpotMarketAccount, PerpMarketAccount, StateAccount } from '../types';
 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 { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 export declare class WebSocketDriftClientAccountSubscriber implements DriftClientAccountSubscriber {
     isSubscribed: boolean;
     program: Program;
+    commitment?: Commitment;
     perpMarketIndexes: number[];
     spotMarketIndexes: number[];
     oracleInfos: OracleInfo[];
@@ -25,7 +26,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);
+    constructor(program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, resubTimeoutMs?: number, 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) {
+    constructor(program, perpMarketIndexes, spotMarketIndexes, oracleInfos, shouldFindAllMarketsAndOracles, resubTimeoutMs, commitment) {
         this.oracleClientCache = new oracleClientCache_1.OracleClientCache();
         this.perpMarketAccountSubscribers = new Map();
         this.spotMarketAccountSubscribers = new Map();
@@ -24,6 +24,7 @@ class WebSocketDriftClientAccountSubscriber {
         this.oracleInfos = oracleInfos;
         this.shouldFindAllMarketsAndOracles = shouldFindAllMarketsAndOracles;
         this.resubTimeoutMs = resubTimeoutMs;
+        this.commitment = commitment;
     }
     async subscribe() {
         if (this.isSubscribed) {
@@ -44,7 +45,7 @@ class WebSocketDriftClientAccountSubscriber {
         }
         const statePublicKey = await (0, pda_1.getDriftStateAccountPublicKey)(this.program.programId);
         // create and activate main state account subscription
-        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey, undefined, this.resubTimeoutMs);
+        this.stateAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('state', this.program, statePublicKey, undefined, this.resubTimeoutMs, this.commitment);
         await this.stateAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('stateAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -69,7 +70,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);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('perpMarket', this.program, perpMarketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('perpMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -85,7 +86,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);
+        const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('spotMarket', this.program, marketPublicKey, undefined, this.resubTimeoutMs, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('spotMarketAccountUpdate', data);
             this.eventEmitter.emit('update');
@@ -105,7 +106,7 @@ class WebSocketDriftClientAccountSubscriber {
         const client = this.oracleClientCache.get(oracleInfo.source, this.program.provider.connection);
         const accountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('oracle', this.program, oracleInfo.publicKey, (buffer) => {
             return client.getOraclePriceDataFromBuffer(buffer);
-        }, this.resubTimeoutMs);
+        }, this.resubTimeoutMs, this.commitment);
         await accountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('oraclePriceUpdate', oracleInfo.publicKey, data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -75,7 +75,7 @@ class WebSocketProgramAccountSubscriber {
             }
             return;
         }
-        if (newSlot <= this.bufferAndSlot.slot) {
+        if (newSlot < this.bufferAndSlot.slot) {
             return;
         }
         const oldBuffer = this.bufferAndSlot.buffer;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -51,7 +51,7 @@ class WebSocketUserAccountSubscriber {
     updateData(userAccount, slot) {
         var _a;
         const currentDataSlot = ((_a = this.userDataAccountSubscriber.dataAndSlot) === null || _a === void 0 ? void 0 : _a.slot) || 0;
-        if (currentDataSlot < slot) {
+        if (currentDataSlot <= slot) {
             this.userDataAccountSubscriber.setData(userAccount, slot);
             this.eventEmitter.emit('userAccountUpdate', userAccount);
             this.eventEmitter.emit('update');

package/lib/constants/spotMarkets.js

@@ -120,6 +120,16 @@ exports.MainnetSpotMarkets = [
         serumMarket: new web3_js_1.PublicKey('4E17F3BxtNVqzVsirxguuqkpYLtFgCR6NfTpccPh82WE'),
         phoenixMarket: new web3_js_1.PublicKey('2sTMN9A1D1qeZLF95XQgJCUPiKe5DiV52jLfZGqMP46m'),
     },
+    {
+        symbol: 'bSOL',
+        marketIndex: 8,
+        oracle: new web3_js_1.PublicKey('AFrYBhb5wKQtxRS9UA9YRS4V3dwFm7SqmS6DHKq6YVgo'),
+        oracleSource: __1.OracleSource.PYTH,
+        mint: new web3_js_1.PublicKey('bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1'),
+        precision: new __1.BN(10).pow(numericConstants_1.NINE),
+        precisionExp: numericConstants_1.NINE,
+        serumMarket: new web3_js_1.PublicKey('ARjaHVxGCQfTvvKjLd7U7srvk6orthZSE6uqWchCczZc'),
+    },
 ];
 exports.SpotMarkets = {
     devnet: exports.DevnetSpotMarkets,

package/lib/dlob/orderBookLevels.js

@@ -93,7 +93,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
     }
     const updatedAmm = (0, __1.calculateUpdatedAMM)(marketAccount.amm, oraclePriceData);
     let [openBids, openAsks] = (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
-    const minOrderSize = marketAccount.amm.orderStepSize;
+    const minOrderSize = marketAccount.amm.minOrderSize;
     if (openBids.lt(minOrderSize.muln(2))) {
         openBids = __1.ZERO;
     }

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, _w, _x, _y, _z;
+        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;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -143,11 +143,11 @@ class DriftClient {
             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, (_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.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, (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.txSender =
-            (_z = config.txSender) !== null && _z !== void 0 ? _z : new retryTxSender_1.RetryTxSender({
+            (_0 = config.txSender) !== null && _0 !== void 0 ? _0 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -1150,7 +1150,7 @@ class DriftClient {
             withdrawIxs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
         }
         const tx = await this.buildTransaction(withdrawIxs, {
-            computeUnits: 600000,
+            computeUnits: 1400000,
         });
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);

package/lib/events/eventSubscriber.js

@@ -27,7 +27,7 @@ class EventSubscriber {
         }
         this.eventEmitter = new events_1.EventEmitter();
         if (this.options.logProviderConfig.type === 'websocket') {
-            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment);
+            this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(this.connection, this.address, this.options.commitment, this.options.logProviderConfig.resubTimeoutMs);
         }
         else {
             this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, options.commitment, this.options.logProviderConfig.frequency, this.options.logProviderConfig.batchSize);
@@ -38,6 +38,27 @@ class EventSubscriber {
             if (this.logProvider.isSubscribed()) {
                 return true;
             }
+            if (this.options.logProviderConfig.type === 'websocket') {
+                if (this.options.logProviderConfig.resubTimeoutMs) {
+                    if (this.options.logProviderConfig.maxReconnectAttempts &&
+                        this.options.logProviderConfig.maxReconnectAttempts > 0) {
+                        const logProviderConfig = this.options
+                            .logProviderConfig;
+                        this.logProvider.eventEmitter.on('reconnect', (reconnectAttempts) => {
+                            if (reconnectAttempts > logProviderConfig.maxReconnectAttempts) {
+                                console.log('Failing over to polling');
+                                this.logProvider.eventEmitter.removeAllListeners('reconnect');
+                                this.unsubscribe().then(() => {
+                                    this.logProvider = new pollingLogProvider_1.PollingLogProvider(this.connection, this.address, this.options.commitment, logProviderConfig.fallbackFrequency, logProviderConfig.fallbackBatchSize);
+                                    this.logProvider.subscribe((txSig, slot, logs, mostRecentBlockTime) => {
+                                        this.handleTxLogs(txSig, slot, logs, mostRecentBlockTime);
+                                    }, true);
+                                });
+                            }
+                        });
+                    }
+                }
+            }
             this.logProvider.subscribe((txSig, slot, logs, mostRecentBlockTime) => {
                 this.handleTxLogs(txSig, slot, logs, mostRecentBlockTime);
             }, true);
@@ -95,7 +116,7 @@ class EventSubscriber {
         }
     }
     async unsubscribe() {
-        return await this.logProvider.unsubscribe();
+        return await this.logProvider.unsubscribe(true);
     }
     parseEventsFromLogs(txSig, slot, logs) {
         const records = [];

package/lib/events/pollingLogProvider.d.ts

@@ -11,7 +11,7 @@ export declare class PollingLogProvider implements LogProvider {
     private mutex;
     private firstFetch;
     constructor(connection: Connection, address: PublicKey, commitment: Commitment, frequency?: number, batchSize?: number);
-    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): Promise<boolean>;
     isSubscribed(): boolean;
     unsubscribe(): Promise<boolean>;
 }

package/lib/events/pollingLogProvider.js

@@ -11,7 +11,7 @@ class PollingLogProvider {
         this.firstFetch = true;
         this.finality = commitment === 'finalized' ? 'finalized' : 'confirmed';
     }
-    subscribe(callback, skipHistory) {
+    async subscribe(callback, skipHistory) {
         if (this.intervalId) {
             return true;
         }

package/lib/events/types.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 import { Commitment, PublicKey, TransactionSignature } from '@solana/web3.js';
 import { DepositRecord, FundingPaymentRecord, FundingRateRecord, LiquidationRecord, NewUserRecord, OrderActionRecord, OrderRecord, SettlePnlRecord, LPRecord, InsuranceFundRecord, SpotInterestRecord, InsuranceFundStakeRecord, CurveRecord, SwapRecord } from '../index';
+import { EventEmitter } from 'events';
 export type EventSubscriptionOptions = {
     address?: PublicKey;
     eventTypes?: EventType[];
@@ -48,11 +50,16 @@ export type SortFn = (currentRecord: EventMap[EventType], newRecord: EventMap[Ev
 export type logProviderCallback = (txSig: TransactionSignature, slot: number, logs: string[], mostRecentBlockTime: number | undefined) => void;
 export interface LogProvider {
     isSubscribed(): boolean;
-    subscribe(callback: logProviderCallback, skipHistory?: boolean): boolean;
-    unsubscribe(): Promise<boolean>;
+    subscribe(callback: logProviderCallback, skipHistory?: boolean): Promise<boolean>;
+    unsubscribe(external: boolean): Promise<boolean>;
+    eventEmitter?: EventEmitter;
 }
 export type WebSocketLogProviderConfig = {
     type: 'websocket';
+    resubTimeoutMs?: number;
+    maxReconnectAttempts?: number;
+    fallbackFrequency?: number;
+    fallbackBatchSize?: number;
 };
 export type PollingLogProviderConfig = {
     type: 'polling';

package/lib/events/webSocketLogProvider.d.ts

@@ -1,12 +1,24 @@
+/// <reference types="node" />
 import { LogProvider, logProviderCallback } from './types';
 import { Commitment, Connection, PublicKey } from '@solana/web3.js';
+import { EventEmitter } from 'events';
 export declare class WebSocketLogProvider implements LogProvider {
     private connection;
     private address;
     private commitment;
+    private resubTimeoutMs?;
     private subscriptionId;
-    constructor(connection: Connection, address: PublicKey, commitment: Commitment);
-    subscribe(callback: logProviderCallback): boolean;
+    private isUnsubscribing;
+    private externalUnsubscribe;
+    private receivingData;
+    private timeoutId?;
+    private reconnectAttempts;
+    eventEmitter?: EventEmitter;
+    private callback?;
+    constructor(connection: Connection, address: PublicKey, commitment: Commitment, resubTimeoutMs?: number);
+    subscribe(callback: logProviderCallback): Promise<boolean>;
+    setSubscription(callback: logProviderCallback): void;
     isSubscribed(): boolean;
-    unsubscribe(): Promise<boolean>;
+    unsubscribe(external?: boolean): Promise<boolean>;
+    private setTimeout;
 }

package/lib/events/webSocketLogProvider.js

@@ -1,30 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketLogProvider = void 0;
+const events_1 = require("events");
 class WebSocketLogProvider {
-    constructor(connection, address, commitment) {
+    constructor(connection, address, commitment, resubTimeoutMs) {
         this.connection = connection;
         this.address = address;
         this.commitment = commitment;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.isUnsubscribing = false;
+        this.externalUnsubscribe = false;
+        this.receivingData = false;
+        this.reconnectAttempts = 0;
+        if (this.resubTimeoutMs) {
+            this.eventEmitter = new events_1.EventEmitter();
+        }
     }
-    subscribe(callback) {
+    async subscribe(callback) {
         if (this.subscriptionId) {
             return true;
         }
+        this.callback = callback;
+        try {
+            this.setSubscription(callback);
+        }
+        catch (error) {
+            // Sometimes ws connection isn't ready, give it a few secs
+            setTimeout(() => this.setSubscription(callback), 2000);
+        }
+        if (this.resubTimeoutMs) {
+            this.setTimeout();
+        }
+        return true;
+    }
+    setSubscription(callback) {
         this.subscriptionId = this.connection.onLogs(this.address, (logs, ctx) => {
+            if (this.resubTimeoutMs && !this.isUnsubscribing) {
+                this.receivingData = true;
+                clearTimeout(this.timeoutId);
+                this.setTimeout();
+            }
             callback(logs.signature, ctx.slot, logs.logs, undefined);
         }, this.commitment);
-        return true;
     }
     isSubscribed() {
         return this.subscriptionId !== undefined;
     }
-    async unsubscribe() {
+    async unsubscribe(external = false) {
+        this.isUnsubscribing = true;
+        this.externalUnsubscribe = external;
+        clearTimeout(this.timeoutId);
+        this.timeoutId = undefined;
         if (this.subscriptionId !== undefined) {
-            await this.connection.removeOnLogsListener(this.subscriptionId);
-            this.subscriptionId = undefined;
+            try {
+                await this.connection.removeOnLogsListener(this.subscriptionId);
+                this.subscriptionId = undefined;
+                this.isUnsubscribing = false;
+                return true;
+            }
+            catch (err) {
+                console.log('Error unsubscribing from logs: ', err);
+                this.isUnsubscribing = false;
+                return false;
+            }
         }
-        return true;
+        else {
+            this.isUnsubscribing = false;
+            return true;
+        }
+    }
+    setTimeout() {
+        this.timeoutId = setTimeout(async () => {
+            if (this.isUnsubscribing || this.externalUnsubscribe) {
+                // If we are in the process of unsubscribing, do not attempt to resubscribe
+                return;
+            }
+            if (this.receivingData) {
+                console.log(`No log data in ${this.resubTimeoutMs}ms, resubscribing on attempt ${this.reconnectAttempts + 1}`);
+                await this.unsubscribe();
+                this.receivingData = false;
+                this.reconnectAttempts++;
+                this.eventEmitter.emit('reconnect', this.reconnectAttempts);
+                this.subscribe(this.callback);
+            }
+        }, this.resubTimeoutMs);
     }
 }
 exports.WebSocketLogProvider = WebSocketLogProvider;

package/lib/orderSubscriber/OrderSubscriber.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
+import { Commitment } from '@solana/web3.js';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
 import { PollingSubscription } from './PollingSubscription';
@@ -14,13 +15,16 @@ export declare class OrderSubscriber {
         userAccount: UserAccount;
     }>;
     subscription: PollingSubscription | WebsocketSubscription;
+    commitment: Commitment;
     eventEmitter: StrictEventEmitter<EventEmitter, OrderSubscriberEvents>;
     fetchPromise?: Promise<void>;
     fetchPromiseResolver: () => void;
+    mostRecentSlot: number;
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;
-    tryUpdateUserAccount(key: string, userAccount: UserAccount, slot: number): void;
+    tryUpdateUserAccount(key: string, dataType: 'raw' | 'decoded', data: string[] | UserAccount, slot: number): void;
     getDLOB(slot: number): Promise<DLOB>;
+    getSlot(): number;
     unsubscribe(): Promise<void>;
 }

package/lib/orderSubscriber/OrderSubscriber.js

@@ -12,6 +12,7 @@ class OrderSubscriber {
     constructor(config) {
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
+        this.commitment = config.subscriptionConfig.commitment || 'processed';
         if (config.subscriptionConfig.type === 'polling') {
             this.subscription = new PollingSubscription_1.PollingSubscription({
                 orderSubscriber: this,
@@ -21,6 +22,7 @@ class OrderSubscriber {
         else {
             this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
                 orderSubscriber: this,
+                commitment: this.commitment,
                 skipInitialLoad: config.subscriptionConfig.skipInitialLoad,
                 resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
             });
@@ -41,7 +43,7 @@ class OrderSubscriber {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
-                    commitment: this.driftClient.opts.commitment,
+                    commitment: this.commitment,
                     filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithOrderFilter)()],
                     encoding: 'base64',
                     withContext: true,
@@ -55,11 +57,8 @@ class OrderSubscriber {
             const programAccountSet = new Set();
             for (const programAccount of rpcResponseAndContext.value) {
                 const key = programAccount.pubkey.toString();
-                // @ts-ignore
-                const buffer = buffer_1.Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
                 programAccountSet.add(key);
-                const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
-                this.tryUpdateUserAccount(key, userAccount, slot);
+                this.tryUpdateUserAccount(key, 'raw', programAccount.account.data, slot);
             }
             for (const key of this.usersAccounts.keys()) {
                 if (!programAccountSet.has(key)) {
@@ -75,9 +74,23 @@ class OrderSubscriber {
             this.fetchPromise = undefined;
         }
     }
-    tryUpdateUserAccount(key, userAccount, slot) {
+    tryUpdateUserAccount(key, dataType, data, slot) {
+        if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
+            this.mostRecentSlot = slot;
+        }
         const slotAndUserAccount = this.usersAccounts.get(key);
-        if (!slotAndUserAccount || slotAndUserAccount.slot < slot) {
+        if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
+            let userAccount;
+            // Polling leads to a lot of redundant decoding, so we only decode if data is from a fresh slot
+            if (dataType === 'raw') {
+                // @ts-ignore
+                const buffer = buffer_1.Buffer.from(data[0], data[1]);
+                userAccount =
+                    this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+            }
+            else {
+                userAccount = data;
+            }
             const newOrders = userAccount.orders.filter((order) => {
                 var _a;
                 return order.slot.toNumber() > ((_a = slotAndUserAccount === null || slotAndUserAccount === void 0 ? void 0 : slotAndUserAccount.slot) !== null && _a !== void 0 ? _a : 0) &&
@@ -104,6 +117,10 @@ class OrderSubscriber {
         }
         return dlob;
     }
+    getSlot() {
+        var _a;
+        return (_a = this.mostRecentSlot) !== null && _a !== void 0 ? _a : 0;
+    }
     async unsubscribe() {
         await this.subscription.unsubscribe();
     }

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -1,11 +1,14 @@
 import { OrderSubscriber } from './OrderSubscriber';
+import { Commitment } from '@solana/web3.js';
 export declare class WebsocketSubscription {
     private orderSubscriber;
+    private commitment;
     private skipInitialLoad;
     private resubTimeoutMs?;
     private subscriber;
-    constructor({ orderSubscriber, skipInitialLoad, resubTimeoutMs, }: {
+    constructor({ orderSubscriber, commitment, skipInitialLoad, resubTimeoutMs, }: {
         orderSubscriber: OrderSubscriber;
+        commitment: Commitment;
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
     });

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -4,8 +4,9 @@ exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
 const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
-    constructor({ orderSubscriber, skipInitialLoad = false, resubTimeoutMs, }) {
+    constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubTimeoutMs, }) {
         this.orderSubscriber = orderSubscriber;
+        this.commitment = commitment;
         this.skipInitialLoad = skipInitialLoad;
         this.resubTimeoutMs = resubTimeoutMs;
     }
@@ -13,12 +14,12 @@ class WebsocketSubscription {
         if (!this.subscriber) {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.driftClient.program.account.user.coder.accounts.decode.bind(this.orderSubscriber.driftClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
-                commitment: this.orderSubscriber.driftClient.opts.commitment,
+                commitment: this.commitment,
             }, this.resubTimeoutMs);
         }
         await this.subscriber.subscribe((accountId, account, context) => {
             const userKey = accountId.toBase58();
-            this.orderSubscriber.tryUpdateUserAccount(userKey, account, context.slot);
+            this.orderSubscriber.tryUpdateUserAccount(userKey, 'decoded', account, context.slot);
         });
         if (!this.skipInitialLoad) {
             await this.orderSubscriber.fetch();

package/lib/orderSubscriber/types.d.ts

@@ -1,4 +1,4 @@
-import { PublicKey } from '@solana/web3.js';
+import { Commitment, PublicKey } from '@solana/web3.js';
 import { Order, UserAccount } from '../types';
 import { DriftClient } from '../driftClient';
 export type OrderSubscriberConfig = {
@@ -6,10 +6,12 @@ export type OrderSubscriberConfig = {
     subscriptionConfig: {
         type: 'polling';
         frequency: number;
+        commitment?: Commitment;
     } | {
         type: 'websocket';
         skipInitialLoad?: boolean;
         resubTimeoutMs?: number;
+        commitment?: Commitment;
     };
 };
 export interface OrderSubscriberEvents {