@drift-labs/sdk 2.131.0-beta.9 → 2.131.0

package/VERSION

@@ -1 +1 @@
-2.131.0-beta.9
+2.131.0-beta.13

package/lib/browser/driftClient.d.ts

@@ -427,8 +427,25 @@ export declare class DriftClient {
     getCancelOrderIx(orderId?: number, subAccountId?: number): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number, subAccountId?: number): Promise<TransactionInstruction>;
-    cancelOrdersByIds(orderIds?: number[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getCancelOrdersByIdsIx(orderIds?: number[], subAccountId?: number): Promise<TransactionInstruction>;
+    /**
+     * Sends a transaction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param txParams - The transaction parameters.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction signature.
+     */
+    cancelOrdersByIds(orderIds?: number[], txParams?: TxParams, subAccountId?: number, user?: User): Promise<TransactionSignature>;
+    /**
+     * Returns the transaction instruction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction instruction to cancel the orders.
+     */
+    getCancelOrdersByIdsIx(orderIds?: number[], subAccountId?: number, user?: User): Promise<TransactionInstruction>;
     cancelOrders(marketType?: MarketType, marketIndex?: number, direction?: PositionDirection, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null, subAccountId?: number): Promise<TransactionInstruction>;
     cancelAndPlaceOrders(cancelOrderParams: {
@@ -659,6 +676,12 @@ export declare class DriftClient {
         maxTs?: BN;
         policy?: number;
     }, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    /**
+     * @param orderParams: The parameters for the order to modify.
+     * @param subAccountId: Optional - The subaccount ID of the user to modify the order for.
+     * @param userPublicKey: Optional - The public key of the user to modify the order for. This takes precedence over subAccountId.
+     * @returns
+     */
     getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }: {
         orderId: number;
         newDirection?: PositionDirection;
@@ -675,7 +698,7 @@ export declare class DriftClient {
         bitFlags?: number;
         maxTs?: BN;
         policy?: number;
-    }, subAccountId?: number): Promise<TransactionInstruction>;
+    }, subAccountId?: number, userPublicKey?: PublicKey): Promise<TransactionInstruction>;
     /**
      * Modifies an open order by closing it and replacing it with a new order.
      * @param orderParams.userOrderId: The open order to modify

package/lib/browser/driftClient.js

@@ -2273,20 +2273,39 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async cancelOrdersByIds(orderIds, txParams, subAccountId) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrdersByIdsIx(orderIds, subAccountId), txParams), [], this.opts);
+    /**
+     * Sends a transaction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param txParams - The transaction parameters.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction signature.
+     */
+    async cancelOrdersByIds(orderIds, txParams, subAccountId, user) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrdersByIdsIx(orderIds, subAccountId, user), txParams), [], this.opts);
         return txSig;
     }
-    async getCancelOrdersByIdsIx(orderIds, subAccountId) {
-        const user = await this.getUserAccountPublicKey(subAccountId);
+    /**
+     * Returns the transaction instruction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction instruction to cancel the orders.
+     */
+    async getCancelOrdersByIdsIx(orderIds, subAccountId, user) {
+        var _a, _b;
+        const userAccountPubKey = (_a = user === null || user === void 0 ? void 0 : user.userAccountPublicKey) !== null && _a !== void 0 ? _a : (await this.getUserAccountPublicKey(subAccountId));
+        const userAccount = (_b = user === null || user === void 0 ? void 0 : user.getUserAccount()) !== null && _b !== void 0 ? _b : this.getUserAccount(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount(subAccountId)],
+            userAccounts: [userAccount],
             useMarketLastSlotCache: true,
         });
         return await this.program.instruction.cancelOrdersByIds(orderIds, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                user,
+                user: userAccountPubKey,
                 authority: this.wallet.publicKey,
             },
             remainingAccounts,
@@ -3698,8 +3717,14 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getModifyOrderIx(orderParams, subAccountId), txParams), [], this.opts);
         return txSig;
     }
-    async getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId) {
-        const user = await this.getUserAccountPublicKey(subAccountId);
+    /**
+     * @param orderParams: The parameters for the order to modify.
+     * @param subAccountId: Optional - The subaccount ID of the user to modify the order for.
+     * @param userPublicKey: Optional - The public key of the user to modify the order for. This takes precedence over subAccountId.
+     * @returns
+     */
+    async getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId, userPublicKey) {
+        const user = userPublicKey !== null && userPublicKey !== void 0 ? userPublicKey : (await this.getUserAccountPublicKey(subAccountId));
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount(subAccountId)],
             useMarketLastSlotCache: true,
@@ -5146,7 +5171,7 @@ class DriftClient {
                 userAccounts: [userAccount],
             })
             : undefined;
-        const ix = await this.program.instruction.disableUserHighLeverageMode({
+        const ix = await this.program.instruction.disableUserHighLeverageMode(false, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user,

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.130.0",
+    "version": "2.131.0",
     "name": "drift",
     "instructions": [
         {

package/lib/browser/math/margin.d.ts

@@ -17,7 +17,7 @@ export declare function calculateOraclePriceForPerpMargin(perpPosition: PerpPosi
  * @param oraclePriceData
  * @param includeOpenOrders
  */
-export declare function calculateBaseAssetValueWithOracle(market: PerpMarketAccount, perpPosition: PerpPosition, oraclePriceData: OraclePriceData, includeOpenOrders?: boolean): BN;
+export declare function calculateBaseAssetValueWithOracle(market: PerpMarketAccount, perpPosition: PerpPosition, oraclePriceData: Pick<OraclePriceData, 'price'>, includeOpenOrders?: boolean): BN;
 export declare function calculateWorstCaseBaseAssetAmount(perpPosition: PerpPosition, perpMarket: PerpMarketAccount, oraclePrice: BN): BN;
 export declare function calculateWorstCasePerpLiabilityValue(perpPosition: PerpPosition, perpMarket: PerpMarketAccount, oraclePrice: BN): {
     worstCaseBaseAssetAmount: BN;

package/lib/browser/orderSubscriber/WebsocketSubscription.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketSubscription = void 0;
 const memcmp_1 = require("../memcmp");
-const webSocketProgramAccountSubscriberV2_1 = require("../accounts/webSocketProgramAccountSubscriberV2");
+const webSocketProgramAccountSubscriber_1 = require("../accounts/webSocketProgramAccountSubscriber");
 class WebsocketSubscription {
     constructor({ orderSubscriber, commitment, skipInitialLoad = false, resubOpts, resyncIntervalMs, decoded = true, }) {
         this.orderSubscriber = orderSubscriber;
@@ -16,7 +16,7 @@ class WebsocketSubscription {
         if (this.subscriber) {
             return;
         }
-        this.subscriber = new webSocketProgramAccountSubscriberV2_1.WebSocketProgramAccountSubscriberV2('OrderSubscriber', 'User', this.orderSubscriber.driftClient.program, this.orderSubscriber.decodeFn, {
+        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.resubOpts);

package/lib/browser/user.d.ts

@@ -103,21 +103,21 @@ export declare class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN, enterHighLeverageMode?: boolean): BN;
-    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN, enterHighLeverageMode?: boolean): BN;
+    getPerpBuyingPower(marketIndex: number, collateralBuffer?: BN, enterHighLeverageMode?: any): BN;
+    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex: number, freeCollateral: BN, baseAssetAmount: BN, enterHighLeverageMode?: any): BN;
     /**
      * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral(marginCategory?: MarginCategory, enterHighLeverageMode?: boolean): BN;
+    getFreeCollateral(marginCategory?: MarginCategory, enterHighLeverageMode?: any): BN;
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
-    getMarginRequirement(marginCategory: MarginCategory, liquidationBuffer?: BN, strict?: boolean, includeOpenOrders?: boolean, enteringHighLeverage?: boolean): BN;
+    getMarginRequirement(marginCategory: MarginCategory, liquidationBuffer?: BN, strict?: boolean, includeOpenOrders?: boolean, enteringHighLeverage?: any): BN;
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
      */
-    getInitialMarginRequirement(enterHighLeverageMode?: boolean): BN;
+    getInitialMarginRequirement(enterHighLeverageMode?: any): BN;
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
      */
@@ -167,7 +167,7 @@ export declare class User {
      * @returns : number (value from [0, 100])
      */
     getHealth(): number;
-    calculateWeightedPerpPositionLiability(perpPosition: PerpPosition, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, enteringHighLeverage?: boolean): BN;
+    calculateWeightedPerpPositionLiability(perpPosition: PerpPosition, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, enteringHighLeverage?: any): BN;
     /**
      * calculates position value of a single perp market in margin system
      * @returns : Precision QUOTE_PRECISION
@@ -177,12 +177,12 @@ export declare class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionLiability(marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, enteringHighLeverage?: boolean): BN;
+    getTotalPerpPositionLiability(marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, enteringHighLeverage?: any): BN;
     /**
      * calculates position value based on oracle
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpPositionValue(marketIndex: number, oraclePriceData: OraclePriceData, includeOpenOrders?: boolean): BN;
+    getPerpPositionValue(marketIndex: number, oraclePriceData: Pick<OraclePriceData, 'price'>, includeOpenOrders?: boolean): BN;
     /**
      * calculates position liabiltiy value in margin system
      * @returns : Precision QUOTE_PRECISION
@@ -230,7 +230,7 @@ export declare class User {
      * @param enterHighLeverageMode can pass this as true to calculate max leverage if the user was to enter high leverage mode
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverageForPerp(perpMarketIndex: number, _marginCategory?: MarginCategory, isLp?: boolean, enterHighLeverageMode?: boolean): BN;
+    getMaxLeverageForPerp(perpMarketIndex: number, _marginCategory?: MarginCategory, isLp?: boolean, enterHighLeverageMode?: any): BN;
     /**
      * calculates max allowable leverage exceeding hitting requirement category
      * @param spotMarketIndex
@@ -273,9 +273,9 @@ export declare class User {
      * @param offsetCollateral // allows calculating the liquidation price after this offset collateral is added to the user's account (e.g. : what will the liquidation price be for this position AFTER I deposit $x worth of collateral)
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean, offsetCollateral?: BN, enteringHighLeverage?: boolean): BN;
-    calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN, includeOpenOrders: boolean, enteringHighLeverage?: boolean, marginCategory?: MarginCategory): BN;
-    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, oraclePrice: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean, enteringHighLeverage?: boolean): BN | undefined;
+    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean, offsetCollateral?: BN, enteringHighLeverage?: any): BN;
+    calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN, includeOpenOrders: boolean, enteringHighLeverage?: any, marginCategory?: MarginCategory): BN;
+    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, oraclePrice: BN, marginCategory?: MarginCategory, includeOpenOrders?: boolean, enteringHighLeverage?: any): BN | undefined;
     calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN, marginCategory?: MarginCategory): BN;
     /**
      * Calculates the estimated liquidation price for a position after closing a quote amount of the position.
@@ -295,7 +295,7 @@ export declare class User {
      * @param isLp
      * @returns { tradeSize: BN, oppositeSideTradeSize: BN} : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDCForPerp(targetMarketIndex: number, tradeSide: PositionDirection, isLp?: boolean, enterHighLeverageMode?: boolean): {
+    getMaxTradeSizeUSDCForPerp(targetMarketIndex: number, tradeSide: PositionDirection, isLp?: boolean, enterHighLeverageMode?: any): {
         tradeSize: BN;
         oppositeSideTradeSize: BN;
     };

package/lib/browser/user.js

@@ -426,7 +426,7 @@ class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = false) {
+    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = undefined) {
         const perpPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0];
         const perpMarket = this.driftClient.getPerpMarketAccount(marketIndex);
         const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
@@ -436,7 +436,7 @@ class User {
         const freeCollateral = this.getFreeCollateral('Initial', enterHighLeverageMode).sub(collateralBuffer);
         return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount, enterHighLeverageMode);
     }
-    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, enterHighLeverageMode = false) {
+    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, enterHighLeverageMode = undefined) {
         const marginRatio = (0, market_1.calculateMarketMarginRatio)(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial', this.getUserAccount().maxMarginRatio, enterHighLeverageMode || this.isHighLeverageMode('Initial'));
         return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new anchor_1.BN(marginRatio));
     }
@@ -444,7 +444,7 @@ class User {
      * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral(marginCategory = 'Initial', enterHighLeverageMode = false) {
+    getFreeCollateral(marginCategory = 'Initial', enterHighLeverageMode = undefined) {
         const totalCollateral = this.getTotalCollateral(marginCategory, true);
         const marginRequirement = marginCategory === 'Initial'
             ? this.getInitialMarginRequirement(enterHighLeverageMode)
@@ -455,13 +455,13 @@ class User {
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
-    getMarginRequirement(marginCategory, liquidationBuffer, strict = false, includeOpenOrders = true, enteringHighLeverage = false) {
+    getMarginRequirement(marginCategory, liquidationBuffer, strict = false, includeOpenOrders = true, enteringHighLeverage = undefined) {
         return this.getTotalPerpPositionLiability(marginCategory, liquidationBuffer, includeOpenOrders, strict, enteringHighLeverage).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, includeOpenOrders, strict));
     }
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
      */
-    getInitialMarginRequirement(enterHighLeverageMode = false) {
+    getInitialMarginRequirement(enterHighLeverageMode = undefined) {
         return this.getMarginRequirement('Initial', undefined, true, undefined, enterHighLeverageMode);
     }
     /**
@@ -749,7 +749,7 @@ class User {
         }
         return health;
     }
-    calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = false) {
+    calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = undefined) {
         const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
         if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
             // is an lp, clone so we dont mutate the position
@@ -771,7 +771,11 @@ class User {
             liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, valuationPrice, (0, types_1.isVariant)(market.contractType, 'prediction'));
         }
         if (marginCategory) {
-            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio, this.isHighLeverageMode(marginCategory) || enteringHighLeverage));
+            const userCustomMargin = this.getUserAccount().maxMarginRatio;
+            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
+                ? Math.max(market.marginRatioInitial, userCustomMargin)
+                : userCustomMargin, this.isHighLeverageMode(marginCategory) ||
+                enteringHighLeverage === true));
             if (liquidationBuffer !== undefined) {
                 marginRatio = marginRatio.add(liquidationBuffer);
             }
@@ -817,7 +821,7 @@ class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionLiability(marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = false) {
+    getTotalPerpPositionLiability(marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = undefined) {
         return this.getActivePerpPositions().reduce((totalPerpValue, perpPosition) => {
             const baseAssetValue = this.calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict, enteringHighLeverage);
             return totalPerpValue.add(baseAssetValue);
@@ -984,7 +988,7 @@ class User {
      * @param enterHighLeverageMode can pass this as true to calculate max leverage if the user was to enter high leverage mode
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverageForPerp(perpMarketIndex, _marginCategory = 'Initial', isLp = false, enterHighLeverageMode = false) {
+    getMaxLeverageForPerp(perpMarketIndex, _marginCategory = 'Initial', isLp = false, enterHighLeverageMode = undefined) {
         const market = this.driftClient.getPerpMarketAccount(perpMarketIndex);
         const marketPrice = this.driftClient.getOracleDataForPerpMarket(perpMarketIndex).price;
         const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
@@ -1166,7 +1170,7 @@ class User {
      * @param offsetCollateral // allows calculating the liquidation price after this offset collateral is added to the user's account (e.g. : what will the liquidation price be for this position AFTER I deposit $x worth of collateral)
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, enteringHighLeverage = false) {
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, enteringHighLeverage = undefined) {
         const totalCollateral = this.getTotalCollateral(marginCategory, false, includeOpenOrders);
         const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders, enteringHighLeverage);
         let freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
@@ -1211,7 +1215,7 @@ class User {
         }
         return liqPrice;
     }
-    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage = false, marginCategory = 'Maintenance') {
+    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage = undefined, marginCategory = 'Maintenance') {
         let freeCollateralChange = numericConstants_1.ZERO;
         // update free collateral to account for change in pnl from new position
         if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) &&
@@ -1248,7 +1252,10 @@ class User {
                 baseAssetAmount = perpPosition.baseAssetAmount;
                 liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, oraclePrice, (0, types_1.isVariant)(market.contractType, 'prediction'));
             }
-            const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio, this.isHighLeverageMode(marginCategory) || enteringHighLeverage);
+            const userCustomMargin = this.getUserAccount().maxMarginRatio;
+            const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
+                ? Math.max(market.marginRatioInitial, userCustomMargin)
+                : userCustomMargin, this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true);
             return liabilityValue.mul(new anchor_1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION);
         };
         const freeCollateralConsumptionBefore = calculateMarginRequirement(perpPosition);
@@ -1257,14 +1264,17 @@ class User {
         const freeCollateralConsumptionAfter = calculateMarginRequirement(perpPositionAfter);
         return freeCollateralChange.sub(freeCollateralConsumptionAfter.sub(freeCollateralConsumptionBefore));
     }
-    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, oraclePrice, marginCategory = 'Maintenance', includeOpenOrders = false, enteringHighLeverage = false) {
+    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, oraclePrice, marginCategory = 'Maintenance', includeOpenOrders = false, enteringHighLeverage = undefined) {
         const baseAssetAmount = includeOpenOrders
             ? (0, margin_2.calculateWorstCaseBaseAssetAmount)(perpPosition, market, oraclePrice)
             : perpPosition.baseAssetAmount;
         // zero if include orders == false
         const orderBaseAssetAmount = baseAssetAmount.sub(perpPosition.baseAssetAmount);
         const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
-        const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio, this.isHighLeverageMode(marginCategory) || enteringHighLeverage);
+        const userCustomMargin = this.getUserAccount().maxMarginRatio;
+        const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
+            ? Math.max(market.marginRatioInitial, userCustomMargin)
+            : userCustomMargin, this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true);
         const marginRatioQuotePrecision = new anchor_1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
@@ -1353,7 +1363,7 @@ class User {
      * @param isLp
      * @returns { tradeSize: BN, oppositeSideTradeSize: BN} : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = false) {
+    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = undefined) {
         let tradeSize = numericConstants_1.ZERO;
         let oppositeSideTradeSize = numericConstants_1.ZERO;
         const currentPosition = this.getPerpPositionWithLPSettle(targetMarketIndex, undefined, true)[0] ||
@@ -1772,7 +1782,7 @@ class User {
     }
     getUserFeeTier(marketType, now) {
         const state = this.driftClient.getStateAccount();
-        let feeTierIndex = 0;
+        const feeTierIndex = 0;
         if ((0, types_1.isVariant)(marketType, 'perp')) {
             if (this.isHighLeverageMode('Initial')) {
                 return state.perpFeeStructure.feeTiers[0];
@@ -1782,28 +1792,43 @@ class User {
                 .getAccount();
             const total30dVolume = (0, trade_1.getUser30dRollingVolumeEstimate)(userStatsAccount, now);
             const stakedGovAssetAmount = userStatsAccount.ifStakedGovTokenAmount;
-            const volumeTiers = [
-                new anchor_1.BN(100000000).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(50000000).mul(numericConstants_1.QUOTE_PRECISION),
+            const volumeThresholds = [
+                new anchor_1.BN(2000000).mul(numericConstants_1.QUOTE_PRECISION),
                 new anchor_1.BN(10000000).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(5000000).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(1000000).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(20000000).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(100000000).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(200000000).mul(numericConstants_1.QUOTE_PRECISION),
             ];
-            const stakedTiers = [
-                new anchor_1.BN(120000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(100000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(25000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
-                new anchor_1.BN(10000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
+            const stakeThresholds = [
                 new anchor_1.BN(1000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(10000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(50000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(100000 - 1).mul(numericConstants_1.QUOTE_PRECISION),
+                new anchor_1.BN(250000 - 5).mul(numericConstants_1.QUOTE_PRECISION),
             ];
-            for (let i = 0; i < volumeTiers.length; i++) {
-                if (total30dVolume.gte(volumeTiers[i]) ||
-                    stakedGovAssetAmount.gte(stakedTiers[i])) {
-                    feeTierIndex = 5 - i;
+            const stakeBenefitFrac = [0, 5, 10, 20, 30, 40];
+            let feeTierIndex = 5;
+            for (let i = 0; i < volumeThresholds.length; i++) {
+                if (total30dVolume.lt(volumeThresholds[i])) {
+                    feeTierIndex = i;
                     break;
                 }
             }
-            return state.perpFeeStructure.feeTiers[feeTierIndex];
+            let stakeBenefitIndex = 5;
+            for (let i = 0; i < stakeThresholds.length; i++) {
+                if (stakedGovAssetAmount.lt(stakeThresholds[i])) {
+                    stakeBenefitIndex = i;
+                    break;
+                }
+            }
+            const stakeBenefit = stakeBenefitFrac[stakeBenefitIndex];
+            const tier = { ...state.perpFeeStructure.feeTiers[feeTierIndex] };
+            if (stakeBenefit > 0) {
+                tier.feeNumerator = (tier.feeNumerator * (100 - stakeBenefit)) / 100;
+                tier.makerRebateNumerator =
+                    (tier.makerRebateNumerator * (100 + stakeBenefit)) / 100;
+            }
+            return tier;
         }
         return state.spotFeeStructure.feeTiers[feeTierIndex];
     }

package/lib/node/driftClient.d.ts

@@ -427,8 +427,25 @@ export declare class DriftClient {
     getCancelOrderIx(orderId?: number, subAccountId?: number): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number, subAccountId?: number): Promise<TransactionInstruction>;
-    cancelOrdersByIds(orderIds?: number[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getCancelOrdersByIdsIx(orderIds?: number[], subAccountId?: number): Promise<TransactionInstruction>;
+    /**
+     * Sends a transaction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param txParams - The transaction parameters.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction signature.
+     */
+    cancelOrdersByIds(orderIds?: number[], txParams?: TxParams, subAccountId?: number, user?: User): Promise<TransactionSignature>;
+    /**
+     * Returns the transaction instruction to cancel the provided order ids.
+     *
+     * @param orderIds - The order ids to cancel.
+     * @param subAccountId - The sub account id to cancel the orders for.
+     * @param user - The user to cancel the orders for. If provided, it will be prioritized over the subAccountId.
+     * @returns The transaction instruction to cancel the orders.
+     */
+    getCancelOrdersByIdsIx(orderIds?: number[], subAccountId?: number, user?: User): Promise<TransactionInstruction>;
     cancelOrders(marketType?: MarketType, marketIndex?: number, direction?: PositionDirection, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getCancelOrdersIx(marketType: MarketType | null, marketIndex: number | null, direction: PositionDirection | null, subAccountId?: number): Promise<TransactionInstruction>;
     cancelAndPlaceOrders(cancelOrderParams: {
@@ -659,6 +676,12 @@ export declare class DriftClient {
         maxTs?: BN;
         policy?: number;
     }, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    /**
+     * @param orderParams: The parameters for the order to modify.
+     * @param subAccountId: Optional - The subaccount ID of the user to modify the order for.
+     * @param userPublicKey: Optional - The public key of the user to modify the order for. This takes precedence over subAccountId.
+     * @returns
+     */
     getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }: {
         orderId: number;
         newDirection?: PositionDirection;
@@ -675,7 +698,7 @@ export declare class DriftClient {
         bitFlags?: number;
         maxTs?: BN;
         policy?: number;
-    }, subAccountId?: number): Promise<TransactionInstruction>;
+    }, subAccountId?: number, userPublicKey?: PublicKey): Promise<TransactionInstruction>;
     /**
      * Modifies an open order by closing it and replacing it with a new order.
      * @param orderParams.userOrderId: The open order to modify