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

package/lib/node/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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.131.0-beta.9",
+	"version": "2.131.0",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/driftClient.ts

@@ -4357,14 +4357,24 @@ export class DriftClient {
 		});
 	}
 
+	/**
+	 * 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.
+	 */
 	public async cancelOrdersByIds(
 		orderIds?: number[],
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		user?: User
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(
-				await this.getCancelOrdersByIdsIx(orderIds, subAccountId),
+				await this.getCancelOrdersByIdsIx(orderIds, subAccountId, user),
 				txParams
 			),
 			[],
@@ -4373,21 +4383,34 @@ export class DriftClient {
 		return txSig;
 	}
 
+	/**
+	 * 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.
+	 */
 	public async getCancelOrdersByIdsIx(
 		orderIds?: number[],
-		subAccountId?: number
+		subAccountId?: number,
+		user?: User
 	): Promise<TransactionInstruction> {
-		const user = await this.getUserAccountPublicKey(subAccountId);
+		const userAccountPubKey =
+			user?.userAccountPublicKey ??
+			(await this.getUserAccountPublicKey(subAccountId));
+		const userAccount =
+			user?.getUserAccount() ?? 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,
@@ -6969,6 +6992,12 @@ export class DriftClient {
 		return txSig;
 	}
 
+	/**
+	 * @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
+	 */
 	public async getModifyOrderIx(
 		{
 			orderId,
@@ -7003,9 +7032,11 @@ export class DriftClient {
 			maxTs?: BN;
 			policy?: number;
 		},
-		subAccountId?: number
+		subAccountId?: number,
+		userPublicKey?: PublicKey
 	): Promise<TransactionInstruction> {
-		const user = await this.getUserAccountPublicKey(subAccountId);
+		const user =
+			userPublicKey ?? (await this.getUserAccountPublicKey(subAccountId));
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount(subAccountId)],
@@ -9854,17 +9885,20 @@ export class DriftClient {
 			  })
 			: undefined;
 
-		const ix = await this.program.instruction.disableUserHighLeverageMode({
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				authority: this.wallet.publicKey,
-				highLeverageModeConfig: getHighLeverageModeConfigPublicKey(
-					this.program.programId
-				),
-			},
-			remainingAccounts,
-		});
+		const ix = await this.program.instruction.disableUserHighLeverageMode(
+			false,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					user,
+					authority: this.wallet.publicKey,
+					highLeverageModeConfig: getHighLeverageModeConfigPublicKey(
+						this.program.programId
+					),
+				},
+				remainingAccounts,
+			}
+		);
 
 		return ix;
 	}

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.130.0",
+  "version": "2.131.0",
   "name": "drift",
   "instructions": [
     {
@@ -16077,4 +16077,4 @@
   "metadata": {
     "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH"
   }
-}
+}

package/src/math/margin.ts

@@ -126,7 +126,7 @@ export function calculateOraclePriceForPerpMargin(
 export function calculateBaseAssetValueWithOracle(
 	market: PerpMarketAccount,
 	perpPosition: PerpPosition,
-	oraclePriceData: OraclePriceData,
+	oraclePriceData: Pick<OraclePriceData, 'price'>,
 	includeOpenOrders = false
 ): BN {
 	let price = oraclePriceData.price;

package/src/orderSubscriber/WebsocketSubscription.ts

@@ -3,7 +3,7 @@ import { getNonIdleUserFilter, getUserFilter } from '../memcmp';
 import { UserAccount } from '../types';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';
-import { WebSocketProgramAccountSubscriberV2 } from '../accounts/webSocketProgramAccountSubscriberV2';
+import { WebSocketProgramAccountSubscriber } from '../accounts/webSocketProgramAccountSubscriber';
 
 export class WebsocketSubscription {
 	private orderSubscriber: OrderSubscriber;
@@ -12,7 +12,7 @@ export class WebsocketSubscription {
 	private resubOpts?: ResubOpts;
 	private resyncIntervalMs?: number;
 
-	private subscriber?: WebSocketProgramAccountSubscriberV2<UserAccount>;
+	private subscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
 	private resyncTimeoutId?: ReturnType<typeof setTimeout>;
 
 	private decoded?: boolean;
@@ -45,7 +45,7 @@ export class WebsocketSubscription {
 			return;
 		}
 
-		this.subscriber = new WebSocketProgramAccountSubscriberV2<UserAccount>(
+		this.subscriber = new WebSocketProgramAccountSubscriber<UserAccount>(
 			'OrderSubscriber',
 			'User',
 			this.orderSubscriber.driftClient.program,

package/src/user.ts

@@ -662,7 +662,7 @@ export class User {
 	public getPerpBuyingPower(
 		marketIndex: number,
 		collateralBuffer = ZERO,
-		enterHighLeverageMode = false
+		enterHighLeverageMode = undefined
 	): BN {
 		const perpPosition = this.getPerpPositionWithLPSettle(
 			marketIndex,
@@ -697,7 +697,7 @@ export class User {
 		marketIndex: number,
 		freeCollateral: BN,
 		baseAssetAmount: BN,
-		enterHighLeverageMode = false
+		enterHighLeverageMode = undefined
 	): BN {
 		const marginRatio = calculateMarketMarginRatio(
 			this.driftClient.getPerpMarketAccount(marketIndex),
@@ -716,7 +716,7 @@ export class User {
 	 */
 	public getFreeCollateral(
 		marginCategory: MarginCategory = 'Initial',
-		enterHighLeverageMode = false
+		enterHighLeverageMode = undefined
 	): BN {
 		const totalCollateral = this.getTotalCollateral(marginCategory, true);
 		const marginRequirement =
@@ -735,7 +735,7 @@ export class User {
 		liquidationBuffer?: BN,
 		strict = false,
 		includeOpenOrders = true,
-		enteringHighLeverage = false
+		enteringHighLeverage = undefined
 	): BN {
 		return this.getTotalPerpPositionLiability(
 			marginCategory,
@@ -757,7 +757,7 @@ export class User {
 	/**
 	 * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
 	 */
-	public getInitialMarginRequirement(enterHighLeverageMode = false): BN {
+	public getInitialMarginRequirement(enterHighLeverageMode = undefined): BN {
 		return this.getMarginRequirement(
 			'Initial',
 			undefined,
@@ -1432,7 +1432,7 @@ export class User {
 		liquidationBuffer?: BN,
 		includeOpenOrders?: boolean,
 		strict = false,
-		enteringHighLeverage = false
+		enteringHighLeverage = undefined
 	): BN {
 		const market = this.driftClient.getPerpMarketAccount(
 			perpPosition.marketIndex
@@ -1476,13 +1476,17 @@ export class User {
 		}
 
 		if (marginCategory) {
+			const userCustomMargin = this.getUserAccount().maxMarginRatio;
 			let marginRatio = new BN(
 				calculateMarketMarginRatio(
 					market,
 					baseAssetAmount.abs(),
 					marginCategory,
-					this.getUserAccount().maxMarginRatio,
-					this.isHighLeverageMode(marginCategory) || enteringHighLeverage
+					enteringHighLeverage === false
+						? Math.max(market.marginRatioInitial, userCustomMargin)
+						: userCustomMargin,
+					this.isHighLeverageMode(marginCategory) ||
+						enteringHighLeverage === true
 				)
 			);
 
@@ -1570,7 +1574,7 @@ export class User {
 		liquidationBuffer?: BN,
 		includeOpenOrders?: boolean,
 		strict = false,
-		enteringHighLeverage = false
+		enteringHighLeverage = undefined
 	): BN {
 		return this.getActivePerpPositions().reduce(
 			(totalPerpValue, perpPosition) => {
@@ -1594,7 +1598,7 @@ export class User {
 	 */
 	public getPerpPositionValue(
 		marketIndex: number,
-		oraclePriceData: OraclePriceData,
+		oraclePriceData: Pick<OraclePriceData, 'price'>,
 		includeOpenOrders = false
 	): BN {
 		const userPosition =
@@ -1894,7 +1898,7 @@ export class User {
 		perpMarketIndex: number,
 		_marginCategory: MarginCategory = 'Initial',
 		isLp = false,
-		enterHighLeverageMode = false
+		enterHighLeverageMode = undefined
 	): BN {
 		const market = this.driftClient.getPerpMarketAccount(perpMarketIndex);
 		const marketPrice =
@@ -2245,7 +2249,7 @@ export class User {
 		marginCategory: MarginCategory = 'Maintenance',
 		includeOpenOrders = false,
 		offsetCollateral = ZERO,
-		enteringHighLeverage = false
+		enteringHighLeverage = undefined
 	): BN {
 		const totalCollateral = this.getTotalCollateral(
 			marginCategory,
@@ -2370,7 +2374,7 @@ export class User {
 		positionBaseSizeChange: BN,
 		estimatedEntryPrice: BN,
 		includeOpenOrders: boolean,
-		enteringHighLeverage = false,
+		enteringHighLeverage = undefined,
 		marginCategory: MarginCategory = 'Maintenance'
 	): BN {
 		let freeCollateralChange = ZERO;
@@ -2423,12 +2427,15 @@ export class User {
 				);
 			}
 
+			const userCustomMargin = this.getUserAccount().maxMarginRatio;
 			const marginRatio = calculateMarketMarginRatio(
 				market,
 				baseAssetAmount.abs(),
 				marginCategory,
-				this.getUserAccount().maxMarginRatio,
-				this.isHighLeverageMode(marginCategory) || enteringHighLeverage
+				enteringHighLeverage === false
+					? Math.max(market.marginRatioInitial, userCustomMargin)
+					: userCustomMargin,
+				this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true
 			);
 
 			return liabilityValue.mul(new BN(marginRatio)).div(MARGIN_PRECISION);
@@ -2457,7 +2464,7 @@ export class User {
 		oraclePrice: BN,
 		marginCategory: MarginCategory = 'Maintenance',
 		includeOpenOrders = false,
-		enteringHighLeverage = false
+		enteringHighLeverage = undefined
 	): BN | undefined {
 		const baseAssetAmount = includeOpenOrders
 			? calculateWorstCaseBaseAssetAmount(perpPosition, market, oraclePrice)
@@ -2470,12 +2477,16 @@ export class User {
 
 		const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
 
+		const userCustomMargin = this.getUserAccount().maxMarginRatio;
+
 		const marginRatio = calculateMarketMarginRatio(
 			market,
 			proposedBaseAssetAmount.abs(),
 			marginCategory,
-			this.getUserAccount().maxMarginRatio,
-			this.isHighLeverageMode(marginCategory) || enteringHighLeverage
+			enteringHighLeverage === false
+				? Math.max(market.marginRatioInitial, userCustomMargin)
+				: userCustomMargin,
+			this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true
 		);
 
 		const marginRatioQuotePrecision = new BN(marginRatio)
@@ -2631,7 +2642,7 @@ export class User {
 		targetMarketIndex: number,
 		tradeSide: PositionDirection,
 		isLp = false,
-		enterHighLeverageMode = false
+		enterHighLeverageMode = undefined
 	): { tradeSize: BN; oppositeSideTradeSize: BN } {
 		let tradeSize = ZERO;
 		let oppositeSideTradeSize = ZERO;
@@ -3484,7 +3495,7 @@ export class User {
 	public getUserFeeTier(marketType: MarketType, now?: BN) {
 		const state = this.driftClient.getStateAccount();
 
-		let feeTierIndex = 0;
+		const feeTierIndex = 0;
 		if (isVariant(marketType, 'perp')) {
 			if (this.isHighLeverageMode('Initial')) {
 				return state.perpFeeStructure.feeTiers[0];
@@ -3498,34 +3509,52 @@ export class User {
 				userStatsAccount,
 				now
 			);
-
 			const stakedGovAssetAmount = userStatsAccount.ifStakedGovTokenAmount;
-			const volumeTiers = [
-				new BN(100_000_000).mul(QUOTE_PRECISION),
-				new BN(50_000_000).mul(QUOTE_PRECISION),
+
+			const volumeThresholds = [
+				new BN(2_000_000).mul(QUOTE_PRECISION),
 				new BN(10_000_000).mul(QUOTE_PRECISION),
-				new BN(5_000_000).mul(QUOTE_PRECISION),
-				new BN(1_000_000).mul(QUOTE_PRECISION),
+				new BN(20_000_000).mul(QUOTE_PRECISION),
+				new BN(100_000_000).mul(QUOTE_PRECISION),
+				new BN(200_000_000).mul(QUOTE_PRECISION),
 			];
-			const stakedTiers = [
-				new BN(120000 - 1).mul(QUOTE_PRECISION),
-				new BN(100000 - 1).mul(QUOTE_PRECISION),
-				new BN(25000 - 1).mul(QUOTE_PRECISION),
-				new BN(10000 - 1).mul(QUOTE_PRECISION),
-				new BN(1000 - 1).mul(QUOTE_PRECISION),
+			const stakeThresholds = [
+				new BN(1_000 - 1).mul(QUOTE_PRECISION),
+				new BN(10_000 - 1).mul(QUOTE_PRECISION),
+				new BN(50_000 - 1).mul(QUOTE_PRECISION),
+				new BN(100_000 - 1).mul(QUOTE_PRECISION),
+				new BN(250_000 - 5).mul(QUOTE_PRECISION),
 			];
+			const stakeBenefitFrac = [0, 5, 10, 20, 30, 40];
 
-			for (let i = 0; i < volumeTiers.length; i++) {
-				if (
-					total30dVolume.gte(volumeTiers[i]) ||
-					stakedGovAssetAmount.gte(stakedTiers[i])
-				) {
-					feeTierIndex = 5 - i;
+			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];