@drift-labs/sdk 2.42.0-beta.9 → 2.43.0-beta.0

package/src/user.ts

@@ -3,66 +3,66 @@ import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
 import {
+	HealthComponents,
 	isVariant,
 	MarginCategory,
 	Order,
-	UserAccount,
+	PerpMarketAccount,
 	PerpPosition,
 	SpotPosition,
-	isOneOfVariant,
-	PerpMarketAccount,
-	HealthComponents,
+	UserAccount,
+	UserStatus,
 	UserStatsAccount,
 } from './types';
 import { calculateEntryPrice, positionIsAvailable } from './math/position';
 import {
-	PRICE_PRECISION,
+	AMM_RESERVE_PRECISION,
+	AMM_RESERVE_PRECISION_EXP,
 	AMM_TO_QUOTE_PRECISION_RATIO,
-	ZERO,
-	TEN_THOUSAND,
+	BASE_PRECISION,
 	BN_MAX,
-	QUOTE_PRECISION,
-	AMM_RESERVE_PRECISION,
+	FIVE_MINUTE,
 	MARGIN_PRECISION,
-	SPOT_MARKET_WEIGHT_PRECISION,
+	ONE,
+	OPEN_ORDER_MARGIN_REQUIREMENT,
+	PRICE_PRECISION,
+	QUOTE_PRECISION,
 	QUOTE_SPOT_MARKET_INDEX,
+	SPOT_MARKET_WEIGHT_PRECISION,
 	TEN,
-	OPEN_ORDER_MARGIN_REQUIREMENT,
-	FIVE_MINUTE,
-	BASE_PRECISION,
-	ONE,
+	TEN_THOUSAND,
 	TWO,
-	AMM_RESERVE_PRECISION_EXP,
+	ZERO,
 } from './constants/numericConstants';
 import {
-	UserAccountSubscriber,
-	UserAccountEvents,
 	DataAndSlot,
+	UserAccountEvents,
+	UserAccountSubscriber,
 } from './accounts/types';
 import {
-	calculateReservePrice,
+	BN,
 	calculateBaseAssetValue,
+	calculateMarketMarginRatio,
 	calculatePositionFundingPNL,
 	calculatePositionPNL,
+	calculateReservePrice,
+	calculateSpotMarketMarginRatio,
 	calculateUnrealizedAssetWeight,
-	calculateMarketMarginRatio,
-	PositionDirection,
-	BN,
-	SpotMarketAccount,
+	getBalance,
+	getSignedTokenAmount,
+	getStrictTokenValue,
 	getTokenValue,
 	MarketType,
-	getStrictTokenValue,
-	calculateSpotMarketMarginRatio,
-	getSignedTokenAmount,
-	SpotBalanceType,
+	PositionDirection,
 	sigNum,
-	getBalance,
+	SpotBalanceType,
+	SpotMarketAccount,
 } from '.';
 import {
-	getTokenAmount,
 	calculateAssetWeight,
 	calculateLiabilityWeight,
 	calculateWithdrawLimit,
+	getTokenAmount,
 } from './math/spotBalance';
 import { calculateMarketOpenBidAsk } from './math/amm';
 import {
@@ -1200,12 +1200,7 @@ export class User {
 	 * @returns : number (value from [0, 100])
 	 */
 	public getHealth(): number {
-		const userAccount = this.getUserAccount();
-
-		if (
-			isVariant(userAccount.status, 'beingLiquidated') ||
-			isVariant(userAccount.status, 'bankrupt')
-		) {
+		if (this.isBeingLiquidated()) {
 			return 0;
 		}
 
@@ -1821,14 +1816,15 @@ export class User {
 	}
 
 	public isBeingLiquidated(): boolean {
-		return isOneOfVariant(this.getUserAccount().status, [
-			'beingLiquidated',
-			'bankrupt',
-		]);
+		return (
+			(this.getUserAccount().status &
+				(UserStatus.BEING_LIQUIDATED | UserStatus.BANKRUPT)) >
+			0
+		);
 	}
 
 	public isBankrupt(): boolean {
-		return isVariant(this.getUserAccount().status, 'bankrupt');
+		return (this.getUserAccount().status & UserStatus.BANKRUPT) > 0;
 	}
 
 	/**
@@ -2412,7 +2408,7 @@ export class User {
 		);
 
 		const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } =
-			this.getLeverageComponents(undefined, 'Initial');
+			this.getLeverageComponents();
 
 		if (!calculateSwap) {
 			calculateSwap = (inSwap: BN) => {
@@ -2708,7 +2704,7 @@ export class User {
 		);
 
 		const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } =
-			this.getLeverageComponents(undefined, 'Initial');
+			this.getLeverageComponents();
 
 		const inPositionAfter = this.cloneAndUpdateSpotPosition(
 			inSpotPosition,
@@ -3152,12 +3148,23 @@ export class User {
 		};
 	}
 
-	public canMakeIdle(slot: BN, slotsBeforeIdle: BN): boolean {
+	public canMakeIdle(slot: BN): boolean {
 		const userAccount = this.getUserAccount();
 		if (userAccount.idle) {
 			return false;
 		}
 
+		const { totalAssetValue, totalLiabilityValue } =
+			this.getSpotMarketAssetAndLiabilityValue();
+		const equity = totalAssetValue.sub(totalLiabilityValue);
+
+		let slotsBeforeIdle: BN;
+		if (equity.lt(QUOTE_PRECISION)) {
+			slotsBeforeIdle = new BN(9000); // 1 hour
+		} else {
+			slotsBeforeIdle = new BN(1512000); // 1 week
+		}
+
 		const userLastActiveSlot = userAccount.lastActiveSlot;
 		const slotsSinceLastActive = slot.sub(userLastActiveSlot);
 		if (slotsSinceLastActive.lt(slotsBeforeIdle)) {

package/tests/user/helpers.ts

@@ -9,7 +9,6 @@ import {
 	OrderType,
 	PositionDirection,
 	OrderTriggerCondition,
-	UserStatus,
 	UserAccount,
 	ZERO,
 } from '../../src';
@@ -67,7 +66,7 @@ export const mockUserAccount: UserAccount = {
 	orders: Array.from({ length: 8 }, function () {
 		return Object.assign({}, mockOrder);
 	}),
-	status: UserStatus.ACTIVE,
+	status: 0,
 	nextLiquidationId: 0,
 	nextOrderId: 0,
 	maxMarginRatio: 0,