@drift-labs/sdk 2.26.0-beta.0 → 2.26.0-beta.2

package/lib/dlob/orderBookLevels.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVammL2Generator = exports.createL2Levels = exports.mergeL2LevelGenerators = exports.getL2GeneratorFromDLOBNodes = void 0;
+const __1 = require("..");
+/**
+ * Get an {@link Generator<L2Level>} generator from a {@link Generator<DLOBNode>}
+ * @param dlobNodes e.g. {@link DLOB#getMakerLimitAsks} or {@link DLOB#getMakerLimitBids}
+ * @param oraclePriceData
+ * @param slot
+ */
+function* getL2GeneratorFromDLOBNodes(dlobNodes, oraclePriceData, slot) {
+    for (const dlobNode of dlobNodes) {
+        const size = dlobNode.order.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
+        yield {
+            size,
+            price: dlobNode.getPrice(oraclePriceData, slot),
+            sources: {
+                dlob: size,
+            },
+        };
+    }
+}
+exports.getL2GeneratorFromDLOBNodes = getL2GeneratorFromDLOBNodes;
+function* mergeL2LevelGenerators(l2LevelGenerators, compare) {
+    const generators = l2LevelGenerators.map((generator) => {
+        return {
+            generator,
+            next: generator.next(),
+        };
+    });
+    let next;
+    do {
+        next = generators.reduce((best, next) => {
+            if (next.next.done) {
+                return best;
+            }
+            if (!best) {
+                return next;
+            }
+            if (compare(next.next.value, best.next.value)) {
+                return next;
+            }
+            else {
+                return best;
+            }
+        }, undefined);
+        if (next) {
+            yield next.next.value;
+            next.next = next.generator.next();
+        }
+    } while (next !== undefined);
+}
+exports.mergeL2LevelGenerators = mergeL2LevelGenerators;
+function createL2Levels(generator, depth) {
+    const levels = [];
+    for (const level of generator) {
+        const price = level.price;
+        const size = level.size;
+        if (levels.length > 0 && levels[levels.length - 1].price.eq(price)) {
+            const currentLevel = levels[levels.length - 1];
+            currentLevel.size.add(size);
+            for (const [source, size] of Object.entries(level.sources)) {
+                if (currentLevel.sources[source]) {
+                    currentLevel.sources[source] = currentLevel.sources[source].add(size);
+                }
+                else {
+                    currentLevel.sources[source] = size;
+                }
+            }
+        }
+        else if (levels.length === depth) {
+            break;
+        }
+        else {
+            levels.push(level);
+        }
+    }
+    return levels;
+}
+exports.createL2Levels = createL2Levels;
+function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, }) {
+    const updatedAmm = (0, __1.calculateUpdatedAMM)(marketAccount.amm, oraclePriceData);
+    const [openBids, openAsks] = (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
+    now = now !== null && now !== void 0 ? now : new __1.BN(Date.now() / 1000);
+    const [bidReserves, askReserves] = (0, __1.calculateSpreadReserves)(updatedAmm, oraclePriceData, now);
+    let numBids = 0;
+    const baseSize = openBids.div(new __1.BN(numOrders));
+    const bidAmm = {
+        baseAssetReserve: bidReserves.baseAssetReserve,
+        quoteAssetReserve: bidReserves.quoteAssetReserve,
+        sqrtK: updatedAmm.sqrtK,
+        pegMultiplier: updatedAmm.pegMultiplier,
+    };
+    const getL2Bids = function* () {
+        while (numBids < numOrders) {
+            const [afterSwapQuoteReserves, afterSwapBaseReserves] = (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'base', baseSize, __1.SwapDirection.ADD);
+            const quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), bidAmm.pegMultiplier, __1.SwapDirection.ADD);
+            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(baseSize);
+            bidAmm.baseAssetReserve = afterSwapBaseReserves;
+            bidAmm.quoteAssetReserve = afterSwapQuoteReserves;
+            yield {
+                price,
+                size: baseSize,
+                sources: { vamm: baseSize },
+            };
+            numBids++;
+        }
+    };
+    let numAsks = 0;
+    const askSize = openAsks.abs().div(new __1.BN(numOrders));
+    const askAmm = {
+        baseAssetReserve: askReserves.baseAssetReserve,
+        quoteAssetReserve: askReserves.quoteAssetReserve,
+        sqrtK: updatedAmm.sqrtK,
+        pegMultiplier: updatedAmm.pegMultiplier,
+    };
+    const getL2Asks = function* () {
+        while (numAsks < numOrders) {
+            const [afterSwapQuoteReserves, afterSwapBaseReserves] = (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'base', askSize, __1.SwapDirection.REMOVE);
+            const quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), askAmm.pegMultiplier, __1.SwapDirection.REMOVE);
+            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(askSize);
+            askAmm.baseAssetReserve = afterSwapBaseReserves;
+            askAmm.quoteAssetReserve = afterSwapQuoteReserves;
+            yield {
+                price,
+                size: askSize,
+                sources: { vamm: baseSize },
+            };
+            numAsks++;
+        }
+    };
+    return {
+        getL2Bids,
+        getL2Asks,
+    };
+}
+exports.getVammL2Generator = getVammL2Generator;

package/lib/dlob/types.d.ts

@@ -1,5 +1,7 @@
 import { DLOB } from './DLOB';
+import { DriftClient } from '../driftClient';
 export type DLOBSubscriptionConfig = {
+    driftClient: DriftClient;
     dlobSource: DLOBSource;
     slotSource: SlotSource;
     updateFrequency: number;

package/lib/driftClient.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="bn.js" />
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount, ModifyOrderParams, PhoenixV1FulfillmentConfigAccount } from './types';
 import * as anchor from '@coral-xyz/anchor';
@@ -32,9 +31,10 @@ export declare class DriftClient {
     program: Program;
     provider: AnchorProvider;
     opts?: ConfirmOptions;
-    users: Map<number, User>;
+    users: Map<string, User>;
     userStats?: UserStats;
     activeSubAccountId: number;
+    activeAuthority: PublicKey;
     userAccountSubscriptionConfig: UserSubscriptionConfig;
     accountSubscriber: DriftClientAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
@@ -45,11 +45,14 @@ export declare class DriftClient {
     authority: PublicKey;
     marketLookupTable: PublicKey;
     lookupTableAccount: AddressLookupTableAccount;
+    includeDelegates?: boolean;
+    authoritySubaccountMap?: Map<string, number[]>;
+    skipLoadUsers?: boolean;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
-    createUsers(subAccountIds: number[], accountSubscriptionConfig: UserSubscriptionConfig): void;
-    createUser(subAccountId: number, accountSubscriptionConfig: UserSubscriptionConfig): User;
+    getUserMapKey(subAccountId: number, authority: PublicKey): string;
+    createUser(subAccountId: number, accountSubscriptionConfig: UserSubscriptionConfig, authority?: PublicKey): User;
     subscribe(): Promise<boolean>;
     subscribeUsers(): Promise<boolean>[];
     /**
@@ -91,11 +94,15 @@ export declare class DriftClient {
      * @param newWallet
      * @param subAccountIds
      * @param activeSubAccountId
+     * @param includeDelegates
      */
-    updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number): Promise<void>;
-    switchActiveUser(subAccountId: number): void;
-    addUser(subAccountId: number): Promise<void>;
-    addAllUsers(): Promise<void>;
+    updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number, includeDelegates?: boolean, authoritySubaccountMap?: Map<string, number[]>): Promise<boolean>;
+    switchActiveUser(subAccountId: number, authority?: PublicKey): void;
+    addUser(subAccountId: number, authority?: PublicKey): Promise<boolean>;
+    /**
+     * Adds and subscribes to users based on params set by the constructor or by updateWallet.
+     */
+    addAndSubscribeToUsers(): Promise<boolean>;
     initializeUserAccount(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[TransactionSignature, PublicKey]>;
     getInitializeUserInstructions(subAccountId?: number, name?: string, referrerInfo?: ReferrerInfo): Promise<[PublicKey, TransactionInstruction]>;
     getInitializeUserStatsIx(): Promise<TransactionInstruction>;
@@ -111,14 +118,14 @@ export declare class DriftClient {
     getReferredUserStatsAccountsByReferrer(referrer: PublicKey): Promise<UserStatsAccount[]>;
     getReferrerNameAccountsForAuthority(authority: PublicKey): Promise<ReferrerNameAccount[]>;
     deleteUser(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getUser(subAccountId?: number): User;
+    getUser(subAccountId?: number, authority?: PublicKey): User;
     getUsers(): User[];
     getUserStats(): UserStats;
     fetchReferrerNameAccount(name: string): Promise<ReferrerNameAccount | undefined>;
     userStatsAccountPublicKey: PublicKey;
     getUserStatsAccountPublicKey(): PublicKey;
-    getUserAccountPublicKey(): Promise<PublicKey>;
-    getUserAccount(subAccountId?: number): UserAccount | undefined;
+    getUserAccountPublicKey(subAccountId?: number, authority?: PublicKey): Promise<PublicKey>;
+    getUserAccount(subAccountId?: number, authority?: PublicKey): UserAccount | undefined;
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
      * @param subAccountId
@@ -374,6 +381,16 @@ export declare class DriftClient {
     resolvePerpPnlDeficit(spotMarketIndex: number, perpMarketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getResolvePerpPnlDeficitIx(spotMarketIndex: number, perpMarketIndex: number): Promise<TransactionInstruction>;
     getPerpMarketExtendedInfo(marketIndex: number): PerpMarketExtendedInfo;
+    /**
+     * Returns the market index and type for a given market name
+     * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }
+     *
+     * @param name
+     */
+    getMarketIndexAndType(name: string): {
+        marketIndex: number;
+        marketType: MarketType;
+    } | undefined;
     sendTransaction(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
 }
 export {};

package/lib/driftClient.js

@@ -61,7 +61,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -72,10 +72,26 @@ class DriftClient {
         this.provider = new anchor_1.AnchorProvider(config.connection, config.wallet, this.opts);
         this.program = new anchor_1.Program(drift_json_1.default, config.programID, this.provider);
         this.authority = (_a = config.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
-        const subAccountIds = (_b = config.subAccountIds) !== null && _b !== void 0 ? _b : [0];
-        this.activeSubAccountId = (_c = config.activeSubAccountId) !== null && _c !== void 0 ? _c : subAccountIds[0];
+        this.activeSubAccountId = (_b = config.activeSubAccountId) !== null && _b !== void 0 ? _b : 0;
+        this.skipLoadUsers = (_c = config.skipLoadUsers) !== null && _c !== void 0 ? _c : false;
+        if (config.includeDelegates && config.subAccountIds) {
+            throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
+        }
+        if (config.authoritySubaccountMap && config.subAccountIds) {
+            throw new Error('Can only pass one of authoritySubaccountMap or subAccountIds');
+        }
+        if (config.authoritySubaccountMap && config.includeDelegates) {
+            throw new Error('Can only pass one of authoritySubaccountMap or includeDelegates');
+        }
+        this.authoritySubaccountMap = config.authoritySubaccountMap
+            ? config.authoritySubaccountMap
+            : config.subAccountIds
+                ? new Map([[this.authority.toString(), config.subAccountIds]])
+                : new Map();
+        this.includeDelegates = (_d = config.includeDelegates) !== null && _d !== void 0 ? _d : false;
+        this.activeAuthority = this.authority;
         this.userAccountSubscriptionConfig =
-            ((_d = config.accountSubscription) === null || _d === void 0 ? void 0 : _d.type) === 'polling'
+            ((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling'
                 ? {
                     type: 'polling',
                     accountLoader: config.accountSubscription.accountLoader,
@@ -83,7 +99,6 @@ class DriftClient {
                 : {
                     type: 'websocket',
                 };
-        this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
                 driftClient: this,
@@ -108,23 +123,20 @@ class DriftClient {
         if (config.env && !this.marketLookupTable) {
             this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[config.env].MARKET_LOOKUP_TABLE);
         }
-        if (((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling') {
+        if (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'polling') {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         else {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_f = config.txSenderConfig) === null || _f === void 0 ? void 0 : _f.timeout, (_g = config.txSenderConfig) === null || _g === void 0 ? void 0 : _g.retrySleep, (_h = config.txSenderConfig) === null || _h === void 0 ? void 0 : _h.additionalConnections);
+        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_g = config.txSenderConfig) === null || _g === void 0 ? void 0 : _g.timeout, (_h = config.txSenderConfig) === null || _h === void 0 ? void 0 : _h.retrySleep, (_j = config.txSenderConfig) === null || _j === void 0 ? void 0 : _j.additionalConnections);
     }
-    createUsers(subAccountIds, accountSubscriptionConfig) {
-        for (const subAccountId of subAccountIds) {
-            const user = this.createUser(subAccountId, accountSubscriptionConfig);
-            this.users.set(subAccountId, user);
-        }
+    getUserMapKey(subAccountId, authority) {
+        return `${subAccountId}_${authority.toString()}`;
     }
-    createUser(subAccountId, accountSubscriptionConfig) {
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.authority, subAccountId);
+    createUser(subAccountId, accountSubscriptionConfig, authority) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, authority !== null && authority !== void 0 ? authority : this.authority, subAccountId);
         return new user_1.User({
             driftClient: this,
             userAccountPublicKey,
@@ -132,7 +144,7 @@ class DriftClient {
         });
     }
     async subscribe() {
-        let subscribePromises = this.subscribeUsers().concat(this.accountSubscriber.subscribe());
+        let subscribePromises = [this.addAndSubscribeToUsers()].concat(this.accountSubscriber.subscribe());
         if (this.userStats !== undefined) {
             subscribePromises = subscribePromises.concat(this.userStats.subscribe());
         }
@@ -262,54 +274,109 @@ class DriftClient {
      * @param newWallet
      * @param subAccountIds
      * @param activeSubAccountId
+     * @param includeDelegates
      */
-    async updateWallet(newWallet, subAccountIds = [0], activeSubAccountId = 0) {
+    async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
         const newProvider = new anchor_1.AnchorProvider(this.connection, newWallet, this.opts);
         const newProgram = new anchor_1.Program(drift_json_1.default, this.program.programId, newProvider);
+        this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
         this.txSender.provider = newProvider;
         this.wallet = newWallet;
         this.provider = newProvider;
         this.program = newProgram;
         this.authority = newWallet.publicKey;
+        this.activeSubAccountId = activeSubAccountId;
+        this.userStatsAccountPublicKey = undefined;
+        this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
+        if (includeDelegates && subAccountIds) {
+            throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
+        }
+        if (authoritySubaccountMap && subAccountIds) {
+            throw new Error('Can only pass one of authoritySubaccountMap or subAccountIds');
+        }
+        if (authoritySubaccountMap && includeDelegates) {
+            throw new Error('Can only pass one of authoritySubaccountMap or includeDelegates');
+        }
+        this.authoritySubaccountMap = authoritySubaccountMap
+            ? authoritySubaccountMap
+            : subAccountIds
+                ? new Map([[this.authority.toString(), subAccountIds]])
+                : new Map();
+        let success = true;
         if (this.isSubscribed) {
             await Promise.all(this.unsubscribeUsers());
             if (this.userStats) {
                 await this.userStats.unsubscribe();
                 this.userStats = new userStats_1.UserStats({
                     driftClient: this,
-                    userStatsAccountPublicKey: (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority),
+                    userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
                     accountSubscription: this.userAccountSubscriptionConfig,
                 });
-            }
-        }
-        this.users.clear();
-        this.createUsers(subAccountIds, this.userAccountSubscriptionConfig);
-        if (this.isSubscribed) {
-            await Promise.all(this.subscribeUsers());
-            if (this.userStats) {
                 await this.userStats.subscribe();
             }
+            this.users.clear();
+            success = await this.addAndSubscribeToUsers();
         }
-        this.activeSubAccountId = activeSubAccountId;
-        this.userStatsAccountPublicKey = undefined;
+        return success;
     }
-    switchActiveUser(subAccountId) {
+    switchActiveUser(subAccountId, authority) {
         this.activeSubAccountId = subAccountId;
+        this.activeAuthority = authority !== null && authority !== void 0 ? authority : this.authority;
     }
-    async addUser(subAccountId) {
-        if (this.users.has(subAccountId)) {
-            return;
+    async addUser(subAccountId, authority) {
+        authority = authority !== null && authority !== void 0 ? authority : this.authority;
+        const userKey = this.getUserMapKey(subAccountId, authority);
+        if (this.users.has(userKey) && this.users.get(userKey).isSubscribed) {
+            return true;
+        }
+        const user = this.createUser(subAccountId, this.userAccountSubscriptionConfig, authority);
+        const result = await user.subscribe();
+        if (result) {
+            this.users.set(userKey, user);
+            return true;
+        }
+        else {
+            return false;
         }
-        const user = this.createUser(subAccountId, this.userAccountSubscriptionConfig);
-        await user.subscribe();
-        this.users.set(subAccountId, user);
     }
-    async addAllUsers() {
-        const userAccounts = await this.getUserAccountsForAuthority(this.authority);
-        for (const userAccount of userAccounts) {
-            await this.addUser(userAccount.subAccountId);
+    /**
+     * Adds and subscribes to users based on params set by the constructor or by updateWallet.
+     */
+    async addAndSubscribeToUsers() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        // save the rpc calls if driftclient is initialized without a real wallet
+        if (this.skipLoadUsers)
+            return true;
+        let result = true;
+        if (this.authoritySubaccountMap && this.authoritySubaccountMap.size > 0) {
+            this.authoritySubaccountMap.forEach(async (value, key) => {
+                for (const subAccountId of value) {
+                    result =
+                        result && (await this.addUser(subAccountId, new web3_js_1.PublicKey(key)));
+                }
+            });
+            if (this.activeSubAccountId == undefined) {
+                this.switchActiveUser((_a = [...this.authoritySubaccountMap.values()][0][0]) !== null && _a !== void 0 ? _a : 0, new web3_js_1.PublicKey((_b = [...this.authoritySubaccountMap.keys()][0]) !== null && _b !== void 0 ? _b : this.authority.toString()));
+            }
+        }
+        else {
+            const userAccounts = (_c = (await this.getUserAccountsForAuthority(this.authority))) !== null && _c !== void 0 ? _c : [];
+            let delegatedAccounts = [];
+            if (this.includeDelegates) {
+                delegatedAccounts =
+                    (_d = (await this.getUserAccountsForDelegate(this.authority))) !== null && _d !== void 0 ? _d : [];
+            }
+            for (const account of userAccounts.concat(delegatedAccounts)) {
+                result =
+                    result &&
+                        (await this.addUser(account.subAccountId, account.authority));
+            }
+            if (this.activeSubAccountId == undefined) {
+                this.switchActiveUser((_f = (_e = userAccounts.concat(delegatedAccounts)[0]) === null || _e === void 0 ? void 0 : _e.subAccountId) !== null && _f !== void 0 ? _f : 0, (_h = (_g = userAccounts.concat(delegatedAccounts)[0]) === null || _g === void 0 ? void 0 : _g.authority) !== null && _h !== void 0 ? _h : this.authority);
+            }
         }
+        return result;
     }
     async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
@@ -416,7 +483,7 @@ class DriftClient {
     }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
-        await this.addUser(subAccountId);
+        await this.addUser(subAccountId, this.wallet.publicKey);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount(subAccountId)],
         });
@@ -464,7 +531,9 @@ class DriftClient {
                 },
             },
         ]);
-        return programAccounts.map((programAccount) => programAccount.account);
+        return programAccounts
+            .map((programAccount) => programAccount.account)
+            .sort((a, b) => a.subAccountId - b.subAccountId);
     }
     async getUserAccountsAndAddressesForAuthority(authority) {
         const programAccounts = await this.program.account.user.all([
@@ -488,7 +557,9 @@ class DriftClient {
                 },
             },
         ]);
-        return programAccounts.map((programAccount) => programAccount.account);
+        return programAccounts
+            .map((programAccount) => programAccount.account)
+            .sort((a, b) => a.subAccountId - b.subAccountId);
     }
     async getReferredUserStatsAccountsByReferrer(referrer) {
         const programAccounts = await this.program.account.userStats.all([
@@ -526,19 +597,25 @@ class DriftClient {
             },
         });
         const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
-        await ((_a = this.users.get(subAccountId)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
-        this.users.delete(subAccountId);
+        const userMapKey = this.getUserMapKey(subAccountId, this.wallet.publicKey);
+        await ((_a = this.users.get(userMapKey)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
+        this.users.delete(userMapKey);
         return txSig;
     }
-    getUser(subAccountId) {
+    getUser(subAccountId, authority) {
         subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
-        if (!this.users.has(subAccountId)) {
+        authority = authority !== null && authority !== void 0 ? authority : this.activeAuthority;
+        const userMapKey = this.getUserMapKey(subAccountId, authority);
+        if (!this.users.has(userMapKey)) {
             throw new Error(`Clearing House has no user for user id ${subAccountId}`);
         }
-        return this.users.get(subAccountId);
+        return this.users.get(userMapKey);
     }
     getUsers() {
-        return [...this.users.values()];
+        // delegate users get added to the end
+        return [...this.users.values()]
+            .filter((acct) => acct.getUserAccount().authority.equals(this.authority))
+            .concat([...this.users.values()].filter((acct) => !acct.getUserAccount().authority.equals(this.authority)));
     }
     getUserStats() {
         return this.userStats;
@@ -552,14 +629,14 @@ class DriftClient {
         if (this.userStatsAccountPublicKey) {
             return this.userStatsAccountPublicKey;
         }
-        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
+        this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.activeAuthority);
         return this.userStatsAccountPublicKey;
     }
-    async getUserAccountPublicKey() {
-        return this.getUser().userAccountPublicKey;
+    async getUserAccountPublicKey(subAccountId, authority) {
+        return this.getUser(subAccountId, authority).userAccountPublicKey;
     }
-    getUserAccount(subAccountId) {
-        return this.getUser(subAccountId).getUserAccount();
+    getUserAccount(subAccountId, authority) {
+        return this.getUser(subAccountId, authority).getUserAccount();
     }
     /**
      * Forces a fetch to rpc before returning accounts. Useful for anchor tests.
@@ -1059,9 +1136,10 @@ class DriftClient {
         const fromUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, fromSubAccountId);
         const toUser = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.wallet.publicKey, toSubAccountId);
         let remainingAccounts;
-        if (this.users.has(fromSubAccountId)) {
+        const userMapKey = this.getUserMapKey(fromSubAccountId, this.wallet.publicKey);
+        if (this.users.has(userMapKey)) {
             remainingAccounts = this.getRemainingAccounts({
-                userAccounts: [this.users.get(fromSubAccountId).getUserAccount()],
+                userAccounts: [this.users.get(userMapKey).getUserAccount()],
                 useMarketLastSlotCache: true,
                 writableSpotMarketIndexes: [marketIndex],
             });
@@ -1799,7 +1877,7 @@ class DriftClient {
         });
     }
     async forceCancelOrders(userAccountPublicKey, user, txParams) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getForceCancelOrdersIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getForceCancelOrdersIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;
     }
     async getForceCancelOrdersIx(userAccountPublicKey, userAccount) {
@@ -1819,7 +1897,7 @@ class DriftClient {
         });
     }
     async updateUserIdle(userAccountPublicKey, user, txParams) {
-        const { txSig } = await this.txSender.send((0, utils_1.wrapInTx)(await this.getUpdateUserIdleIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateUserIdleIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
         return txSig;
     }
     async getUpdateUserIdleIx(userAccountPublicKey, userAccount) {
@@ -2679,6 +2757,31 @@ class DriftClient {
         };
         return extendedInfo;
     }
+    /**
+     * Returns the market index and type for a given market name
+     * E.g. "SOL-PERP" -> { marketIndex: 0, marketType: MarketType.PERP }
+     *
+     * @param name
+     */
+    getMarketIndexAndType(name) {
+        for (const perpMarketAccount of this.getPerpMarketAccounts()) {
+            if ((0, userName_1.decodeName)(perpMarketAccount.name) === name) {
+                return {
+                    marketIndex: perpMarketAccount.marketIndex,
+                    marketType: types_1.MarketType.PERP,
+                };
+            }
+        }
+        for (const spotMarketAccount of this.getSpotMarketAccounts()) {
+            if ((0, userName_1.decodeName)(spotMarketAccount.name) === name) {
+                return {
+                    marketIndex: spotMarketAccount.marketIndex,
+                    marketType: types_1.MarketType.SPOT,
+                };
+            }
+        }
+        return undefined;
+    }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
         return this.txSender.send(tx, additionalSigners, opts, preSigned);
     }

package/lib/driftClientConfig.d.ts

@@ -19,6 +19,9 @@ export type DriftClientConfig = {
     env?: DriftEnv;
     userStats?: boolean;
     authority?: PublicKey;
+    includeDelegates?: boolean;
+    authoritySubaccountMap?: Map<string, number[]>;
+    skipLoadUsers?: boolean;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';

package/lib/factory/bigNum.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 export declare class BigNum {
     val: BN;
@@ -44,11 +43,11 @@ export declare class BigNum {
     gte(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
     lte(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
     eq(bn: BigNum | BN, ignorePrecision?: boolean): boolean;
-    eqZero(): boolean;
-    gtZero(): boolean;
-    ltZero(): boolean;
-    gteZero(): boolean;
-    lteZero(): boolean;
+    eqZero(): any;
+    gtZero(): any;
+    ltZero(): any;
+    gteZero(): any;
+    lteZero(): any;
     abs(): BigNum;
     neg(): BigNum;
     toString: (base?: number | 'hex', length?: number) => string;
@@ -88,8 +87,8 @@ export declare class BigNum {
     toNotional(useTradePrecision?: boolean, precisionOverride?: number): string;
     toMillified(precision?: number, rounded?: boolean): string;
     toJSON(): {
-        val: string;
-        precision: string;
+        val: any;
+        precision: any;
     };
     isNeg(): boolean;
     isPos(): boolean;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.26.0-beta.0",
+    "version": "2.26.0-beta.2",
     "name": "drift",
     "instructions": [
         {