@drift-labs/sdk 2.42.0-beta.1 → 2.42.0-beta.10

package/VERSION

@@ -1 +1 @@
-2.42.0-beta.1
+2.42.0-beta.10

package/lib/addresses/pda.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN } from '@coral-xyz/anchor';
 export declare function getDriftStateAccountPublicKeyAndNonce(programId: PublicKey): Promise<[PublicKey, number]>;

package/lib/adminClient.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { PublicKey, TransactionSignature } from '@solana/web3.js';
 import { FeeStructure, OracleGuardRails, OracleSource, ExchangeStatus, MarketStatus, ContractTier, AssetTier, SpotFulfillmentConfigStatus } from './types';
 import { BN } from '@coral-xyz/anchor';

package/lib/constants/numericConstants.d.ts

@@ -1,60 +1,63 @@
-export declare const ZERO: any;
-export declare const ONE: any;
-export declare const TWO: any;
-export declare const THREE: any;
-export declare const FOUR: any;
-export declare const FIVE: any;
-export declare const SIX: any;
-export declare const SEVEN: any;
-export declare const EIGHT: any;
-export declare const NINE: any;
-export declare const TEN: any;
-export declare const TEN_THOUSAND: any;
-export declare const BN_MAX: any;
-export declare const TEN_MILLION: any;
-export declare const MAX_LEVERAGE: any;
-export declare const MAX_LEVERAGE_ORDER_SIZE: any;
-export declare const PERCENTAGE_PRECISION_EXP: any;
-export declare const PERCENTAGE_PRECISION: any;
-export declare const CONCENTRATION_PRECISION: any;
-export declare const QUOTE_PRECISION_EXP: any;
-export declare const FUNDING_RATE_BUFFER_PRECISION_EXP: any;
-export declare const PRICE_PRECISION_EXP: any;
-export declare const FUNDING_RATE_PRECISION_EXP: any;
-export declare const PEG_PRECISION_EXP: any;
-export declare const AMM_RESERVE_PRECISION_EXP: any;
-export declare const SPOT_MARKET_RATE_PRECISION_EXP: any;
-export declare const SPOT_MARKET_RATE_PRECISION: any;
-export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP: any;
-export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION: any;
-export declare const SPOT_MARKET_UTILIZATION_PRECISION_EXP: any;
-export declare const SPOT_MARKET_UTILIZATION_PRECISION: any;
-export declare const SPOT_MARKET_WEIGHT_PRECISION: any;
-export declare const SPOT_MARKET_BALANCE_PRECISION_EXP: any;
-export declare const SPOT_MARKET_BALANCE_PRECISION: any;
-export declare const SPOT_MARKET_IMF_PRECISION_EXP: any;
-export declare const SPOT_MARKET_IMF_PRECISION: any;
-export declare const LIQUIDATION_FEE_PRECISION: any;
-export declare const QUOTE_PRECISION: any;
-export declare const PRICE_PRECISION: any;
-export declare const FUNDING_RATE_PRECISION: any;
-export declare const FUNDING_RATE_BUFFER_PRECISION: any;
-export declare const PEG_PRECISION: any;
-export declare const AMM_RESERVE_PRECISION: any;
-export declare const BASE_PRECISION: any;
-export declare const BASE_PRECISION_EXP: any;
-export declare const AMM_TO_QUOTE_PRECISION_RATIO: any;
-export declare const PRICE_DIV_PEG: any;
-export declare const PRICE_TO_QUOTE_PRECISION: any;
-export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: any;
-export declare const MARGIN_PRECISION: any;
-export declare const BID_ASK_SPREAD_PRECISION: any;
-export declare const LIQUIDATION_PCT_PRECISION: any;
-export declare const FIVE_MINUTE: any;
-export declare const ONE_HOUR: any;
-export declare const ONE_YEAR: any;
+/// <reference types="bn.js" />
+import { BN } from '../';
+export declare const ZERO: BN;
+export declare const ONE: BN;
+export declare const TWO: BN;
+export declare const THREE: BN;
+export declare const FOUR: BN;
+export declare const FIVE: BN;
+export declare const SIX: BN;
+export declare const SEVEN: BN;
+export declare const EIGHT: BN;
+export declare const NINE: BN;
+export declare const TEN: BN;
+export declare const TEN_THOUSAND: BN;
+export declare const BN_MAX: BN;
+export declare const TEN_MILLION: BN;
+export declare const MAX_LEVERAGE: BN;
+export declare const MAX_LEVERAGE_ORDER_SIZE: BN;
+export declare const PERCENTAGE_PRECISION_EXP: BN;
+export declare const PERCENTAGE_PRECISION: BN;
+export declare const CONCENTRATION_PRECISION: BN;
+export declare const QUOTE_PRECISION_EXP: BN;
+export declare const FUNDING_RATE_BUFFER_PRECISION_EXP: BN;
+export declare const PRICE_PRECISION_EXP: BN;
+export declare const FUNDING_RATE_PRECISION_EXP: BN;
+export declare const PEG_PRECISION_EXP: BN;
+export declare const AMM_RESERVE_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_RATE_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_RATE_PRECISION: BN;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION: BN;
+export declare const SPOT_MARKET_UTILIZATION_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_UTILIZATION_PRECISION: BN;
+export declare const SPOT_MARKET_WEIGHT_PRECISION: BN;
+export declare const SPOT_MARKET_BALANCE_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_BALANCE_PRECISION: BN;
+export declare const SPOT_MARKET_IMF_PRECISION_EXP: BN;
+export declare const SPOT_MARKET_IMF_PRECISION: BN;
+export declare const LIQUIDATION_FEE_PRECISION: BN;
+export declare const QUOTE_PRECISION: BN;
+export declare const PRICE_PRECISION: BN;
+export declare const FUNDING_RATE_PRECISION: BN;
+export declare const FUNDING_RATE_BUFFER_PRECISION: BN;
+export declare const PEG_PRECISION: BN;
+export declare const AMM_RESERVE_PRECISION: BN;
+export declare const BASE_PRECISION: BN;
+export declare const BASE_PRECISION_EXP: BN;
+export declare const AMM_TO_QUOTE_PRECISION_RATIO: BN;
+export declare const PRICE_DIV_PEG: BN;
+export declare const PRICE_TO_QUOTE_PRECISION: BN;
+export declare const AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO: BN;
+export declare const MARGIN_PRECISION: BN;
+export declare const BID_ASK_SPREAD_PRECISION: BN;
+export declare const LIQUIDATION_PCT_PRECISION: BN;
+export declare const FUNDING_RATE_OFFSET_DENOMINATOR: BN;
+export declare const FIVE_MINUTE: BN;
+export declare const ONE_HOUR: BN;
+export declare const ONE_YEAR: BN;
 export declare const QUOTE_SPOT_MARKET_INDEX = 0;
-export declare const LAMPORTS_PRECISION: any;
-export declare const LAMPORTS_EXP: any;
-export declare const OPEN_ORDER_MARGIN_REQUIREMENT: any;
-export declare const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT: any;
+export declare const LAMPORTS_PRECISION: BN;
+export declare const LAMPORTS_EXP: BN;
+export declare const OPEN_ORDER_MARGIN_REQUIREMENT: BN;
+export declare const DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT: BN;

package/lib/constants/numericConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MARGIN_PRECISION = exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.PRICE_TO_QUOTE_PRECISION = exports.PRICE_DIV_PEG = exports.AMM_TO_QUOTE_PRECISION_RATIO = exports.BASE_PRECISION_EXP = exports.BASE_PRECISION = exports.AMM_RESERVE_PRECISION = exports.PEG_PRECISION = exports.FUNDING_RATE_BUFFER_PRECISION = exports.FUNDING_RATE_PRECISION = exports.PRICE_PRECISION = exports.QUOTE_PRECISION = exports.LIQUIDATION_FEE_PRECISION = exports.SPOT_MARKET_IMF_PRECISION = exports.SPOT_MARKET_IMF_PRECISION_EXP = exports.SPOT_MARKET_BALANCE_PRECISION = exports.SPOT_MARKET_BALANCE_PRECISION_EXP = exports.SPOT_MARKET_WEIGHT_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION = exports.SPOT_MARKET_UTILIZATION_PRECISION_EXP = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION = exports.SPOT_MARKET_CUMULATIVE_INTEREST_PRECISION_EXP = exports.SPOT_MARKET_RATE_PRECISION = exports.SPOT_MARKET_RATE_PRECISION_EXP = exports.AMM_RESERVE_PRECISION_EXP = exports.PEG_PRECISION_EXP = exports.FUNDING_RATE_PRECISION_EXP = exports.PRICE_PRECISION_EXP = exports.FUNDING_RATE_BUFFER_PRECISION_EXP = exports.QUOTE_PRECISION_EXP = exports.CONCENTRATION_PRECISION = exports.PERCENTAGE_PRECISION = exports.PERCENTAGE_PRECISION_EXP = exports.MAX_LEVERAGE_ORDER_SIZE = exports.MAX_LEVERAGE = exports.TEN_MILLION = exports.BN_MAX = exports.TEN_THOUSAND = exports.TEN = exports.NINE = exports.EIGHT = exports.SEVEN = exports.SIX = exports.FIVE = exports.FOUR = exports.THREE = exports.TWO = exports.ONE = exports.ZERO = void 0;
-exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
+exports.DEFAULT_REVENUE_SINCE_LAST_FUNDING_SPREAD_RETREAT = exports.OPEN_ORDER_MARGIN_REQUIREMENT = exports.LAMPORTS_EXP = exports.LAMPORTS_PRECISION = exports.QUOTE_SPOT_MARKET_INDEX = exports.ONE_YEAR = exports.ONE_HOUR = exports.FIVE_MINUTE = exports.FUNDING_RATE_OFFSET_DENOMINATOR = exports.LIQUIDATION_PCT_PRECISION = exports.BID_ASK_SPREAD_PRECISION = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const __1 = require("../");
 exports.ZERO = new __1.BN(0);
@@ -56,6 +56,7 @@ exports.AMM_TIMES_PEG_TO_QUOTE_PRECISION_RATIO = exports.AMM_RESERVE_PRECISION.m
 exports.MARGIN_PRECISION = exports.TEN_THOUSAND;
 exports.BID_ASK_SPREAD_PRECISION = new __1.BN(1000000); // 10^6
 exports.LIQUIDATION_PCT_PRECISION = exports.TEN_THOUSAND;
+exports.FUNDING_RATE_OFFSET_DENOMINATOR = new __1.BN(5000);
 exports.FIVE_MINUTE = new __1.BN(60 * 5);
 exports.ONE_HOUR = new __1.BN(60 * 60);
 exports.ONE_YEAR = new __1.BN(31536000);

package/lib/constants/spotMarkets.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { PublicKey } from '@solana/web3.js';
 import { BN, DriftEnv, OracleSource } from '../';
 export type SpotMarketConfig = {

package/lib/dlob/DLOB.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { NodeList } from './NodeList';
 import { BN, DLOBNode, DLOBNodeType, DriftClient, MarketType, MarketTypeStr, OraclePriceData, Order, OrderActionRecord, OrderRecord, PerpMarketAccount, PositionDirection, SlotSubscriber, SpotMarketAccount, StateAccount, TriggerOrderNode, UserMap } from '..';
 import { PublicKey } from '@solana/web3.js';
@@ -26,6 +27,13 @@ export type MarketNodeLists = {
     };
 };
 type OrderBookCallback = () => void;
+/**
+ *  Receives a DLOBNode and is expected to return true if the node should
+ *  be taken into account when generating, or false otherwise.
+ *
+ * Currently used in getRestingLimitBids and getRestingLimitAsks.
+ */
+export type DLOBFilterFcn = (node: DLOBNode) => boolean;
 export type NodeToFill = {
     node: DLOBNode;
     makerNodes: DLOBNode[];
@@ -70,22 +78,8 @@ export declare class DLOB {
     getTakingBids(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
     getTakingAsks(marketIndex: number, marketType: MarketType, slot: number, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
     private getBestNode;
-    getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
-    /**
-     * Filters the limit asks that are resting and do not cross fallback bid
-     * Taking orders can only fill against orders that meet this criteria
-     *
-     * @returns
-     */
-    getMakerLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, fallbackBid?: BN): Generator<DLOBNode>;
-    getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
-    /**
-     * Filters the limit bids that are post only, have been place for sufficiently long or are below the fallback ask
-     * Market orders can only fill against orders that meet this criteria
-     *
-     * @returns
-     */
-    getMakerLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, fallbackAsk?: BN): Generator<DLOBNode>;
+    getRestingLimitAsks(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
+    getRestingLimitBids(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData, filterFcn?: DLOBFilterFcn): Generator<DLOBNode>;
     getAsks(marketIndex: number, fallbackAsk: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
     getBids(marketIndex: number, fallbackBid: BN | undefined, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): Generator<DLOBNode>;
     findCrossingRestingLimitOrders(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): NodeToFill[];

package/lib/dlob/DLOB.js

@@ -572,7 +572,7 @@ class DLOB {
             return bestNode.order.slot.lt(currentNode.order.slot);
         });
     }
-    *getBestNode(generatorList, oraclePriceData, slot, compareFcn) {
+    *getBestNode(generatorList, oraclePriceData, slot, compareFcn, filterFcn) {
         const generators = generatorList.map((generator) => {
             return {
                 next: generator.next(),
@@ -600,6 +600,10 @@ class DLOB {
                     bestGenerator.next = bestGenerator.generator.next();
                     continue;
                 }
+                if (filterFcn && filterFcn(bestGenerator.next.value)) {
+                    bestGenerator.next = bestGenerator.generator.next();
+                    continue;
+                }
                 yield bestGenerator.next.value;
                 bestGenerator.next = bestGenerator.generator.next();
             }
@@ -608,7 +612,7 @@ class DLOB {
             }
         }
     }
-    *getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData) {
+    *getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot asks');
         }
@@ -626,26 +630,9 @@ class DLOB {
             return bestNode
                 .getPrice(oraclePriceData, slot)
                 .lt(currentNode.getPrice(oraclePriceData, slot));
-        });
+        }, filterFcn);
     }
-    /**
-     * Filters the limit asks that are resting and do not cross fallback bid
-     * Taking orders can only fill against orders that meet this criteria
-     *
-     * @returns
-     */
-    *getMakerLimitAsks(marketIndex, slot, marketType, oraclePriceData, fallbackBid) {
-        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
-        for (const node of this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)) {
-            if (isPerpMarket &&
-                fallbackBid &&
-                node.getPrice(oraclePriceData, slot).lte(fallbackBid)) {
-                continue;
-            }
-            yield node;
-        }
-    }
-    *getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData) {
+    *getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData, filterFcn) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {
             throw new Error('Must provide OraclePriceData to get spot bids');
         }
@@ -663,24 +650,7 @@ class DLOB {
             return bestNode
                 .getPrice(oraclePriceData, slot)
                 .gt(currentNode.getPrice(oraclePriceData, slot));
-        });
-    }
-    /**
-     * Filters the limit bids that are post only, have been place for sufficiently long or are below the fallback ask
-     * Market orders can only fill against orders that meet this criteria
-     *
-     * @returns
-     */
-    *getMakerLimitBids(marketIndex, slot, marketType, oraclePriceData, fallbackAsk) {
-        const isPerpMarket = (0, __1.isVariant)(marketType, 'perp');
-        for (const node of this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)) {
-            if (isPerpMarket &&
-                fallbackAsk &&
-                node.getPrice(oraclePriceData, slot).gte(fallbackAsk)) {
-                continue;
-            }
-            yield node;
-        }
+        }, filterFcn);
     }
     *getAsks(marketIndex, fallbackAsk, slot, marketType, oraclePriceData) {
         if ((0, __1.isVariant)(marketType, 'spot') && !oraclePriceData) {

package/lib/dlob/DLOBNode.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN, OraclePriceData, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 export interface DLOBNode {

package/lib/dlob/NodeList.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN, MarketTypeStr, Order } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { DLOBNode, DLOBNodeMap } from './DLOBNode';

package/lib/dlob/orderBookLevels.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN, DLOBNode, OraclePriceData, PerpMarketAccount } from '..';
 import { PublicKey } from '@solana/web3.js';
 type liquiditySource = 'serum' | 'vamm' | 'dlob' | 'phoenix';
@@ -26,7 +27,7 @@ export type L3OrderBook = {
     asks: L3Level[];
     bids: L3Level[];
 };
-export declare const DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS: any[];
+export declare const DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS: BN[];
 /**
  * Get an {@link Generator<L2Level>} generator from a {@link Generator<DLOBNode>}
  * @param dlobNodes e.g. {@link DLOB#getRestingLimitAsks} or {@link DLOB#getRestingLimitBids}

package/lib/driftClient.d.ts

@@ -1,4 +1,5 @@
 /// <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, PhoenixV1FulfillmentConfigAccount, ModifyOrderPolicy, SwapReduceOnly } from './types';
 import * as anchor from '@coral-xyz/anchor';
@@ -103,7 +104,7 @@ export declare class DriftClient {
      * @param includeDelegates
      */
     updateWallet(newWallet: IWallet, subAccountIds?: number[], activeSubAccountId?: number, includeDelegates?: boolean, authoritySubaccountMap?: Map<string, number[]>): Promise<boolean>;
-    switchActiveUser(subAccountId: number, authority?: PublicKey): void;
+    switchActiveUser(subAccountId: number, authority?: PublicKey): Promise<void>;
     addUser(subAccountId: number, authority?: PublicKey, userAccount?: UserAccount): Promise<boolean>;
     /**
      * Adds and subscribes to users based on params set by the constructor or by updateWallet.
@@ -115,9 +116,16 @@ export declare class DriftClient {
     getNextSubAccountId(): Promise<number>;
     initializeReferrerName(name: string): Promise<TransactionSignature>;
     updateUserName(name: string, subAccountId?: number): Promise<TransactionSignature>;
-    updateUserCustomMarginRatio(marginRatio: number, subAccountId?: number): Promise<TransactionSignature>;
+    updateUserCustomMarginRatio(updates: {
+        marginRatio: number;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
+    getUpdateUserCustomMarginRatioIx(marginRatio: number, subAccountId?: number): Promise<TransactionInstruction>;
     getUpdateUserMarginTradingEnabledIx(marginTradingEnabled: boolean, subAccountId?: number, userAccountPublicKey?: PublicKey): Promise<TransactionInstruction>;
-    updateUserMarginTradingEnabled(marginTradingEnabled: boolean, subAccountId?: number): Promise<TransactionSignature>;
+    updateUserMarginTradingEnabled(updates: {
+        marginTradingEnabled: boolean;
+        subAccountId: number;
+    }[]): Promise<TransactionSignature>;
     updateUserDelegate(delegate: PublicKey, subAccountId?: number): Promise<TransactionSignature>;
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
@@ -269,7 +277,7 @@ export declare class DriftClient {
      * @param bracketOrdersParams
      * @returns
      */
-    sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, useVersionedTx?: boolean): Promise<{
+    sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo): Promise<{
         txSig: TransactionSignature;
         signedFillTx: Transaction;
     }>;

package/lib/driftClient.js

@@ -294,6 +294,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
+        var _a, _b;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -308,6 +309,10 @@ class DriftClient {
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
+        const walletSupportsVersionedTxns = 
+        //@ts-ignore
+        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
+        this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
         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');
         }
@@ -339,10 +344,24 @@ class DriftClient {
         }
         return success;
     }
-    switchActiveUser(subAccountId, authority) {
+    async switchActiveUser(subAccountId, authority) {
+        var _a;
+        const authorityChanged = authority && !((_a = this.authority) === null || _a === void 0 ? void 0 : _a.equals(authority));
         this.activeSubAccountId = subAccountId;
         this.authority = authority !== null && authority !== void 0 ? authority : this.authority;
         this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
+        /* If changing the user authority ie switching from delegate to non-delegate account, need to re-subscribe to the user stats account */
+        if (authorityChanged) {
+            if (this.userStats && this.userStats.isSubscribed) {
+                await this.userStats.unsubscribe();
+            }
+            this.userStats = new userStats_1.UserStats({
+                driftClient: this,
+                userStatsAccountPublicKey: this.userStatsAccountPublicKey,
+                accountSubscription: this.userAccountSubscriptionConfig,
+            });
+            this.userStats.subscribe();
+        }
     }
     async addUser(subAccountId, authority, userAccount) {
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
@@ -503,15 +522,25 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateUserCustomMarginRatio(marginRatio, subAccountId = 0) {
-        const tx = await this.program.transaction.updateUserCustomMarginRatio(subAccountId, marginRatio, {
+    async updateUserCustomMarginRatio(updates) {
+        const ixs = await Promise.all(updates.map(async ({ marginRatio, subAccountId }) => {
+            const ix = await this.getUpdateUserCustomMarginRatioIx(marginRatio, subAccountId);
+            return ix;
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getUpdateUserCustomMarginRatioIx(marginRatio, subAccountId = 0) {
+        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        await this.addUser(subAccountId, this.wallet.publicKey);
+        const ix = this.program.instruction.updateUserCustomMarginRatio(subAccountId, marginRatio, {
             accounts: {
-                user: await this.getUserAccountPublicKey(),
+                user: userAccountPublicKey,
                 authority: this.wallet.publicKey,
             },
         });
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
+        return ix;
     }
     async getUpdateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId = 0, userAccountPublicKey) {
         const userAccountPublicKeyToUse = userAccountPublicKey ||
@@ -534,19 +563,11 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
-        const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
-        await this.addUser(subAccountId, this.wallet.publicKey);
-        const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
-        });
-        const tx = await this.program.transaction.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
-            accounts: {
-                user: userAccountPublicKey,
-                authority: this.wallet.publicKey,
-            },
-            remainingAccounts,
-        });
+    async updateUserMarginTradingEnabled(updates) {
+        const ixs = await Promise.all(updates.map(async ({ marginTradingEnabled, subAccountId }) => {
+            return await this.getUpdateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId);
+        }));
+        const tx = await this.buildTransaction(ixs, this.txParams);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -925,28 +946,25 @@ class DriftClient {
      * @param reduceOnly
      */
     async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 600000,
-        }));
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signerAuthority);
+        const instructions = [];
         if (createWSOLTokenAccount) {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             associatedTokenAccount = pubkey;
-            ixs.forEach((ix) => {
-                tx.add(ix);
-            });
+            instructions.push(...ixs);
         }
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
-        tx.add(depositCollateralIx);
+        instructions.push(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
+            instructions.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
+        const txParams = { ...this.txParams, computeUnits: 600000 };
+        const tx = await this.buildTransaction(instructions, txParams);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
@@ -1349,8 +1367,7 @@ class DriftClient {
      * @param bracketOrdersParams
      * @returns
      */
-    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, useVersionedTx = true) {
-        var _a, _b;
+    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const bracketOrderIxs = [];
@@ -1363,11 +1380,8 @@ class DriftClient {
             orderId,
             marketIndex,
         }, makerInfo, referrerInfo);
-        const walletSupportsVersionedTxns = 
-        //@ts-ignore
-        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
         // use versioned transactions if there is a lookup table account and wallet is compatible
-        if (walletSupportsVersionedTxns && useVersionedTx) {
+        if (this.txVersion === 0) {
             const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
             const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
             const [signedVersionedMarketOrderTx, signedVersionedFillTx] = await this.provider.wallet.signAllTransactions([
@@ -3238,12 +3252,11 @@ class DriftClient {
         return undefined;
     }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
-        // @ts-ignore
-        if (!tx.message) {
-            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+        if (tx instanceof web3_js_1.VersionedTransaction) {
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
         }
         else {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
+            return this.txSender.send(tx, additionalSigners, opts, preSigned);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {

package/lib/factory/bigNum.d.ts

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

package/lib/jupiter/jupiterClient.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { AddressLookupTableAccount, Connection, PublicKey, TransactionInstruction, TransactionMessage, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '@coral-xyz/anchor';
 export type SwapMode = 'ExactIn' | 'ExactOut';

package/lib/marinade/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { AnchorProvider, BN, Program } from '@coral-xyz/anchor';
 import { MarinadeFinance } from './types';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';

package/lib/math/amm.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { AMM, PositionDirection, SwapDirection, PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';
@@ -86,7 +87,7 @@ export declare function getSwapDirection(inputAssetType: AssetType, positionDire
  * @param market
  * @returns cost : Precision PRICE_PRECISION
  */
-export declare function calculateTerminalPrice(market: PerpMarketAccount): any;
+export declare function calculateTerminalPrice(market: PerpMarketAccount): BN;
 export declare function calculateMaxBaseAssetAmountToTrade(amm: AMM, limit_price: BN, direction: PositionDirection, oraclePriceData?: OraclePriceData, now?: BN): [BN, PositionDirection];
 export declare function calculateQuoteAssetAmountSwapped(quoteAssetReserves: BN, pegMultiplier: BN, swapDirection: SwapDirection): BN;
 export declare function calculateMaxBaseAssetAmountFillable(amm: AMM, orderDirection: PositionDirection): BN;

package/lib/math/auction.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { Order, PositionDirection } from '../types';
 import { BN } from '../.';
 export declare function isAuctionComplete(order: Order, slot: number): boolean;

package/lib/math/conversion.d.ts

@@ -1 +1,2 @@
-export declare const convertToNumber: (bigNumber: BN, precision?: BN) => any;
+import { BN } from '../';
+export declare const convertToNumber: (bigNumber: BN, precision?: BN) => number;

package/lib/math/funding.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '@coral-xyz/anchor';
 import { PerpMarketAccount } from '../types';
 import { OraclePriceData } from '../oracles/types';

package/lib/math/funding.js

@@ -72,7 +72,8 @@ async function calculateAllEstimatedFundingRate(market, oraclePriceData, markPri
     // 	console.log('shrink orac:', liveOracleTwap.toString(), '->', oracleTwap.toString());
     // }
     const twapSpread = markTwap.sub(oracleTwap);
-    const twapSpreadPct = twapSpread
+    const twapSpreadWithOffset = twapSpread.add(oracleTwap.abs().div(numericConstants_1.FUNDING_RATE_OFFSET_DENOMINATOR));
+    const twapSpreadPct = twapSpreadWithOffset
         .mul(numericConstants_1.PRICE_PRECISION)
         .mul(new anchor_1.BN(100))
         .div(oracleTwap);

package/lib/math/insurance.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="bn.js" />
 import { BN } from '../index';
 export declare function stakeAmountToShares(amount: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;
 export declare function unstakeSharesToAmount(nShares: BN, totalIfShares: BN, insuranceFundVaultBalance: BN): BN;