@drift-labs/sdk 2.49.0-beta.9 → 2.52.0-beta.1

package/lib/driftClient.js

@@ -665,9 +665,7 @@ class DriftClient {
         ]);
         return programAccounts.map((programAccount) => programAccount.account);
     }
-    async deleteUser(subAccountId = 0, txParams) {
-        var _a;
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+    async getUserDeletionIx(userAccountPublicKey) {
         const ix = await this.program.instruction.deleteUser({
             accounts: {
                 user: userAccountPublicKey,
@@ -676,6 +674,12 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+        return ix;
+    }
+    async deleteUser(subAccountId = 0, txParams) {
+        var _a;
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        const ix = await this.getUserDeletionIx(userAccountPublicKey);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ix, txParams), [], this.opts);
         const userMapKey = this.getUserMapKey(subAccountId, this.wallet.publicKey);
         await ((_a = this.users.get(userMapKey)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
@@ -1061,9 +1065,12 @@ class DriftClient {
      * @param subAccountId
      * @param name
      * @param fromSubAccountId
+     * @param referrerInfo
+     * @param donateAmount
+     * @param txParams
      * @returns
      */
-    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, txParams) {
+    async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name, fromSubAccountId, referrerInfo, donateAmount, txParams) {
         var _a;
         const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
@@ -1083,10 +1090,19 @@ class DriftClient {
         const isFromSubaccount = fromSubAccountId !== null &&
             fromSubAccountId !== undefined &&
             !isNaN(fromSubAccountId);
-        const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority) && !isFromSubaccount;
+        donateAmount = donateAmount ? donateAmount : numericConstants_1.ZERO;
+        const createWSOLTokenAccount = (isSolMarket &&
+            userTokenAccount.equals(authority) &&
+            !isFromSubaccount) ||
+            !donateAmount.eq(numericConstants_1.ZERO);
+        const wSolAmount = isSolMarket ? amount.add(donateAmount) : donateAmount;
+        let wsolTokenAccount;
         if (createWSOLTokenAccount) {
-            const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
-            userTokenAccount = pubkey;
+            const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(wSolAmount, true);
+            wsolTokenAccount = pubkey;
+            if (isSolMarket) {
+                userTokenAccount = pubkey;
+            }
             ixs.push(...startIxs);
         }
         const depositCollateralIx = isFromSubaccount
@@ -1098,9 +1114,13 @@ class DriftClient {
             }
         }
         ixs.push(initializeUserAccountIx, depositCollateralIx);
+        if (!donateAmount.eq(numericConstants_1.ZERO)) {
+            const donateIx = await this.getDepositIntoSpotMarketRevenuePoolIx(1, donateAmount, wsolTokenAccount);
+            ixs.push(donateIx);
+        }
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            ixs.push((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(wsolTokenAccount, authority, authority, []));
         }
         const tx = await this.buildTransaction(ixs, params);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
@@ -3237,9 +3257,9 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
-    async depositIntoSpotMarketRevenuePool(marketIndex, amount, userTokenAccountPublicKey) {
+    async getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey) {
         const spotMarket = await this.getSpotMarketAccount(marketIndex);
-        const tx = await this.program.transaction.depositIntoSpotMarketRevenuePool(amount, {
+        const ix = await this.program.instruction.depositIntoSpotMarketRevenuePool(amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarket.pubkey,
@@ -3249,6 +3269,11 @@ class DriftClient {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
+        return ix;
+    }
+    async depositIntoSpotMarketRevenuePool(marketIndex, amount, userTokenAccountPublicKey) {
+        const ix = await this.getDepositIntoSpotMarketRevenuePoolIx(marketIndex, amount, userTokenAccountPublicKey);
+        const tx = await this.buildTransaction([ix]);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

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/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.48.0",
+    "version": "2.51.0",
     "name": "drift",
     "instructions": [
         {
@@ -4184,6 +4184,27 @@
                 }
             ]
         },
+        {
+            "name": "updateStateMaxInitializeUserFee",
+            "accounts": [
+                {
+                    "name": "admin",
+                    "isMut": false,
+                    "isSigner": true
+                },
+                {
+                    "name": "state",
+                    "isMut": true,
+                    "isSigner": false
+                }
+            ],
+            "args": [
+                {
+                    "name": "maxInitializeUserFee",
+                    "type": "u16"
+                }
+            ]
+        },
         {
             "name": "updatePerpMarketOracle",
             "accounts": [
@@ -5747,12 +5768,16 @@
                         "name": "maxNumberOfSubAccounts",
                         "type": "u16"
                     },
+                    {
+                        "name": "maxInitializeUserFee",
+                        "type": "u16"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                12
+                                10
                             ]
                         }
                     }
@@ -11094,6 +11119,11 @@
             "code": 6255,
             "name": "InvalidMarginCalculation",
             "msg": "InvalidMarginCalculation"
+        },
+        {
+            "code": 6256,
+            "name": "CantPayUserInitFee",
+            "msg": "CantPayUserInitFee"
         }
     ]
 }

package/lib/index.d.ts

@@ -19,7 +19,8 @@ export * from './accounts/pollingTokenAccountSubscriber';
 export * from './accounts/pollingUserAccountSubscriber';
 export * from './accounts/pollingUserStatsAccountSubscriber';
 export * from './accounts/pollingInsuranceFundStakeAccountSubscriber';
-export * from './accounts/mockUserAccountSubscriber';
+export * from './accounts/basicUserAccountSubscriber';
+export * from './accounts/oneShotUserAccountSubscriber';
 export * from './accounts/types';
 export * from './addresses/pda';
 export * from './adminClient';
@@ -55,6 +56,7 @@ export * from './math/margin';
 export * from './math/insurance';
 export * from './math/superStake';
 export * from './math/spotPosition';
+export * from './math/state';
 export * from './marinade';
 export * from './orderParams';
 export * from './slot/SlotSubscriber';

package/lib/index.js

@@ -42,7 +42,8 @@ __exportStar(require("./accounts/pollingTokenAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingUserStatsAccountSubscriber"), exports);
 __exportStar(require("./accounts/pollingInsuranceFundStakeAccountSubscriber"), exports);
-__exportStar(require("./accounts/mockUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/basicUserAccountSubscriber"), exports);
+__exportStar(require("./accounts/oneShotUserAccountSubscriber"), exports);
 __exportStar(require("./accounts/types"), exports);
 __exportStar(require("./addresses/pda"), exports);
 __exportStar(require("./adminClient"), exports);
@@ -78,6 +79,7 @@ __exportStar(require("./math/margin"), exports);
 __exportStar(require("./math/insurance"), exports);
 __exportStar(require("./math/superStake"), exports);
 __exportStar(require("./math/spotPosition"), exports);
+__exportStar(require("./math/state"), exports);
 __exportStar(require("./marinade"), exports);
 __exportStar(require("./orderParams"), exports);
 __exportStar(require("./slot/SlotSubscriber"), exports);

package/lib/math/state.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="bn.js" />
+import { StateAccount } from '../types';
+import { BN } from '../';
+export declare function calculateInitUserFee(stateAccount: StateAccount): BN;
+export declare function getMaxNumberOfSubAccounts(stateAccount: StateAccount): BN;

package/lib/math/state.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMaxNumberOfSubAccounts = exports.calculateInitUserFee = void 0;
+const __1 = require("../");
+function calculateInitUserFee(stateAccount) {
+    const maxInitFee = new __1.BN(stateAccount.maxInitializeUserFee)
+        .mul(__1.LAMPORTS_PRECISION)
+        .divn(100);
+    const targetUtilization = __1.PERCENTAGE_PRECISION.muln(8).divn(10);
+    const accountSpaceUtilization = stateAccount.numberOfSubAccounts
+        .addn(1)
+        .mul(__1.PERCENTAGE_PRECISION)
+        .div(getMaxNumberOfSubAccounts(stateAccount));
+    if (accountSpaceUtilization.gt(targetUtilization)) {
+        return maxInitFee
+            .mul(accountSpaceUtilization.sub(targetUtilization))
+            .div(__1.PERCENTAGE_PRECISION.sub(targetUtilization));
+    }
+    else {
+        return __1.ZERO;
+    }
+}
+exports.calculateInitUserFee = calculateInitUserFee;
+function getMaxNumberOfSubAccounts(stateAccount) {
+    return new __1.BN(stateAccount.maxNumberOfSubAccounts).muln(100);
+}
+exports.getMaxNumberOfSubAccounts = getMaxNumberOfSubAccounts;

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

@@ -1,7 +1,9 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { DriftClient } from '../driftClient';
 import { UserAccount } from '../types';
 import { Commitment } from '@solana/web3.js';
+import { Buffer } from 'buffer';
 import { DLOB } from '../dlob/DLOB';
 import { OrderSubscriberConfig, OrderSubscriberEvents } from './types';
 import { PollingSubscription } from './PollingSubscription';
@@ -20,6 +22,7 @@ export declare class OrderSubscriber {
     fetchPromise?: Promise<void>;
     fetchPromiseResolver: () => void;
     mostRecentSlot: number;
+    decodeFn: (name: string, data: Buffer) => UserAccount;
     constructor(config: OrderSubscriberConfig);
     subscribe(): Promise<void>;
     fetch(): Promise<void>;

package/lib/orderSubscriber/OrderSubscriber.js

@@ -9,8 +9,10 @@ const PollingSubscription_1 = require("./PollingSubscription");
 const WebsocketSubscription_1 = require("./WebsocketSubscription");
 const events_1 = require("events");
 const index_1 = require("../index");
+const user_1 = require("../decode/user");
 class OrderSubscriber {
     constructor(config) {
+        var _a;
         this.usersAccounts = new Map();
         this.driftClient = config.driftClient;
         this.commitment = config.subscriptionConfig.commitment || 'processed';
@@ -28,6 +30,13 @@ class OrderSubscriber {
                 resubTimeoutMs: config.subscriptionConfig.resubTimeoutMs,
             });
         }
+        if ((_a = config.fastDecode) !== null && _a !== void 0 ? _a : true) {
+            this.decodeFn = (name, data) => (0, user_1.decodeUser)(data);
+        }
+        else {
+            this.decodeFn =
+                this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
+        }
         this.eventEmitter = new events_1.EventEmitter();
     }
     async subscribe() {
@@ -60,11 +69,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) {
@@ -79,6 +92,7 @@ class OrderSubscriber {
         if (!this.mostRecentSlot || slot > this.mostRecentSlot) {
             this.mostRecentSlot = slot;
         }
+        this.eventEmitter.emit('updateReceived', new web3_js_1.PublicKey(key), slot, dataType);
         const slotAndUserAccount = this.usersAccounts.get(key);
         if (!slotAndUserAccount || slotAndUserAccount.slot <= slot) {
             let userAccount;
@@ -91,19 +105,19 @@ class OrderSubscriber {
                     slotAndUserAccount.userAccount.lastActiveSlot.gt(newLastActiveSlot)) {
                     return;
                 }
-                userAccount =
-                    this.driftClient.program.account.user.coder.accounts.decodeUnchecked('User', buffer);
+                userAccount = this.decodeFn('User', buffer);
             }
             else {
                 userAccount = data;
             }
+            this.eventEmitter.emit('userUpdated', userAccount, new web3_js_1.PublicKey(key), slot, dataType);
             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) &&
                     order.slot.toNumber() <= slot;
             });
             if (newOrders.length > 0) {
-                this.eventEmitter.emit('onUpdate', userAccount, newOrders, new web3_js_1.PublicKey(key), slot);
+                this.eventEmitter.emit('orderCreated', userAccount, newOrders, new web3_js_1.PublicKey(key), slot, dataType);
             }
             if (userAccount.hasOpenOrder) {
                 this.usersAccounts.set(key, { slot, userAccount });

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.decodeFn, {
+            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/orderSubscriber/types.d.ts

@@ -13,7 +13,10 @@ export type OrderSubscriberConfig = {
         resubTimeoutMs?: number;
         commitment?: Commitment;
     };
+    fastDecode?: boolean;
 };
 export interface OrderSubscriberEvents {
-    onUpdate: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number) => void;
+    orderCreated: (account: UserAccount, updatedOrders: Order[], pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
+    userUpdated: (account: UserAccount, pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
+    updateReceived: (pubkey: PublicKey, slot: number, dataType: 'raw' | 'decoded') => void;
 }

package/lib/types.d.ts

@@ -629,6 +629,7 @@ export type StateAccount = {
     lpCooldownTime: BN;
     initialPctToLiquidate: number;
     liquidationDuration: number;
+    maxInitializeUserFee: number;
 };
 export type PerpMarketAccount = {
     status: MarketStatus;
@@ -913,8 +914,8 @@ export type Order = {
     marketIndex: number;
     price: BN;
     baseAssetAmount: BN;
-    baseAssetAmountFilled: BN;
     quoteAssetAmount: BN;
+    baseAssetAmountFilled: BN;
     quoteAssetAmountFilled: BN;
     direction: PositionDirection;
     reduceOnly: boolean;

package/lib/user.d.ts

@@ -95,7 +95,7 @@ export declare class User {
      * @returns : the dust base asset amount (ie, < stepsize)
      * @returns : pnl from settle
      */
-    getPerpPositionWithLPSettle(marketIndex: number, originalPosition?: PerpPosition, burnLpShares?: boolean): [PerpPosition, BN, BN];
+    getPerpPositionWithLPSettle(marketIndex: number, originalPosition?: PerpPosition, burnLpShares?: boolean, includeRemainderInBaseAmount?: boolean): [PerpPosition, BN, BN];
     /**
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
@@ -196,6 +196,7 @@ export declare class User {
     };
     getTotalLiabilityValue(marginCategory?: MarginCategory): BN;
     getTotalAssetValue(marginCategory?: MarginCategory): BN;
+    getNetUsdValue(): BN;
     /**
      * Calculates the all time P&L of the user.
      *