@drift-labs/sdk 2.49.0-beta.1 → 2.49.0-beta.11

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/superStake.d.ts

@@ -5,6 +5,30 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
+export type BSOL_STATS_API_RESPONSE = {
+    success: boolean;
+    stats?: {
+        conversion: {
+            bsol_to_sol: number;
+            sol_to_bsol: number;
+        };
+        apy: {
+            base: number;
+            blze: number;
+            total: number;
+            lending: number;
+            liquidity: number;
+        };
+    };
+};
+export type BSOL_EMISSIONS_API_RESPONSE = {
+    success: boolean;
+    emissions?: {
+        lend: number;
+    };
+};
+export declare function fetchBSolMetrics(): Promise<any>;
+export declare function fetchBSolDriftEmissions(): Promise<any>;
 export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }: {
     marketIndex: number;
     amount: BN;
@@ -46,6 +70,25 @@ export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, dr
     method: 'jupiter' | 'marinade';
     price: number;
 }>;
+/**
+ * Finds best Jupiter Swap instructions for a generic lstMint
+ *
+ * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
+ */
+export declare function findBestLstSuperStakeIxs({ amount, lstMint, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, }: {
+    amount: BN;
+    lstMint: PublicKey;
+    lstMarketIndex: number;
+    jupiterClient: JupiterClient;
+    driftClient: DriftClient;
+    userAccountPublicKey?: PublicKey;
+    onlyDirectRoutes?: boolean;
+}): Promise<{
+    ixs: TransactionInstruction[];
+    lookupTables: AddressLookupTableAccount[];
+    method: 'jupiter' | 'marinade';
+    price: number;
+}>;
 export type JITO_SOL_METRICS_ENDPOINT_RESPONSE = {
     data: {
         getStakePoolStats: {

package/lib/math/superStake.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateEstimatedSuperStakeLiquidationPrice = exports.calculateSolEarned = exports.fetchJitoSolMetrics = exports.findBestJitoSolSuperStakeIxs = exports.findBestMSolSuperStakeIxs = exports.findBestSuperStakeIxs = void 0;
+exports.calculateEstimatedSuperStakeLiquidationPrice = exports.calculateSolEarned = exports.fetchJitoSolMetrics = exports.findBestLstSuperStakeIxs = exports.findBestJitoSolSuperStakeIxs = exports.findBestMSolSuperStakeIxs = exports.findBestSuperStakeIxs = exports.fetchBSolDriftEmissions = exports.fetchBSolMetrics = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const marinade_1 = require("../marinade");
 const anchor_1 = require("@coral-xyz/anchor");
@@ -11,6 +11,14 @@ const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const utils_1 = require("./utils");
+async function fetchBSolMetrics() {
+    return await (0, node_fetch_1.default)('https://stake.solblaze.org/api/v1/stats');
+}
+exports.fetchBSolMetrics = fetchBSolMetrics;
+async function fetchBSolDriftEmissions() {
+    return await (0, node_fetch_1.default)('https://stake.solblaze.org/api/v1/drift_emissions');
+}
+exports.fetchBSolDriftEmissions = fetchBSolDriftEmissions;
 async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }) {
     if (marketIndex === 2) {
         return findBestMSolSuperStakeIxs({
@@ -32,6 +40,17 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
             onlyDirectRoutes,
         });
     }
+    else if (marketIndex === 8) {
+        return findBestLstSuperStakeIxs({
+            amount,
+            lstMint: driftClient.getSpotMarketAccount(8).mint,
+            lstMarketIndex: 8,
+            jupiterClient,
+            driftClient,
+            userAccountPublicKey,
+            onlyDirectRoutes,
+        });
+    }
     else {
         throw new Error(`Unsupported superstake market index: ${marketIndex}`);
     }
@@ -90,14 +109,30 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
 }
 exports.findBestMSolSuperStakeIxs = findBestMSolSuperStakeIxs;
 async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, }) {
+    return await findBestLstSuperStakeIxs({
+        amount,
+        jupiterClient,
+        driftClient,
+        userAccountPublicKey,
+        onlyDirectRoutes,
+        lstMint: driftClient.getSpotMarketAccount(6).mint,
+        lstMarketIndex: 6,
+    });
+}
+exports.findBestJitoSolSuperStakeIxs = findBestJitoSolSuperStakeIxs;
+/**
+ * Finds best Jupiter Swap instructions for a generic lstMint
+ *
+ * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
+ */
+async function findBestLstSuperStakeIxs({ amount, lstMint, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, }) {
     const solMint = driftClient.getSpotMarketAccount(1).mint;
-    const JitoSolMint = driftClient.getSpotMarketAccount(6).mint;
     let jupiterPrice;
     let bestRoute;
     try {
         const jupiterRoutes = await jupiterClient.getRoutes({
             inputMint: solMint,
-            outputMint: JitoSolMint,
+            outputMint: lstMint,
             amount,
             onlyDirectRoutes,
         });
@@ -110,7 +145,7 @@ async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient
     }
     const { ixs, lookupTables } = await driftClient.getJupiterSwapIx({
         inMarketIndex: 1,
-        outMarketIndex: 6,
+        outMarketIndex: lstMarketIndex,
         route: bestRoute,
         jupiterClient,
         amount,
@@ -123,7 +158,7 @@ async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient
         price: jupiterPrice,
     };
 }
-exports.findBestJitoSolSuperStakeIxs = findBestJitoSolSuperStakeIxs;
+exports.findBestLstSuperStakeIxs = findBestLstSuperStakeIxs;
 const JITO_SOL_START_DATE = '2022-10-31T00:00:00Z';
 async function fetchJitoSolMetrics() {
     const res = await (0, node_fetch_1.default)('https://kobe.mainnet.jito.network/', {
@@ -213,12 +248,30 @@ async function calculateSolEarned({ marketIndex, user, depositRecords, }) {
             lstRatios.set(timestamp, data);
         }
     };
+    const getBSolPrice = async (timestamps) => {
+        var _a, _b;
+        // Currently there's only one bSOL price, no timestamped data
+        // So just use the same price for every timestamp for now
+        const response = await fetchBSolMetrics();
+        if (response.status === 200) {
+            const data = (await response.json());
+            const bSolRatio = (_b = (_a = data === null || data === void 0 ? void 0 : data.stats) === null || _a === void 0 ? void 0 : _a.conversion) === null || _b === void 0 ? void 0 : _b.bsol_to_sol;
+            if (bSolRatio) {
+                timestamps.forEach((timestamp) => lstRatios.set(timestamp, bSolRatio));
+            }
+        }
+    };
+    // This block kind of assumes the record are all from the same market
+    // Otherwise the following code that checks the record.marketIndex would break
     if (marketIndex === 2) {
         await Promise.all(timestamps.map(getMsolPrice));
     }
     else if (marketIndex === 6) {
         lstRatios = await getJitoSolHistoricalPriceMap(timestamps);
     }
+    else if (marketIndex === 8) {
+        await getBSolPrice(timestamps);
+    }
     let solEarned = numericConstants_1.ZERO;
     for (const record of depositRecords) {
         if (record.marketIndex === 1) {
@@ -229,23 +282,12 @@ async function calculateSolEarned({ marketIndex, user, depositRecords, }) {
                 solEarned = solEarned.add(record.amount);
             }
         }
-        else if (record.marketIndex === 2) {
-            const msolRatio = lstRatios.get(record.ts.toNumber());
-            const msolRatioBN = new anchor_1.BN(msolRatio * web3_js_1.LAMPORTS_PER_SOL);
-            const solAmount = record.amount.mul(msolRatioBN).div(numericConstants_1.LAMPORTS_PRECISION);
-            if ((0, types_1.isVariant)(record.direction, 'deposit')) {
-                solEarned = solEarned.sub(solAmount);
-            }
-            else {
-                solEarned = solEarned.add(solAmount);
-            }
-        }
-        else if (record.marketIndex === 6) {
-            const jitoSolRatio = lstRatios.get(record.ts.toNumber());
-            const jitoSolRatioBN = new anchor_1.BN(jitoSolRatio * web3_js_1.LAMPORTS_PER_SOL);
-            const solAmount = record.amount
-                .mul(jitoSolRatioBN)
-                .div(numericConstants_1.LAMPORTS_PRECISION);
+        else if (record.marketIndex === 2 ||
+            record.marketIndex === 6 ||
+            record.marketIndex === 8) {
+            const lstRatio = lstRatios.get(record.ts.toNumber());
+            const lstRatioBN = new anchor_1.BN(lstRatio * web3_js_1.LAMPORTS_PER_SOL);
+            const solAmount = record.amount.mul(lstRatioBN).div(numericConstants_1.LAMPORTS_PRECISION);
             if ((0, types_1.isVariant)(record.direction, 'deposit')) {
                 solEarned = solEarned.sub(solAmount);
             }

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>;
 }