@drift-labs/sdk 2.94.0-beta.3 → 2.94.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.94.0-beta.3
+2.94.0-beta.4

package/lib/user.d.ts

@@ -4,7 +4,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount, UserStatus } from './types';
+import { HealthComponent, HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount, UserStatus } from './types';
 import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './accounts/types';
 import { BN, MarketType, PositionDirection, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
@@ -387,6 +387,12 @@ export declare class User {
         perpTier: number;
         spotTier: number;
     };
+    getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, }: {
+        marginCategory: MarginCategory;
+        perpPosition: PerpPosition;
+        oraclePriceData?: OraclePriceData;
+        quoteOraclePriceData?: OraclePriceData;
+    }): HealthComponent;
     getHealthComponents({ marginCategory, }: {
         marginCategory: MarginCategory;
     }): HealthComponents;

package/lib/user.js

@@ -1988,6 +1988,37 @@ class User {
             spotTier: safestSpotTier,
         };
     }
+    getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, }) {
+        const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
+        const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
+        const _oraclePriceData = oraclePriceData ||
+            this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
+        const oraclePrice = _oraclePriceData.price;
+        const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, _1.calculateWorstCasePerpLiabilityValue)(settledLpPosition, perpMarket, oraclePrice);
+        const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio));
+        const _quoteOraclePriceData = quoteOraclePriceData ||
+            this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
+        let marginRequirement = worstCaseLiabilityValue
+            .mul(_quoteOraclePriceData.price)
+            .div(numericConstants_1.PRICE_PRECISION)
+            .mul(marginRatio)
+            .div(numericConstants_1.MARGIN_PRECISION);
+        marginRequirement = marginRequirement.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
+        if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+            marginRequirement = marginRequirement.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, oraclePrice
+                .mul(perpMarket.amm.orderStepSize)
+                .mul(numericConstants_1.QUOTE_PRECISION)
+                .div(numericConstants_1.AMM_RESERVE_PRECISION)
+                .div(numericConstants_1.PRICE_PRECISION)));
+        }
+        return {
+            marketIndex: perpMarket.marketIndex,
+            size: worstCaseBaseAmount,
+            value: worstCaseLiabilityValue,
+            weight: marginRatio,
+            weightedValue: marginRequirement,
+        };
+    }
     getHealthComponents({ marginCategory, }) {
         const healthComponents = {
             deposits: [],
@@ -1996,34 +2027,16 @@ class User {
             perpPnl: [],
         };
         for (const perpPosition of this.getActivePerpPositions()) {
-            const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
             const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
-            const oraclePrice = oraclePriceData.price;
-            const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, _1.calculateWorstCasePerpLiabilityValue)(settledLpPosition, perpMarket, oraclePrice);
-            const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio));
-            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-            let marginRequirement = worstCaseLiabilityValue
-                .mul(quoteOraclePriceData.price)
-                .div(numericConstants_1.PRICE_PRECISION)
-                .mul(marginRatio)
-                .div(numericConstants_1.MARGIN_PRECISION);
-            marginRequirement = marginRequirement.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
-            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                marginRequirement = marginRequirement.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, oraclePrice
-                    .mul(perpMarket.amm.orderStepSize)
-                    .mul(numericConstants_1.QUOTE_PRECISION)
-                    .div(numericConstants_1.AMM_RESERVE_PRECISION)
-                    .div(numericConstants_1.PRICE_PRECISION)));
-            }
-            healthComponents.perpPositions.push({
-                marketIndex: perpMarket.marketIndex,
-                size: worstCaseBaseAmount,
-                value: worstCaseLiabilityValue,
-                weight: marginRatio,
-                weightedValue: marginRequirement,
-            });
+            healthComponents.perpPositions.push(this.getPerpPositionHealth({
+                marginCategory,
+                perpPosition,
+                oraclePriceData,
+                quoteOraclePriceData,
+            }));
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
             const settledPerpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
             const positionUnrealizedPnl = (0, _1.calculatePositionPNL)(perpMarket, settledPerpPosition, true, oraclePriceData);
             let pnlWeight;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.94.0-beta.3",
+	"version": "2.94.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/user.ts

@@ -3,6 +3,7 @@ import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
 import {
+	HealthComponent,
 	HealthComponents,
 	isVariant,
 	MarginCategory,
@@ -3701,6 +3702,82 @@ export class User {
 		};
 	}
 
+	public getPerpPositionHealth({
+		marginCategory,
+		perpPosition,
+		oraclePriceData,
+		quoteOraclePriceData,
+	}: {
+		marginCategory: MarginCategory;
+		perpPosition: PerpPosition;
+		oraclePriceData?: OraclePriceData;
+		quoteOraclePriceData?: OraclePriceData;
+	}): HealthComponent {
+		const settledLpPosition = this.getPerpPositionWithLPSettle(
+			perpPosition.marketIndex,
+			perpPosition
+		)[0];
+		const perpMarket = this.driftClient.getPerpMarketAccount(
+			perpPosition.marketIndex
+		);
+		const _oraclePriceData =
+			oraclePriceData ||
+			this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
+		const oraclePrice = _oraclePriceData.price;
+		const {
+			worstCaseBaseAssetAmount: worstCaseBaseAmount,
+			worstCaseLiabilityValue,
+		} = calculateWorstCasePerpLiabilityValue(
+			settledLpPosition,
+			perpMarket,
+			oraclePrice
+		);
+
+		const marginRatio = new BN(
+			calculateMarketMarginRatio(
+				perpMarket,
+				worstCaseBaseAmount.abs(),
+				marginCategory,
+				this.getUserAccount().maxMarginRatio
+			)
+		);
+
+		const _quoteOraclePriceData =
+			quoteOraclePriceData ||
+			this.driftClient.getOracleDataForSpotMarket(QUOTE_SPOT_MARKET_INDEX);
+
+		let marginRequirement = worstCaseLiabilityValue
+			.mul(_quoteOraclePriceData.price)
+			.div(PRICE_PRECISION)
+			.mul(marginRatio)
+			.div(MARGIN_PRECISION);
+
+		marginRequirement = marginRequirement.add(
+			new BN(perpPosition.openOrders).mul(OPEN_ORDER_MARGIN_REQUIREMENT)
+		);
+
+		if (perpPosition.lpShares.gt(ZERO)) {
+			marginRequirement = marginRequirement.add(
+				BN.max(
+					QUOTE_PRECISION,
+					oraclePrice
+						.mul(perpMarket.amm.orderStepSize)
+						.mul(QUOTE_PRECISION)
+						.div(AMM_RESERVE_PRECISION)
+						.div(PRICE_PRECISION)
+				)
+			);
+		}
+
+		return {
+			marketIndex: perpMarket.marketIndex,
+			size: worstCaseBaseAmount,
+			value: worstCaseLiabilityValue,
+			weight: marginRatio,
+			weightedValue: marginRequirement,
+		};
+	}
+
 	public getHealthComponents({
 		marginCategory,
 	}: {
@@ -3714,72 +3791,30 @@ export class User {
 		};
 
 		for (const perpPosition of this.getActivePerpPositions()) {
-			const settledLpPosition = this.getPerpPositionWithLPSettle(
-				perpPosition.marketIndex,
-				perpPosition
-			)[0];
 			const perpMarket = this.driftClient.getPerpMarketAccount(
 				perpPosition.marketIndex
 			);
+
 			const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(
 				perpMarket.marketIndex
 			);
-			const oraclePrice = oraclePriceData.price;
-			const {
-				worstCaseBaseAssetAmount: worstCaseBaseAmount,
-				worstCaseLiabilityValue,
-			} = calculateWorstCasePerpLiabilityValue(
-				settledLpPosition,
-				perpMarket,
-				oraclePrice
+
+			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
+				QUOTE_SPOT_MARKET_INDEX
 			);
 
-			const marginRatio = new BN(
-				calculateMarketMarginRatio(
-					perpMarket,
-					worstCaseBaseAmount.abs(),
+			healthComponents.perpPositions.push(
+				this.getPerpPositionHealth({
 					marginCategory,
-					this.getUserAccount().maxMarginRatio
-				)
+					perpPosition,
+					oraclePriceData,
+					quoteOraclePriceData,
+				})
 			);
 
 			const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
 				perpMarket.quoteSpotMarketIndex
 			);
-			const quoteOraclePriceData = this.driftClient.getOracleDataForSpotMarket(
-				QUOTE_SPOT_MARKET_INDEX
-			);
-
-			let marginRequirement = worstCaseLiabilityValue
-				.mul(quoteOraclePriceData.price)
-				.div(PRICE_PRECISION)
-				.mul(marginRatio)
-				.div(MARGIN_PRECISION);
-
-			marginRequirement = marginRequirement.add(
-				new BN(perpPosition.openOrders).mul(OPEN_ORDER_MARGIN_REQUIREMENT)
-			);
-
-			if (perpPosition.lpShares.gt(ZERO)) {
-				marginRequirement = marginRequirement.add(
-					BN.max(
-						QUOTE_PRECISION,
-						oraclePrice
-							.mul(perpMarket.amm.orderStepSize)
-							.mul(QUOTE_PRECISION)
-							.div(AMM_RESERVE_PRECISION)
-							.div(PRICE_PRECISION)
-					)
-				);
-			}
-
-			healthComponents.perpPositions.push({
-				marketIndex: perpMarket.marketIndex,
-				size: worstCaseBaseAmount,
-				value: worstCaseLiabilityValue,
-				weight: marginRatio,
-				weightedValue: marginRequirement,
-			});
 
 			const settledPerpPosition = this.getPerpPositionWithLPSettle(
 				perpPosition.marketIndex,