@drift-labs/sdk 2.42.0-beta.14 → 2.42.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.42.0-beta.14
+2.42.0-beta.16

package/lib/idl/drift.json

@@ -5890,9 +5890,7 @@
                         "docs": [
                             "Whether the user is active, being liquidated or bankrupt"
                         ],
-                        "type": {
-                            "defined": "UserStatus"
-                        }
+                        "type": "u8"
                     },
                     {
                         "name": "isMarginTradingEnabled",
@@ -8648,9 +8646,6 @@
             "type": {
                 "kind": "enum",
                 "variants": [
-                    {
-                        "name": "Active"
-                    },
                     {
                         "name": "BeingLiquidated"
                     },

package/lib/types.d.ts

@@ -41,19 +41,10 @@ export declare class MarketStatus {
         delisted: {};
     };
 }
-export declare class UserStatus {
-    static readonly ACTIVE: {
-        active: {};
-    };
-    static readonly BEING_LIQUIDATED: {
-        beingLiquidated: {};
-    };
-    static readonly BANKRUPT: {
-        bankrupt: {};
-    };
-    static readonly REDUCE_ONLY: {
-        reduceOnly: {};
-    };
+export declare enum UserStatus {
+    BEING_LIQUIDATED = 1,
+    BANKRUPT = 2,
+    REDUCE_ONLY = 4
 }
 export declare class ContractType {
     static readonly PERPETUAL: {
@@ -882,7 +873,7 @@ export type UserAccount = {
     spotPositions: SpotPosition[];
     perpPositions: PerpPosition[];
     orders: Order[];
-    status: UserStatus;
+    status: number;
     nextLiquidationId: number;
     nextOrderId: number;
     maxMarginRatio: number;

package/lib/types.js

@@ -27,13 +27,12 @@ MarketStatus.WITHDRAW_PAUSED = { withdrawPaused: {} };
 MarketStatus.REDUCE_ONLY = { reduceOnly: {} };
 MarketStatus.SETTLEMENT = { settlement: {} };
 MarketStatus.DELISTED = { delisted: {} };
-class UserStatus {
-}
-exports.UserStatus = UserStatus;
-UserStatus.ACTIVE = { active: {} };
-UserStatus.BEING_LIQUIDATED = { beingLiquidated: {} };
-UserStatus.BANKRUPT = { bankrupt: {} };
-UserStatus.REDUCE_ONLY = { reduceOnly: {} };
+var UserStatus;
+(function (UserStatus) {
+    UserStatus[UserStatus["BEING_LIQUIDATED"] = 1] = "BEING_LIQUIDATED";
+    UserStatus[UserStatus["BANKRUPT"] = 2] = "BANKRUPT";
+    UserStatus[UserStatus["REDUCE_ONLY"] = 4] = "REDUCE_ONLY";
+})(UserStatus = exports.UserStatus || (exports.UserStatus = {}));
 class ContractType {
 }
 exports.ContractType = ContractType;

package/lib/user.d.ts

@@ -4,9 +4,9 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount, HealthComponents } from './types';
-import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
-import { PositionDirection, BN, SpotMarketAccount, MarketType } from '.';
+import { HealthComponents, MarginCategory, Order, PerpMarketAccount, PerpPosition, SpotPosition, UserAccount } from './types';
+import { DataAndSlot, UserAccountEvents, UserAccountSubscriber } from './accounts/types';
+import { BN, MarketType, PositionDirection, SpotMarketAccount } from '.';
 import { OraclePriceData } from './oracles/types';
 import { UserConfig } from './userConfig';
 import { StrictOraclePrice } from './oracles/strictOraclePrice';

package/lib/user.js

@@ -670,9 +670,7 @@ class User {
      * @returns : number (value from [0, 100])
      */
     getHealth() {
-        const userAccount = this.getUserAccount();
-        if ((0, types_1.isVariant)(userAccount.status, 'beingLiquidated') ||
-            (0, types_1.isVariant)(userAccount.status, 'bankrupt')) {
+        if (this.isBeingLiquidated()) {
             return 0;
         }
         const totalCollateral = this.getTotalCollateral('Maintenance');
@@ -1004,13 +1002,12 @@ class User {
         };
     }
     isBeingLiquidated() {
-        return (0, types_1.isOneOfVariant)(this.getUserAccount().status, [
-            'beingLiquidated',
-            'bankrupt',
-        ]);
+        return ((this.getUserAccount().status &
+            (types_1.UserStatus.BEING_LIQUIDATED | types_1.UserStatus.BANKRUPT)) >
+            0);
     }
     isBankrupt() {
-        return (0, types_1.isVariant)(this.getUserAccount().status, 'bankrupt');
+        return (this.getUserAccount().status & types_1.UserStatus.BANKRUPT) > 0;
     }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
@@ -1335,7 +1332,7 @@ class User {
         const outContributionInitial = this.calculateSpotPositionFreeCollateralContribution(outSpotPosition, outStrictOraclePrice);
         const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
         const initialContribution = inContributionInitial.add(outContributionInitial);
-        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents(undefined, 'Initial');
+        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         if (!calculateSwap) {
             calculateSwap = (inSwap) => {
                 return inSwap
@@ -1490,7 +1487,7 @@ class User {
             this.getEmptySpotPosition(outMarketIndex);
         const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition, inStrictOraclePrice);
         const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
-        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents(undefined, 'Initial');
+        const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         const inPositionAfter = this.cloneAndUpdateSpotPosition(inSpotPosition, inAmount.abs().neg(), inMarket);
         const outPositionAfter = this.cloneAndUpdateSpotPosition(outSpotPosition, outAmount.abs(), outMarket);
         const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter, inStrictOraclePrice);

package/package.json

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

package/src/idl/drift.json

@@ -5890,9 +5890,7 @@
             "docs": [
               "Whether the user is active, being liquidated or bankrupt"
             ],
-            "type": {
-              "defined": "UserStatus"
-            }
+            "type": "u8"
           },
           {
             "name": "isMarginTradingEnabled",
@@ -8648,9 +8646,6 @@
       "type": {
         "kind": "enum",
         "variants": [
-          {
-            "name": "Active"
-          },
           {
             "name": "BeingLiquidated"
           },

package/src/types.ts

@@ -27,11 +27,10 @@ export class MarketStatus {
 	static readonly DELISTED = { delisted: {} };
 }
 
-export class UserStatus {
-	static readonly ACTIVE = { active: {} };
-	static readonly BEING_LIQUIDATED = { beingLiquidated: {} };
-	static readonly BANKRUPT = { bankrupt: {} };
-	static readonly REDUCE_ONLY = { reduceOnly: {} };
+export enum UserStatus {
+	BEING_LIQUIDATED = 1,
+	BANKRUPT = 2,
+	REDUCE_ONLY = 4,
 }
 
 export class ContractType {
@@ -828,7 +827,7 @@ export type UserAccount = {
 	spotPositions: SpotPosition[];
 	perpPositions: PerpPosition[];
 	orders: Order[];
-	status: UserStatus;
+	status: number;
 	nextLiquidationId: number;
 	nextOrderId: number;
 	maxMarginRatio: number;

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,

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,