@drift-labs/sdk 2.60.0-beta.9 → 2.61.0-beta.0

package/VERSION

@@ -1 +1 @@
-2.60.0-beta.9
+2.61.0-beta.0

package/lib/accounts/webSocketProgramAccountSubscriber.js

@@ -12,6 +12,9 @@ class WebSocketProgramAccountSubscriber {
         this.program = program;
         this.decodeBuffer = decodeBufferFn;
         this.resubTimeoutMs = resubTimeoutMs;
+        if (this.resubTimeoutMs < 1000) {
+            console.log('resubTimeoutMs should be at least 1000ms to avoid spamming resub');
+        }
         this.options = options;
         this.receivingData = false;
     }
@@ -33,6 +36,7 @@ class WebSocketProgramAccountSubscriber {
             }
         }, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : this.program.provider.opts.commitment, this.options.filters);
         if (this.resubTimeoutMs) {
+            this.receivingData = true;
             this.setTimeout();
         }
     }

package/lib/auctionSubscriber/auctionSubscriber.js

@@ -15,7 +15,7 @@ class AuctionSubscriber {
         if (!this.subscriber) {
             this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('AuctionSubscriber', 'User', this.driftClient.program, this.driftClient.program.account.user.coder.accounts.decode.bind(this.driftClient.program.account.user.coder.accounts), {
                 filters: [(0, memcmp_1.getUserFilter)(), (0, memcmp_1.getUserWithAuctionFilter)()],
-                commitment: this.driftClient.opts.commitment,
+                commitment: this.opts.commitment,
             }, this.resubTimeoutMs);
         }
         await this.subscriber.subscribe((accountId, data, context) => {

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.59.0",
+    "version": "2.60.0",
     "name": "drift",
     "instructions": [
         {
@@ -8364,6 +8364,9 @@
                     },
                     {
                         "name": "Borrow"
+                    },
+                    {
+                        "name": "RepayBorrow"
                     }
                 ]
             }
@@ -8463,6 +8466,9 @@
                     },
                     {
                         "name": "OrderFilledWithLPJit"
+                    },
+                    {
+                        "name": "DeriskLp"
                     }
                 ]
             }
@@ -8480,6 +8486,9 @@
                     },
                     {
                         "name": "SettleLiquidity"
+                    },
+                    {
+                        "name": "RemoveLiquidityDerisk"
                     }
                 ]
             }
@@ -8621,10 +8630,6 @@
                     {
                         "name": "Liquidation",
                         "fields": [
-                            {
-                                "name": "margin_buffer",
-                                "type": "u128"
-                            },
                             {
                                 "name": "market_to_track_margin_requirement",
                                 "type": {

package/lib/math/trade.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="bn.js" />
-import { PerpMarketAccount, PositionDirection, SpotMarketAccount } from '../types';
+import { PerpMarketAccount, PositionDirection, SpotMarketAccount, UserStatsAccount } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { AssetType } from './amm';
 import { OraclePriceData } from '../oracles/types';
@@ -114,3 +114,4 @@ export declare function calculateEstimatedEntryPriceWithL2(assetType: AssetType,
     baseFilled: BN;
     quoteFilled: BN;
 };
+export declare function getUser30dRollingVolumeEstimate(userStatsAccount: UserStatsAccount, now?: BN): BN;

package/lib/math/trade.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateEstimatedEntryPriceWithL2 = exports.calculateEstimatedSpotEntryPrice = exports.calculateEstimatedPerpEntryPrice = exports.calculateTargetPriceTrade = exports.calculateTradeAcquiredAmounts = exports.calculateTradeSlippage = void 0;
+exports.getUser30dRollingVolumeEstimate = exports.calculateEstimatedEntryPriceWithL2 = exports.calculateEstimatedSpotEntryPrice = exports.calculateEstimatedPerpEntryPrice = exports.calculateTargetPriceTrade = exports.calculateTradeAcquiredAmounts = exports.calculateTradeSlippage = void 0;
 const types_1 = require("../types");
 const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = require("../assert/assert");
@@ -621,3 +621,17 @@ function calculateEstimatedEntryPriceWithL2(assetType, amount, direction, basePr
     };
 }
 exports.calculateEstimatedEntryPriceWithL2 = calculateEstimatedEntryPriceWithL2;
+function getUser30dRollingVolumeEstimate(userStatsAccount, now) {
+    now = now || new anchor_1.BN(new Date().getTime() / 1000);
+    const sinceLastTaker = anchor_1.BN.max(now.sub(userStatsAccount.lastTakerVolume30DTs), numericConstants_1.ZERO);
+    const sinceLastMaker = anchor_1.BN.max(now.sub(userStatsAccount.lastMakerVolume30DTs), numericConstants_1.ZERO);
+    const thirtyDaysInSeconds = new anchor_1.BN(60 * 60 * 24 * 30);
+    const last30dVolume = userStatsAccount.takerVolume30D
+        .mul(anchor_1.BN.max(thirtyDaysInSeconds.sub(sinceLastTaker), numericConstants_1.ZERO))
+        .div(thirtyDaysInSeconds)
+        .add(userStatsAccount.makerVolume30D
+        .mul(anchor_1.BN.max(thirtyDaysInSeconds.sub(sinceLastMaker), numericConstants_1.ZERO))
+        .div(thirtyDaysInSeconds));
+    return last30dVolume;
+}
+exports.getUser30dRollingVolumeEstimate = getUser30dRollingVolumeEstimate;

package/lib/types.d.ts

@@ -252,6 +252,9 @@ export declare class OrderActionExplanation {
     static readonly REDUCE_ONLY_ORDER_INCREASED_POSITION: {
         reduceOnlyOrderIncreasedPosition: {};
     };
+    static readonly DERISK_LP: {
+        deriskLp: {};
+    };
 }
 export declare class OrderTriggerCondition {
     static readonly ABOVE: {
@@ -293,6 +296,9 @@ export declare class DepositExplanation {
     static readonly BORROW: {
         borrow: {};
     };
+    static readonly REPAY_BORROW: {
+        repayBorrow: {};
+    };
 }
 export declare class SettlePnlExplanation {
     static readonly NONE: {
@@ -447,6 +453,9 @@ export declare class LPAction {
     static readonly SETTLE_LIQUIDITY: {
         settleLiquidity: {};
     };
+    static readonly REMOVE_LIQUIDITY_DERISK: {
+        removeLiquidityDerisk: {};
+    };
 }
 export type FundingRateRecord = {
     ts: BN;

package/lib/types.js

@@ -175,6 +175,9 @@ OrderActionExplanation.ORDER_FILLED_WITH_PHOENIX = {
 OrderActionExplanation.REDUCE_ONLY_ORDER_INCREASED_POSITION = {
     reduceOnlyOrderIncreasedPosition: {},
 };
+OrderActionExplanation.DERISK_LP = {
+    deriskLp: {},
+};
 class OrderTriggerCondition {
 }
 exports.OrderTriggerCondition = OrderTriggerCondition;
@@ -198,6 +201,7 @@ exports.DepositExplanation = DepositExplanation;
 DepositExplanation.NONE = { none: {} };
 DepositExplanation.TRANSFER = { transfer: {} };
 DepositExplanation.BORROW = { borrow: {} };
+DepositExplanation.REPAY_BORROW = { repayBorrow: {} };
 class SettlePnlExplanation {
 }
 exports.SettlePnlExplanation = SettlePnlExplanation;
@@ -243,6 +247,7 @@ exports.LPAction = LPAction;
 LPAction.ADD_LIQUIDITY = { addLiquidity: {} };
 LPAction.REMOVE_LIQUIDITY = { removeLiquidity: {} };
 LPAction.SETTLE_LIQUIDITY = { settleLiquidity: {} };
+LPAction.REMOVE_LIQUIDITY_DERISK = { removeLiquidityDerisk: {} };
 class LiquidationType {
 }
 exports.LiquidationType = LiquidationType;

package/lib/user.d.ts

@@ -111,7 +111,7 @@ export declare class User {
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
-    getMarginRequirement(marginCategory: MarginCategory, liquidationBuffer?: BN, strict?: boolean): BN;
+    getMarginRequirement(marginCategory: MarginCategory, liquidationBuffer?: BN, strict?: boolean, includeOpenOrders?: boolean): BN;
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
      */
@@ -246,19 +246,20 @@ export declare class User {
      * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
      * @param marketIndex
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+     * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN): BN;
+    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN, marginCategory?: MarginCategory): BN;
     calculateEntriesEffectOnFreeCollateral(market: PerpMarketAccount, oraclePrice: BN, perpPosition: PerpPosition, positionBaseSizeChange: BN, estimatedEntryPrice: BN): BN;
-    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN): BN | undefined;
-    calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN): BN;
+    calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN, marginCategory?: MarginCategory): 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.
      * @param positionMarketIndex
      * @param closeQuoteAmount
      * @returns : Precision PRICE_PRECISION
      */
-    liquidationPriceAfterClose(positionMarketIndex: number, closeQuoteAmount: BN): BN;
+    liquidationPriceAfterClose(positionMarketIndex: number, closeQuoteAmount: BN, estimatedEntryPrice?: BN): BN;
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
      *
@@ -339,7 +340,7 @@ export declare class User {
      * @returns leverageRatio : Precision TEN_THOUSAND
      */
     accountLeverageRatioAfterTrade(targetMarketIndex: number, targetMarketType: MarketType, tradeQuoteAmount: BN, tradeSide: PositionDirection, includeOpenOrders?: boolean): BN;
-    getUserFeeTier(marketType: MarketType): import("./types").FeeTier;
+    getUserFeeTier(marketType: MarketType, now?: BN): import("./types").FeeTier;
     /**
      * Calculates taker / maker fee (as a percentage, e.g. .001 = 10 basis points) for particular marketType
      * @param marketType

package/lib/user.js

@@ -432,8 +432,8 @@ class User {
     /**
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
-    getMarginRequirement(marginCategory, liquidationBuffer, strict = false) {
-        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, true, strict).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, true, strict));
+    getMarginRequirement(marginCategory, liquidationBuffer, strict = false, includeOpenOrders = true) {
+        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders, strict).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, includeOpenOrders, strict));
     }
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
@@ -1080,12 +1080,13 @@ class User {
      * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
      * @param marketIndex
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+     * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO) {
-        const totalCollateral = this.getTotalCollateral('Maintenance');
-        const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
-        let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance') {
+        const totalCollateral = this.getTotalCollateral(marginCategory);
+        const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false);
+        let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement));
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
@@ -1094,7 +1095,7 @@ class User {
         positionBaseSizeChange = (0, _1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
         const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
-        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange);
+        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, marginCategory);
         if (!freeCollateralDelta) {
             return new _1.BN(-1);
         }
@@ -1105,7 +1106,7 @@ class User {
             const spotPosition = this.getSpotPosition(spotMarketWithSameOracle.marketIndex);
             if (spotPosition) {
                 const signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
-                const spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount);
+                const spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount, marginCategory);
                 freeCollateralDelta = freeCollateralDelta.add(spotFreeCollateralDelta || numericConstants_1.ZERO);
             }
         }
@@ -1135,6 +1136,8 @@ class User {
                 freeCollateralChange = costBasis.sub(newPositionValue);
             }
             else {
+                console.log('newPositionValue', newPositionValue.toString());
+                console.log('costBasis', costBasis.toString());
                 freeCollateralChange = newPositionValue.sub(costBasis);
             }
             // assume worst fee tier
@@ -1145,30 +1148,25 @@ class User {
             freeCollateralChange = freeCollateralChange.sub(takerFee);
         }
         const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
-        const marginRatioBefore = (0, _1.calculateMarketMarginRatio)(market, worstCaseBaseAssetAmount.abs(), 'Maintenance');
         const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
         const newMarginRatio = (0, _1.calculateMarketMarginRatio)(market, newWorstCaseBaseAssetAmount.abs(), 'Maintenance');
-        // update free collateral to account for change in margin ratio from position change
-        freeCollateralChange = freeCollateralChange.sub(worstCaseBaseAssetAmount
-            .mul(oraclePrice)
-            .div(numericConstants_1.BASE_PRECISION)
-            .mul(new _1.BN(newMarginRatio - marginRatioBefore))
-            .div(numericConstants_1.MARGIN_PRECISION));
         // update free collateral to account for new margin requirement from position change
-        freeCollateralChange = freeCollateralChange.sub(positionBaseSizeChange
+        freeCollateralChange = freeCollateralChange.sub(newWorstCaseBaseAssetAmount
+            .abs()
+            .sub(worstCaseBaseAssetAmount.abs())
             .mul(oraclePrice)
             .div(numericConstants_1.BASE_PRECISION)
             .mul(new _1.BN(newMarginRatio))
             .div(numericConstants_1.MARGIN_PRECISION));
         return freeCollateralChange;
     }
-    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange) {
+    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, marginCategory = 'Maintenance') {
         const currentBaseAssetAmount = perpPosition.baseAssetAmount;
         const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
         const orderBaseAssetAmount = worstCaseBaseAssetAmount.sub(currentBaseAssetAmount);
         const proposedBaseAssetAmount = currentBaseAssetAmount.add(positionBaseSizeChange);
         const proposedWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, proposedWorstCaseBaseAssetAmount.abs(), 'Maintenance');
+        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, proposedWorstCaseBaseAssetAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio);
         const marginRatioQuotePrecision = new _1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
@@ -1194,17 +1192,17 @@ class User {
         }
         return freeCollateralDelta;
     }
-    calculateFreeCollateralDeltaForSpot(market, signedTokenAmount) {
+    calculateFreeCollateralDeltaForSpot(market, signedTokenAmount, marginCategory = 'Maintenance') {
         const tokenPrecision = new _1.BN(Math.pow(10, market.decimals));
         if (signedTokenAmount.gt(numericConstants_1.ZERO)) {
-            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price, market, 'Maintenance');
+            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price, market, marginCategory);
             return numericConstants_1.QUOTE_PRECISION.mul(assetWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
                 .mul(signedTokenAmount)
                 .div(tokenPrecision);
         }
         else {
-            const liabilityWeight = (0, spotBalance_1.calculateLiabilityWeight)(signedTokenAmount.abs(), market, 'Maintenance');
+            const liabilityWeight = (0, spotBalance_1.calculateLiabilityWeight)(signedTokenAmount.abs(), market, marginCategory);
             return numericConstants_1.QUOTE_PRECISION.neg()
                 .mul(liabilityWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
@@ -1218,7 +1216,7 @@ class User {
      * @param closeQuoteAmount
      * @returns : Precision PRICE_PRECISION
      */
-    liquidationPriceAfterClose(positionMarketIndex, closeQuoteAmount) {
+    liquidationPriceAfterClose(positionMarketIndex, closeQuoteAmount, estimatedEntryPrice = numericConstants_1.ZERO) {
         const currentPosition = this.getPerpPositionWithLPSettle(positionMarketIndex, undefined, true)[0] || this.getEmptyPosition(positionMarketIndex);
         const closeBaseAmount = currentPosition.baseAssetAmount
             .mul(closeQuoteAmount)
@@ -1227,7 +1225,7 @@ class User {
             .mul(closeQuoteAmount)
             .mod(currentPosition.quoteAssetAmount.abs()))
             .neg();
-        return this.liquidationPrice(positionMarketIndex, closeBaseAmount);
+        return this.liquidationPrice(positionMarketIndex, closeBaseAmount, estimatedEntryPrice);
     }
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
@@ -1642,14 +1640,14 @@ class User {
             .div(netAssetValue);
         return newLeverage;
     }
-    getUserFeeTier(marketType) {
+    getUserFeeTier(marketType, now) {
         const state = this.driftClient.getStateAccount();
         let feeTierIndex = 0;
         if ((0, types_1.isVariant)(marketType, 'perp')) {
             const userStatsAccount = this.driftClient
                 .getUserStats()
                 .getAccount();
-            const total30dVolume = userStatsAccount.takerVolume30D.add(userStatsAccount.makerVolume30D); // todo: update using now and lastTs?
+            const total30dVolume = (0, _1.getUser30dRollingVolumeEstimate)(userStatsAccount, now);
             const stakedQuoteAssetAmount = userStatsAccount.ifStakedQuoteAssetAmount;
             const volumeTiers = [
                 new _1.BN(100000000).mul(numericConstants_1.QUOTE_PRECISION),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.60.0-beta.9",
+	"version": "2.61.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -42,6 +42,11 @@ export class WebSocketProgramAccountSubscriber<T>
 		this.program = program;
 		this.decodeBuffer = decodeBufferFn;
 		this.resubTimeoutMs = resubTimeoutMs;
+		if (this.resubTimeoutMs < 1000) {
+			console.log(
+				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
+			);
+		}
 		this.options = options;
 		this.receivingData = false;
 	}
@@ -73,6 +78,7 @@ export class WebSocketProgramAccountSubscriber<T>
 		);
 
 		if (this.resubTimeoutMs) {
+			this.receivingData = true;
 			this.setTimeout();
 		}
 	}

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -33,7 +33,7 @@ export class AuctionSubscriber {
 				),
 				{
 					filters: [getUserFilter(), getUserWithAuctionFilter()],
-					commitment: this.driftClient.opts.commitment,
+					commitment: this.opts.commitment,
 				},
 				this.resubTimeoutMs
 			);

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.59.0",
+  "version": "2.60.0",
   "name": "drift",
   "instructions": [
     {
@@ -8364,6 +8364,9 @@
           },
           {
             "name": "Borrow"
+          },
+          {
+            "name": "RepayBorrow"
           }
         ]
       }
@@ -8463,6 +8466,9 @@
           },
           {
             "name": "OrderFilledWithLPJit"
+          },
+          {
+            "name": "DeriskLp"
           }
         ]
       }
@@ -8480,6 +8486,9 @@
           },
           {
             "name": "SettleLiquidity"
+          },
+          {
+            "name": "RemoveLiquidityDerisk"
           }
         ]
       }
@@ -8621,10 +8630,6 @@
           {
             "name": "Liquidation",
             "fields": [
-              {
-                "name": "margin_buffer",
-                "type": "u128"
-              },
               {
                 "name": "market_to_track_margin_requirement",
                 "type": {

package/src/math/trade.ts

@@ -3,6 +3,7 @@ import {
 	PerpMarketAccount,
 	PositionDirection,
 	SpotMarketAccount,
+	UserStatsAccount,
 } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { assert } from '../assert/assert';
@@ -964,3 +965,29 @@ export function calculateEstimatedEntryPriceWithL2(
 		quoteFilled: cumulativeQuoteFilled,
 	};
 }
+
+export function getUser30dRollingVolumeEstimate(
+	userStatsAccount: UserStatsAccount,
+	now?: BN
+) {
+	now = now || new BN(new Date().getTime() / 1000);
+	const sinceLastTaker = BN.max(
+		now.sub(userStatsAccount.lastTakerVolume30DTs),
+		ZERO
+	);
+	const sinceLastMaker = BN.max(
+		now.sub(userStatsAccount.lastMakerVolume30DTs),
+		ZERO
+	);
+	const thirtyDaysInSeconds = new BN(60 * 60 * 24 * 30);
+	const last30dVolume = userStatsAccount.takerVolume30D
+		.mul(BN.max(thirtyDaysInSeconds.sub(sinceLastTaker), ZERO))
+		.div(thirtyDaysInSeconds)
+		.add(
+			userStatsAccount.makerVolume30D
+				.mul(BN.max(thirtyDaysInSeconds.sub(sinceLastMaker), ZERO))
+				.div(thirtyDaysInSeconds)
+		);
+
+	return last30dVolume;
+}

package/src/types.ts

@@ -174,6 +174,9 @@ export class OrderActionExplanation {
 	static readonly REDUCE_ONLY_ORDER_INCREASED_POSITION = {
 		reduceOnlyOrderIncreasedPosition: {},
 	};
+	static readonly DERISK_LP = {
+		deriskLp: {},
+	};
 }
 
 export class OrderTriggerCondition {
@@ -197,6 +200,7 @@ export class DepositExplanation {
 	static readonly NONE = { none: {} };
 	static readonly TRANSFER = { transfer: {} };
 	static readonly BORROW = { borrow: {} };
+	static readonly REPAY_BORROW = { repayBorrow: {} };
 }
 
 export class SettlePnlExplanation {
@@ -357,6 +361,7 @@ export class LPAction {
 	static readonly ADD_LIQUIDITY = { addLiquidity: {} };
 	static readonly REMOVE_LIQUIDITY = { removeLiquidity: {} };
 	static readonly SETTLE_LIQUIDITY = { settleLiquidity: {} };
+	static readonly REMOVE_LIQUIDITY_DERISK = { removeLiquidityDerisk: {} };
 }
 
 export type FundingRateRecord = {

package/src/user.ts

@@ -55,6 +55,7 @@ import {
 	getSignedTokenAmount,
 	getStrictTokenValue,
 	getTokenValue,
+	getUser30dRollingVolumeEstimate,
 	MarketType,
 	PositionDirection,
 	sigNum,
@@ -674,19 +675,20 @@ export class User {
 	public getMarginRequirement(
 		marginCategory: MarginCategory,
 		liquidationBuffer?: BN,
-		strict = false
+		strict = false,
+		includeOpenOrders = true
 	): BN {
 		return this.getTotalPerpPositionValue(
 			marginCategory,
 			liquidationBuffer,
-			true,
+			includeOpenOrders,
 			strict
 		).add(
 			this.getSpotMarketLiabilityValue(
 				undefined,
 				marginCategory,
 				liquidationBuffer,
-				true,
+				includeOpenOrders,
 				strict
 			)
 		);
@@ -1970,19 +1972,22 @@ export class User {
 	 * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
 	 * @param marketIndex
 	 * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
+	 * @param marginCategory // allow Initial to be passed in if we are trying to calculate price for DLP de-risking
 	 * @returns Precision : PRICE_PRECISION
 	 */
 	public liquidationPrice(
 		marketIndex: number,
 		positionBaseSizeChange: BN = ZERO,
-		estimatedEntryPrice: BN = ZERO
+		estimatedEntryPrice: BN = ZERO,
+		marginCategory: MarginCategory = 'Maintenance'
 	): BN {
-		const totalCollateral = this.getTotalCollateral('Maintenance');
-		const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
-		let freeCollateral = BN.max(
-			ZERO,
-			totalCollateral.sub(maintenanceMarginRequirement)
+		const totalCollateral = this.getTotalCollateral(marginCategory);
+		const marginRequirement = this.getMarginRequirement(
+			marginCategory,
+			undefined,
+			false
 		);
+		let freeCollateral = BN.max(ZERO, totalCollateral.sub(marginRequirement));
 
 		const oracle =
 			this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
@@ -2014,7 +2019,8 @@ export class User {
 		let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(
 			market,
 			currentPerpPosition,
-			positionBaseSizeChange
+			positionBaseSizeChange,
+			marginCategory
 		);
 
 		if (!freeCollateralDelta) {
@@ -2041,7 +2047,8 @@ export class User {
 				const spotFreeCollateralDelta =
 					this.calculateFreeCollateralDeltaForSpot(
 						spotMarketWithSameOracle,
-						signedTokenAmount
+						signedTokenAmount,
+						marginCategory
 					);
 				freeCollateralDelta = freeCollateralDelta.add(
 					spotFreeCollateralDelta || ZERO
@@ -2086,6 +2093,8 @@ export class User {
 			if (positionBaseSizeChange.gt(ZERO)) {
 				freeCollateralChange = costBasis.sub(newPositionValue);
 			} else {
+				console.log('newPositionValue', newPositionValue.toString());
+				console.log('costBasis', costBasis.toString());
 				freeCollateralChange = newPositionValue.sub(costBasis);
 			}
 
@@ -2101,12 +2110,6 @@ export class User {
 		const worstCaseBaseAssetAmount =
 			calculateWorstCaseBaseAssetAmount(perpPosition);
 
-		const marginRatioBefore = calculateMarketMarginRatio(
-			market,
-			worstCaseBaseAssetAmount.abs(),
-			'Maintenance'
-		);
-
 		const newWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(
 			positionBaseSizeChange
 		);
@@ -2117,18 +2120,11 @@ export class User {
 			'Maintenance'
 		);
 
-		// update free collateral to account for change in margin ratio from position change
-		freeCollateralChange = freeCollateralChange.sub(
-			worstCaseBaseAssetAmount
-				.mul(oraclePrice)
-				.div(BASE_PRECISION)
-				.mul(new BN(newMarginRatio - marginRatioBefore))
-				.div(MARGIN_PRECISION)
-		);
-
 		// update free collateral to account for new margin requirement from position change
 		freeCollateralChange = freeCollateralChange.sub(
-			positionBaseSizeChange
+			newWorstCaseBaseAssetAmount
+				.abs()
+				.sub(worstCaseBaseAssetAmount.abs())
 				.mul(oraclePrice)
 				.div(BASE_PRECISION)
 				.mul(new BN(newMarginRatio))
@@ -2141,7 +2137,8 @@ export class User {
 	calculateFreeCollateralDeltaForPerp(
 		market: PerpMarketAccount,
 		perpPosition: PerpPosition,
-		positionBaseSizeChange: BN
+		positionBaseSizeChange: BN,
+		marginCategory: MarginCategory = 'Maintenance'
 	): BN | undefined {
 		const currentBaseAssetAmount = perpPosition.baseAssetAmount;
 
@@ -2160,7 +2157,8 @@ export class User {
 		const marginRatio = calculateMarketMarginRatio(
 			market,
 			proposedWorstCaseBaseAssetAmount.abs(),
-			'Maintenance'
+			marginCategory,
+			this.getUserAccount().maxMarginRatio
 		);
 		const marginRatioQuotePrecision = new BN(marginRatio)
 			.mul(QUOTE_PRECISION)
@@ -2195,7 +2193,8 @@ export class User {
 
 	calculateFreeCollateralDeltaForSpot(
 		market: SpotMarketAccount,
-		signedTokenAmount: BN
+		signedTokenAmount: BN,
+		marginCategory: MarginCategory = 'Maintenance'
 	): BN {
 		const tokenPrecision = new BN(Math.pow(10, market.decimals));
 
@@ -2204,7 +2203,7 @@ export class User {
 				signedTokenAmount,
 				this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price,
 				market,
-				'Maintenance'
+				marginCategory
 			);
 
 			return QUOTE_PRECISION.mul(assetWeight)
@@ -2215,7 +2214,7 @@ export class User {
 			const liabilityWeight = calculateLiabilityWeight(
 				signedTokenAmount.abs(),
 				market,
-				'Maintenance'
+				marginCategory
 			);
 
 			return QUOTE_PRECISION.neg()
@@ -2234,7 +2233,8 @@ export class User {
 	 */
 	public liquidationPriceAfterClose(
 		positionMarketIndex: number,
-		closeQuoteAmount: BN
+		closeQuoteAmount: BN,
+		estimatedEntryPrice: BN = ZERO
 	): BN {
 		const currentPosition =
 			this.getPerpPositionWithLPSettle(
@@ -2253,7 +2253,11 @@ export class User {
 			)
 			.neg();
 
-		return this.liquidationPrice(positionMarketIndex, closeBaseAmount);
+		return this.liquidationPrice(
+			positionMarketIndex,
+			closeBaseAmount,
+			estimatedEntryPrice
+		);
 	}
 
 	/**
@@ -3056,7 +3060,7 @@ export class User {
 		return newLeverage;
 	}
 
-	public getUserFeeTier(marketType: MarketType) {
+	public getUserFeeTier(marketType: MarketType, now?: BN) {
 		const state = this.driftClient.getStateAccount();
 
 		let feeTierIndex = 0;
@@ -3065,9 +3069,10 @@ export class User {
 				.getUserStats()
 				.getAccount();
 
-			const total30dVolume = userStatsAccount.takerVolume30D.add(
-				userStatsAccount.makerVolume30D
-			); // todo: update using now and lastTs?
+			const total30dVolume = getUser30dRollingVolumeEstimate(
+				userStatsAccount,
+				now
+			);
 
 			const stakedQuoteAssetAmount = userStatsAccount.ifStakedQuoteAssetAmount;
 			const volumeTiers = [