@drift-labs/sdk 2.49.0-beta.0 → 2.49.0-beta.10

package/lib/events/eventSubscriber.js

@@ -23,7 +23,7 @@ class EventSubscriber {
         this.txEventCache = new txEventCache_1.TxEventCache(this.options.maxTx);
         this.eventListMap = new Map();
         for (const eventType of this.options.eventTypes) {
-            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir, eventType), this.options.orderDir));
+            this.eventListMap.set(eventType, new eventList_1.EventList(eventType, this.options.maxEventsPerType, (0, sort_1.getSortFn)(this.options.orderBy, this.options.orderDir), this.options.orderDir));
         }
         this.eventEmitter = new events_1.EventEmitter();
         if (this.options.logProviderConfig.type === 'websocket') {
@@ -89,6 +89,7 @@ class EventSubscriber {
         }
         if (!this.lastSeenSlot || slot > this.lastSeenSlot) {
             this.lastSeenTxSig = txSig;
+            this.lastSeenSlot = slot;
         }
         if (this.lastSeenBlockTime === undefined ||
             mostRecentBlockTime > this.lastSeenBlockTime) {

package/lib/events/sort.d.ts

@@ -1,2 +1,2 @@
-import { EventSubscriptionOrderBy, EventSubscriptionOrderDirection, EventType, SortFn } from './types';
-export declare function getSortFn(orderBy: EventSubscriptionOrderBy, orderDir: EventSubscriptionOrderDirection, eventType: EventType): SortFn;
+import { EventSubscriptionOrderBy, EventSubscriptionOrderDirection, SortFn } from './types';
+export declare function getSortFn(orderBy: EventSubscriptionOrderBy, orderDir: EventSubscriptionOrderDirection): SortFn;

package/lib/events/sort.js

@@ -1,41 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSortFn = void 0;
-const index_1 = require("../index");
 function clientSortAscFn() {
     return 'less than';
 }
 function clientSortDescFn() {
     return 'greater than';
 }
-function defaultBlockchainSortFn(currentEvent, newEvent) {
-    return currentEvent.slot <= newEvent.slot ? 'less than' : 'greater than';
-}
-function orderActionRecordSortFn(currentEvent, newEvent) {
-    var _a, _b;
-    const currentEventMarketIndex = currentEvent.marketIndex;
-    const newEventMarketIndex = newEvent.marketIndex;
-    if (currentEventMarketIndex !== newEventMarketIndex) {
-        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
-    }
-    if (((_a = currentEvent.fillRecordId) === null || _a === void 0 ? void 0 : _a.gt(index_1.ZERO)) && ((_b = newEvent.fillRecordId) === null || _b === void 0 ? void 0 : _b.gt(index_1.ZERO))) {
-        return currentEvent.fillRecordId.lte(newEvent.fillRecordId)
+function blockchainSortFn(currentEvent, newEvent) {
+    if (currentEvent.slot == newEvent.slot) {
+        return currentEvent.txSigIndex < newEvent.txSigIndex
             ? 'less than'
             : 'greater than';
     }
-    else {
-        return currentEvent.ts.lte(newEvent.ts) ? 'less than' : 'greater than';
-    }
+    return currentEvent.slot < newEvent.slot ? 'less than' : 'greater than';
 }
-function getSortFn(orderBy, orderDir, eventType) {
+function getSortFn(orderBy, orderDir) {
     if (orderBy === 'client') {
         return orderDir === 'asc' ? clientSortAscFn : clientSortDescFn;
     }
-    switch (eventType) {
-        case 'OrderActionRecord':
-            return orderActionRecordSortFn;
-        default:
-            return defaultBlockchainSortFn;
-    }
+    return blockchainSortFn;
 }
 exports.getSortFn = getSortFn;

package/lib/examples/loadDlob.js

@@ -35,15 +35,20 @@ const main = async () => {
     console.log('Subscribing drift client...');
     await driftClient.subscribe();
     console.log('Loading user map...');
-    const userMap = new __1.UserMap(driftClient, {
-        type: 'polling',
-        accountLoader: bulkAccountLoader,
+    const userMap = new __1.UserMap({
+        driftClient,
+        subscriptionConfig: {
+            type: 'websocket',
+            commitment: 'processed',
+        },
+        skipInitialLoad: false,
+        includeIdle: false,
     });
     // fetches all users and subscribes for updates
     await userMap.subscribe();
     console.log('Loading dlob from user map...');
-    const dlob = new __1.DLOB();
-    await dlob.initFromUserMap(userMap, bulkAccountLoader.mostRecentSlot);
+    const slot = await driftClient.connection.getSlot();
+    const dlob = await userMap.getDLOB(slot);
     console.log('number of orders', dlob.getDLOBOrders().length);
     dlob.clear();
     console.log('Unsubscribing users...');

package/lib/index.d.ts

@@ -9,6 +9,7 @@ export * from './types';
 export * from './constants/perpMarkets';
 export * from './accounts/fetch';
 export * from './accounts/webSocketDriftClientAccountSubscriber';
+export * from './accounts/webSocketInsuranceFundStakeAccountSubscriber';
 export * from './accounts/bulkAccountLoader';
 export * from './accounts/bulkUserSubscription';
 export * from './accounts/bulkUserStatsSubscription';
@@ -17,7 +18,8 @@ export * from './accounts/pollingOracleAccountSubscriber';
 export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
-export * from './accounts/mockUserAccountSubscriber';
+export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
+export * from './accounts/basicUserAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';

package/lib/index.js

@@ -32,6 +32,7 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./constants/perpMarkets"), exports);
 __exportStar(require("./accounts/fetch"), exports);
 __exportStar(require("./accounts/webSocketDriftClientAccountSubscriber"), exports);
+__exportStar(require("./accounts/webSocketInsuranceFundStakeAccountSubscriber"), exports);
 __exportStar(require("./accounts/bulkAccountLoader"), exports);
 __exportStar(require("./accounts/bulkUserSubscription"), exports);
 __exportStar(require("./accounts/bulkUserStatsSubscription"), exports);
@@ -40,7 +41,8 @@ __exportStar(require("./accounts/pollingOracleAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
-__exportStar(require("./accounts/mockUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
+__exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./adminClient"), exports);

package/lib/math/auction.js

@@ -18,7 +18,12 @@ function isFallbackAvailableLiquiditySource(order, minAuctionDuration, slot) {
 }
 exports.isFallbackAvailableLiquiditySource = isFallbackAvailableLiquiditySource;
 function getAuctionPrice(order, slot, oraclePrice) {
-    if ((0, types_1.isOneOfVariant)(order.orderType, ['market', 'triggerMarket', 'limit'])) {
+    if ((0, types_1.isOneOfVariant)(order.orderType, [
+        'market',
+        'triggerMarket',
+        'limit',
+        'triggerLimit',
+    ])) {
         return getAuctionPriceForFixedAuction(order, slot);
     }
     else if ((0, types_1.isVariant)(order.orderType, 'oracle')) {

package/lib/orderSubscriber/OrderSubscriber.js

@@ -60,11 +60,15 @@ class OrderSubscriber {
                 const key = programAccount.pubkey.toString();
                 programAccountSet.add(key);
                 this.tryUpdateUserAccount(key, 'raw', programAccount.account.data, slot);
+                // give event loop a chance to breathe
+                await new Promise((resolve) => setTimeout(resolve, 0));
             }
             for (const key of this.usersAccounts.keys()) {
                 if (!programAccountSet.has(key)) {
                     this.usersAccounts.delete(key);
                 }
+                // give event loop a chance to breathe
+                await new Promise((resolve) => setTimeout(resolve, 0));
             }
         }
         catch (e) {

package/lib/orderSubscriber/WebsocketSubscription.d.ts

@@ -5,7 +5,7 @@ export declare class WebsocketSubscription {
     private commitment;
     private skipInitialLoad;
     private resubTimeoutMs?;
-    private subscriber;
+    private subscriber?;
     constructor({ orderSubscriber, commitment, skipInitialLoad, resubTimeoutMs, }: {
         orderSubscriber: OrderSubscriber;
         commitment: Commitment;

package/lib/orderSubscriber/WebsocketSubscription.js

@@ -11,12 +11,13 @@ class WebsocketSubscription {
         this.resubTimeoutMs = resubTimeoutMs;
     }
     async subscribe() {
-        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.commitment,
-            }, this.resubTimeoutMs);
+        if (this.subscriber) {
+            return;
         }
+        this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.orderSubscriber.driftClient.program.account.user.coder.accounts), {
+            filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getNonIdleUserFilter)()],
+            commitment: this.commitment,
+        }, this.resubTimeoutMs);
         await this.subscriber.subscribe((accountId, account, context) => {
             const userKey = accountId.toBase58();
             this.orderSubscriber.tryUpdateUserAccount(userKey, 'decoded', account, context.slot);
@@ -28,7 +29,8 @@ class WebsocketSubscription {
     async unsubscribe() {
         if (!this.subscriber)
             return;
-        this.subscriber.unsubscribe();
+        await this.subscriber.unsubscribe();
+        this.subscriber = undefined;
     }
 }
 exports.WebsocketSubscription = WebsocketSubscription;

package/lib/types.d.ts

@@ -1025,8 +1025,6 @@ export interface IVersionedWallet {
 }
 export type FeeStructure = {
     feeTiers: FeeTier[];
-    makerRebateNumerator: BN;
-    makerRebateDenominator: BN;
     fillerRewardStructure: OrderFillerRewardStructure;
     flatFillerFee: BN;
     referrerRewardEpochUpperBound: BN;

package/lib/userMap/PollingSubscription.d.ts

@@ -0,0 +1,15 @@
+import { UserMap } from './userMap';
+export declare class PollingSubscription {
+    private userMap;
+    private frequency;
+    private skipInitialLoad;
+    intervalId?: ReturnType<typeof setTimeout>;
+    constructor({ userMap, frequency, skipInitialLoad, }: {
+        userMap: UserMap;
+        frequency: number;
+        skipInitialLoad?: boolean;
+        includeIdle?: boolean;
+    });
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/userMap/PollingSubscription.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PollingSubscription = void 0;
+class PollingSubscription {
+    constructor({ userMap, frequency, skipInitialLoad = false, }) {
+        this.userMap = userMap;
+        this.frequency = frequency;
+        this.skipInitialLoad = skipInitialLoad;
+    }
+    async subscribe() {
+        if (this.intervalId) {
+            return;
+        }
+        this.intervalId = setInterval(this.userMap.sync.bind(this.userMap), this.frequency);
+        if (!this.skipInitialLoad) {
+            await this.userMap.sync();
+        }
+    }
+    async unsubscribe() {
+        if (this.intervalId) {
+            clearInterval(this.intervalId);
+            this.intervalId = undefined;
+        }
+    }
+}
+exports.PollingSubscription = PollingSubscription;

package/lib/userMap/WebsocketSubscription.d.ts

@@ -0,0 +1,19 @@
+import { UserMap } from './userMap';
+import { Commitment } from '@solana/web3.js';
+export declare class WebsocketSubscription {
+    private userMap;
+    private commitment;
+    private skipInitialLoad;
+    private resubTimeoutMs?;
+    private includeIdle?;
+    private subscriber;
+    constructor({ userMap, commitment, skipInitialLoad, resubTimeoutMs, includeIdle, }: {
+        userMap: UserMap;
+        commitment: Commitment;
+        skipInitialLoad?: boolean;
+        resubTimeoutMs?: number;
+        includeIdle?: boolean;
+    });
+    subscribe(): Promise<void>;
+    unsubscribe(): Promise<void>;
+}

package/lib/userMap/WebsocketSubscription.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebsocketSubscription = void 0;
+const memcmp_1 = require("../memcmp");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
+class WebsocketSubscription {
+    constructor({ userMap, commitment, skipInitialLoad = false, resubTimeoutMs, includeIdle = false, }) {
+        this.userMap = userMap;
+        this.commitment = commitment;
+        this.skipInitialLoad = skipInitialLoad;
+        this.resubTimeoutMs = resubTimeoutMs;
+        this.includeIdle = includeIdle || false;
+    }
+    async subscribe() {
+        if (!this.subscriber) {
+            const filters = [(0, memcmp_1.getUserFilter)()];
+            if (!this.includeIdle) {
+                filters.push((0, memcmp_1.getNonIdleUserFilter)());
+            }
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'User', this.userMap.driftClient.program, this.userMap.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.userMap.driftClient.program.account.user.coder.accounts), {
+                filters,
+                commitment: this.commitment,
+            }, this.resubTimeoutMs);
+        }
+        await this.subscriber.subscribe((accountId, account, context) => {
+            const userKey = accountId.toBase58();
+            this.userMap.updateUserAccount(userKey, account, context.slot);
+        });
+        if (!this.skipInitialLoad) {
+            await this.userMap.sync();
+        }
+    }
+    async unsubscribe() {
+        if (!this.subscriber)
+            return;
+        await this.subscriber.unsubscribe();
+        this.subscriber = undefined;
+    }
+}
+exports.WebsocketSubscription = WebsocketSubscription;

package/lib/userMap/userMap.d.ts

@@ -1,5 +1,6 @@
-import { User, DriftClient, UserAccount, OrderRecord, UserSubscriptionConfig, WrappedEvent, DLOB } from '..';
+import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB } from '..';
 import { PublicKey } from '@solana/web3.js';
+import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 export interface UserMapInterface {
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
@@ -11,33 +12,23 @@ export interface UserMapInterface {
     updateWithOrderRecord(record: OrderRecord): Promise<void>;
     values(): IterableIterator<User>;
 }
-export type SyncCallbackCriteria = {
-    hasOpenOrders: boolean;
-};
 export declare class UserMap implements UserMapInterface {
     private userMap;
-    private driftClient;
-    private accountSubscription;
+    driftClient: DriftClient;
+    private connection;
+    private commitment;
     private includeIdle;
     private lastNumberOfSubAccounts;
+    private subscription;
     private stateAccountUpdateCallback;
-    private syncCallback;
-    private syncCallbackCriteria;
     private syncPromise?;
     private syncPromiseResolver;
     /**
      * Constructs a new UserMap instance.
-     *
-     * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {UserSubscriptionConfig} accountSubscription - The UserSubscriptionConfig instance.
-     * @param {boolean} includeIdle - Whether idle users are subscribed to. Defaults to false to decrease # of user subscriptions.
-     * @param {(authorities: PublicKey[]) => Promise<void>} syncCallback - Called after `sync` completes, will pas in unique list of authorities. Useful for using it to sync UserStatsMap.
-     * @param {SyncCallbackCriteria} syncCallbackCriteria - The criteria for the sync callback. Defaults to having no filters
      */
-    constructor(driftClient: DriftClient, accountSubscription: UserSubscriptionConfig, includeIdle?: boolean, syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria);
-    addSyncCallback(syncCallback?: (authorities: PublicKey[]) => Promise<void>, syncCallbackCriteria?: SyncCallbackCriteria): void;
+    constructor(config: UserMapConfig);
     subscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number): Promise<void>;
     has(key: string): boolean;
     /**
      * gets the User for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -67,7 +58,13 @@ export declare class UserMap implements UserMapInterface {
     updateWithEventRecord(record: WrappedEvent<any>): Promise<void>;
     values(): IterableIterator<User>;
     size(): number;
-    getUniqueAuthorities(useSyncCallbackCriteria?: boolean): PublicKey[];
+    /**
+     * Returns a unique list of authorities for all users in the UserMap that meet the filter criteria
+     * @param filterCriteria: Users must meet these criteria to be included
+     * @returns
+     */
+    getUniqueAuthorities(filterCriteria?: UserFilterCriteria): PublicKey[];
     sync(): Promise<void>;
     unsubscribe(): Promise<void>;
+    updateUserAccount(key: string, userAccount: UserAccount, slot: number): Promise<void>;
 }

package/lib/userMap/userMap.js

@@ -5,33 +5,46 @@ const __1 = require("..");
 const web3_js_1 = require("@solana/web3.js");
 const buffer_1 = require("buffer");
 const memcmp_1 = require("../memcmp");
+const WebsocketSubscription_1 = require("./WebsocketSubscription");
+const PollingSubscription_1 = require("./PollingSubscription");
 class UserMap {
     /**
      * Constructs a new UserMap instance.
-     *
-     * @param {DriftClient} driftClient - The DriftClient instance.
-     * @param {UserSubscriptionConfig} accountSubscription - The UserSubscriptionConfig instance.
-     * @param {boolean} includeIdle - Whether idle users are subscribed to. Defaults to false to decrease # of user subscriptions.
-     * @param {(authorities: PublicKey[]) => Promise<void>} syncCallback - Called after `sync` completes, will pas in unique list of authorities. Useful for using it to sync UserStatsMap.
-     * @param {SyncCallbackCriteria} syncCallbackCriteria - The criteria for the sync callback. Defaults to having no filters
      */
-    constructor(driftClient, accountSubscription, includeIdle = false, syncCallback, syncCallbackCriteria = { hasOpenOrders: false }) {
+    constructor(config) {
+        var _a, _b;
         this.userMap = new Map();
         this.stateAccountUpdateCallback = async (state) => {
-            if (state.numberOfSubAccounts !== this.lastNumberOfSubAccounts) {
+            if (!state.numberOfSubAccounts.eq(this.lastNumberOfSubAccounts)) {
                 await this.sync();
                 this.lastNumberOfSubAccounts = state.numberOfSubAccounts;
             }
         };
-        this.driftClient = driftClient;
-        this.accountSubscription = accountSubscription;
-        this.includeIdle = includeIdle;
-        this.syncCallback = syncCallback;
-        this.syncCallbackCriteria = syncCallbackCriteria;
-    }
-    addSyncCallback(syncCallback, syncCallbackCriteria = { hasOpenOrders: false }) {
-        this.syncCallback = syncCallback;
-        this.syncCallbackCriteria = syncCallbackCriteria;
+        this.driftClient = config.driftClient;
+        if (config.connection) {
+            this.connection = config.connection;
+        }
+        else {
+            this.connection = this.driftClient.connection;
+        }
+        this.commitment =
+            (_a = config.subscriptionConfig.commitment) !== null && _a !== void 0 ? _a : this.driftClient.opts.commitment;
+        this.includeIdle = (_b = config.includeIdle) !== null && _b !== void 0 ? _b : false;
+        if (config.subscriptionConfig.type === 'polling') {
+            this.subscription = new PollingSubscription_1.PollingSubscription({
+                userMap: this,
+                frequency: config.subscriptionConfig.frequency,
+                skipInitialLoad: config.skipInitialLoad,
+            });
+        }
+        else {
+            this.subscription = new WebsocketSubscription_1.WebsocketSubscription({
+                userMap: this,
+                commitment: this.commitment,
+                resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
+                skipInitialLoad: config.skipInitialLoad,
+            });
+        }
     }
     async subscribe() {
         if (this.size() > 0) {
@@ -41,13 +54,16 @@ class UserMap {
         this.lastNumberOfSubAccounts =
             this.driftClient.getStateAccount().numberOfSubAccounts;
         this.driftClient.eventEmitter.on('stateAccountUpdate', this.stateAccountUpdateCallback);
-        await this.sync();
+        await this.subscription.subscribe();
     }
-    async addPubkey(userAccountPublicKey, userAccount) {
+    async addPubkey(userAccountPublicKey, userAccount, slot) {
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: this.accountSubscription,
+            accountSubscription: {
+                type: 'custom',
+                userAccountSubscriber: new __1.BasicUserAccountSubscriber(userAccountPublicKey, userAccount, slot),
+            },
         });
         await user.subscribe(userAccount);
         this.userMap.set(userAccountPublicKey.toString(), user);
@@ -148,11 +164,15 @@ class UserMap {
     size() {
         return this.userMap.size;
     }
-    getUniqueAuthorities(useSyncCallbackCriteria = true) {
+    /**
+     * Returns a unique list of authorities for all users in the UserMap that meet the filter criteria
+     * @param filterCriteria: Users must meet these criteria to be included
+     * @returns
+     */
+    getUniqueAuthorities(filterCriteria) {
         const usersMeetingCriteria = Array.from(this.userMap.values()).filter((user) => {
             let pass = true;
-            if (useSyncCallbackCriteria &&
-                this.syncCallbackCriteria.hasOpenOrders) {
+            if (filterCriteria && filterCriteria.hasOpenOrders) {
                 pass = pass && user.getUserAccount().hasOpenOrder;
             }
             return pass;
@@ -176,7 +196,7 @@ class UserMap {
             const rpcRequestArgs = [
                 this.driftClient.program.programId.toBase58(),
                 {
-                    commitment: this.driftClient.connection.commitment,
+                    commitment: this.commitment,
                     filters,
                     encoding: 'base64',
                     withContext: true,
@@ -184,7 +204,7 @@ class UserMap {
             ];
             const rpcJSONResponse = 
             // @ts-ignore
-            await this.driftClient.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
+            await this.connection._rpcRequest('getProgramAccounts', rpcRequestArgs);
             const rpcResponseAndContext = rpcJSONResponse.result;
             const slot = rpcResponseAndContext.context.slot;
             const programAccountBufferMap = new Map();
@@ -195,9 +215,11 @@ class UserMap {
             }
             for (const [key, buffer] of programAccountBufferMap.entries()) {
                 if (!this.has(key)) {
-                    const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', buffer);
+                    const userAccount = this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
                     await this.addPubkey(new web3_js_1.PublicKey(key), userAccount);
                 }
+                // give event loop a chance to breathe
+                await new Promise((resolve) => setTimeout(resolve, 0));
             }
             for (const [key, user] of this.userMap.entries()) {
                 if (!programAccountBufferMap.has(key)) {
@@ -205,16 +227,15 @@ class UserMap {
                     this.userMap.delete(key);
                 }
                 else {
-                    const userAccount = this.driftClient.program.account.user.coder.accounts.decode('User', programAccountBufferMap.get(key));
+                    const userAccount = this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', programAccountBufferMap.get(key));
                     user.accountSubscriber.updateData(userAccount, slot);
                 }
-            }
-            if (this.syncCallback) {
-                await this.syncCallback(this.getUniqueAuthorities());
+                // give event loop a chance to breathe
+                await new Promise((resolve) => setTimeout(resolve, 0));
             }
         }
         catch (e) {
-            console.error(`Error in UserMap.sync()`);
+            console.error(`Error in UserMap.sync():`);
             console.error(e);
         }
         finally {
@@ -223,6 +244,7 @@ class UserMap {
         }
     }
     async unsubscribe() {
+        await this.subscription.unsubscribe();
         for (const [key, user] of this.userMap.entries()) {
             await user.unsubscribe();
             this.userMap.delete(key);
@@ -232,5 +254,14 @@ class UserMap {
             this.lastNumberOfSubAccounts = undefined;
         }
     }
+    async updateUserAccount(key, userAccount, slot) {
+        if (!this.userMap.has(key)) {
+            this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
+        }
+        else {
+            const user = this.userMap.get(key);
+            user.accountSubscriber.updateData(userAccount, slot);
+        }
+    }
 }
 exports.UserMap = UserMap;

package/lib/userMap/userMapConfig.d.ts

@@ -0,0 +1,20 @@
+import { Commitment, Connection } from '@solana/web3.js';
+import { DriftClient } from '../driftClient';
+export type UserAccountFilterCriteria = {
+    hasOpenOrders: boolean;
+};
+export type UserMapConfig = {
+    driftClient: DriftClient;
+    connection?: Connection;
+    subscriptionConfig: {
+        type: 'polling';
+        frequency: number;
+        commitment?: Commitment;
+    } | {
+        type: 'websocket';
+        resubTimeoutMs?: number;
+        commitment?: Commitment;
+    };
+    skipInitialLoad?: boolean;
+    includeIdle?: boolean;
+};

package/lib/userMap/userMapConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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

package/src/accounts/{mockUserAccountSubscriber.ts → basicUserAccountSubscriber.ts}

@@ -4,7 +4,7 @@ import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { UserAccount } from '../types';
 
-export class MockUserAccountSubscriber implements UserAccountSubscriber {
+export class BasicUserAccountSubscriber implements UserAccountSubscriber {
 	isSubscribed: boolean;
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
@@ -16,8 +16,8 @@ export class MockUserAccountSubscriber implements UserAccountSubscriber {
 
 	public constructor(
 		userAccountPublicKey: PublicKey,
-		data: UserAccount,
-		slot: number
+		data?: UserAccount,
+		slot?: number
 	) {
 		this.isSubscribed = true;
 		this.eventEmitter = new EventEmitter();
@@ -46,8 +46,10 @@ export class MockUserAccountSubscriber implements UserAccountSubscriber {
 	}
 
 	public updateData(userAccount: UserAccount, slot: number): void {
-		this.user = { data: userAccount, slot };
-		this.eventEmitter.emit('userAccountUpdate', userAccount);
-		this.eventEmitter.emit('update');
+		if (!this.user || slot >= (this.user.slot ?? 0)) {
+			this.user = { data: userAccount, slot };
+			this.eventEmitter.emit('userAccountUpdate', userAccount);
+			this.eventEmitter.emit('update');
+		}
 	}
 }