@drift-labs/sdk 2.12.0-beta.1 → 2.12.0-beta.2

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.12.0-beta.1",
+    "version": "2.12.0-beta.2",
     "name": "drift",
     "instructions": [
         {
@@ -3705,9 +3705,7 @@
             "args": [
                 {
                     "name": "exchangeStatus",
-                    "type": {
-                        "defined": "ExchangeStatus"
-                    }
+                    "type": "u8"
                 }
             ]
         },
@@ -4384,9 +4382,7 @@
                     },
                     {
                         "name": "exchangeStatus",
-                        "type": {
-                            "defined": "ExchangeStatus"
-                        }
+                        "type": "u8"
                     },
                     {
                         "name": "liquidationDuration",
@@ -6360,10 +6356,10 @@
                 "kind": "enum",
                 "variants": [
                     {
-                        "name": "Active"
+                        "name": "DepositPaused"
                     },
                     {
-                        "name": "FundingPaused"
+                        "name": "WithdrawPaused"
                     },
                     {
                         "name": "AmmPaused"
@@ -6375,10 +6371,10 @@
                         "name": "LiqPaused"
                     },
                     {
-                        "name": "WithdrawPaused"
+                        "name": "FundingPaused"
                     },
                     {
-                        "name": "Paused"
+                        "name": "SettlePnlPaused"
                     }
                 ]
             }

package/lib/math/exchangeStatus.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ammPaused = exports.fillPaused = exports.exchangePaused = void 0;
 const types_1 = require("../types");
 function exchangePaused(state) {
-    return (0, types_1.isVariant)(state.exchangeStatus, 'paused');
+    return state.exchangeStatus !== types_1.ExchangeStatus.ACTIVE;
 }
 exports.exchangePaused = exchangePaused;
 function fillPaused(state, market) {
-    return ((0, types_1.isOneOfVariant)(state.exchangeStatus, ['paused', 'fillPaused']) ||
+    return ((state.exchangeStatus & types_1.ExchangeStatus.FILL_PAUSED) ===
+        types_1.ExchangeStatus.FILL_PAUSED ||
         (0, types_1.isOneOfVariant)(market.status, ['paused', 'fillPaused']));
 }
 exports.fillPaused = fillPaused;
 function ammPaused(state, market) {
-    return ((0, types_1.isOneOfVariant)(state.exchangeStatus, ['paused', 'ammPaused']) ||
+    return ((state.exchangeStatus & types_1.ExchangeStatus.AMM_PAUSED) ===
+        types_1.ExchangeStatus.AMM_PAUSED ||
         (0, types_1.isOneOfVariant)(market.status, ['paused', 'ammPaused']));
 }
 exports.ammPaused = ammPaused;

package/lib/types.d.ts

@@ -1,28 +1,16 @@
 /// <reference types="bn.js" />
 import { PublicKey, Transaction } from '@solana/web3.js';
 import { BN } from '.';
-export declare class ExchangeStatus {
-    static readonly ACTIVE: {
-        active: {};
-    };
-    static readonly FUNDING_PAUSED: {
-        fundingPaused: {};
-    };
-    static readonly AMM_PAUSED: {
-        ammPaused: {};
-    };
-    static readonly FILL_PAUSED: {
-        fillPaused: {};
-    };
-    static readonly LIQ_PAUSED: {
-        liqPaused: {};
-    };
-    static readonly WITHDRAW_PAUSED: {
-        withdrawPaused: {};
-    };
-    static readonly PAUSED: {
-        paused: {};
-    };
+export declare enum ExchangeStatus {
+    ACTIVE = 0,
+    DEPOSIT_PAUSED = 1,
+    WITHDRAW_PAUSED = 2,
+    AMM_PAUSED = 4,
+    FILL_PAUSED = 8,
+    LIQ_PAUSED = 16,
+    FUNDING_PAUSED = 32,
+    SETTLE_PNL_PAUSED = 64,
+    PAUSED = 127
 }
 export declare class MarketStatus {
     static readonly INITIALIZED: {
@@ -587,7 +575,7 @@ export declare type OrderActionRecord = {
 };
 export declare type StateAccount = {
     admin: PublicKey;
-    exchangeStatus: ExchangeStatus;
+    exchangeStatus: number;
     whitelistMint: PublicKey;
     discountMint: PublicKey;
     oracleGuardRails: OracleGuardRails;

package/lib/types.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultOrderParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
-class ExchangeStatus {
-}
-exports.ExchangeStatus = ExchangeStatus;
-ExchangeStatus.ACTIVE = { active: {} };
-ExchangeStatus.FUNDING_PAUSED = { fundingPaused: {} };
-ExchangeStatus.AMM_PAUSED = { ammPaused: {} };
-ExchangeStatus.FILL_PAUSED = { fillPaused: {} };
-ExchangeStatus.LIQ_PAUSED = { liqPaused: {} };
-ExchangeStatus.WITHDRAW_PAUSED = { withdrawPaused: {} };
-ExchangeStatus.PAUSED = { paused: {} };
+var ExchangeStatus;
+(function (ExchangeStatus) {
+    ExchangeStatus[ExchangeStatus["ACTIVE"] = 0] = "ACTIVE";
+    ExchangeStatus[ExchangeStatus["DEPOSIT_PAUSED"] = 1] = "DEPOSIT_PAUSED";
+    ExchangeStatus[ExchangeStatus["WITHDRAW_PAUSED"] = 2] = "WITHDRAW_PAUSED";
+    ExchangeStatus[ExchangeStatus["AMM_PAUSED"] = 4] = "AMM_PAUSED";
+    ExchangeStatus[ExchangeStatus["FILL_PAUSED"] = 8] = "FILL_PAUSED";
+    ExchangeStatus[ExchangeStatus["LIQ_PAUSED"] = 16] = "LIQ_PAUSED";
+    ExchangeStatus[ExchangeStatus["FUNDING_PAUSED"] = 32] = "FUNDING_PAUSED";
+    ExchangeStatus[ExchangeStatus["SETTLE_PNL_PAUSED"] = 64] = "SETTLE_PNL_PAUSED";
+    ExchangeStatus[ExchangeStatus["PAUSED"] = 127] = "PAUSED";
+})(ExchangeStatus = exports.ExchangeStatus || (exports.ExchangeStatus = {}));
 class MarketStatus {
 }
 exports.MarketStatus = MarketStatus;

package/lib/user.js

@@ -797,7 +797,7 @@ class User {
         const freeCollateralExcludingTargetMarket = totalCollateral.sub(marginRequirementExcludingTargetMarket);
         // if the position value after the trade is less than free collateral, there is no liq price
         if (totalPositionValueAfterTrade.lte(freeCollateralExcludingTargetMarket) &&
-            proposedPerpPosition.baseAssetAmount.abs().gt(numericConstants_1.ZERO)) {
+            proposedPerpPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
         const marginRequirementAfterTrade = marginRequirementExcludingTargetMarket.add(proposedPerpPositionValue

package/package.json

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

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.12.0-beta.1",
+  "version": "2.12.0-beta.2",
   "name": "drift",
   "instructions": [
     {
@@ -3705,9 +3705,7 @@
       "args": [
         {
           "name": "exchangeStatus",
-          "type": {
-            "defined": "ExchangeStatus"
-          }
+          "type": "u8"
         }
       ]
     },
@@ -4384,9 +4382,7 @@
           },
           {
             "name": "exchangeStatus",
-            "type": {
-              "defined": "ExchangeStatus"
-            }
+            "type": "u8"
           },
           {
             "name": "liquidationDuration",
@@ -6360,10 +6356,10 @@
         "kind": "enum",
         "variants": [
           {
-            "name": "Active"
+            "name": "DepositPaused"
           },
           {
-            "name": "FundingPaused"
+            "name": "WithdrawPaused"
           },
           {
             "name": "AmmPaused"
@@ -6375,10 +6371,10 @@
             "name": "LiqPaused"
           },
           {
-            "name": "WithdrawPaused"
+            "name": "FundingPaused"
           },
           {
-            "name": "Paused"
+            "name": "SettlePnlPaused"
           }
         ]
       }

package/src/math/exchangeStatus.ts

@@ -1,13 +1,13 @@
 import {
+	ExchangeStatus,
 	isOneOfVariant,
-	isVariant,
 	PerpMarketAccount,
 	SpotMarketAccount,
 	StateAccount,
 } from '../types';
 
 export function exchangePaused(state: StateAccount): boolean {
-	return isVariant(state.exchangeStatus, 'paused');
+	return state.exchangeStatus !== ExchangeStatus.ACTIVE;
 }
 
 export function fillPaused(
@@ -15,7 +15,8 @@ export function fillPaused(
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
 	return (
-		isOneOfVariant(state.exchangeStatus, ['paused', 'fillPaused']) ||
+		(state.exchangeStatus & ExchangeStatus.FILL_PAUSED) ===
+			ExchangeStatus.FILL_PAUSED ||
 		isOneOfVariant(market.status, ['paused', 'fillPaused'])
 	);
 }
@@ -25,7 +26,8 @@ export function ammPaused(
 	market: PerpMarketAccount | SpotMarketAccount
 ): boolean {
 	return (
-		isOneOfVariant(state.exchangeStatus, ['paused', 'ammPaused']) ||
+		(state.exchangeStatus & ExchangeStatus.AMM_PAUSED) ===
+			ExchangeStatus.AMM_PAUSED ||
 		isOneOfVariant(market.status, ['paused', 'ammPaused'])
 	);
 }

package/src/types.ts

@@ -3,14 +3,16 @@ import { BN, ZERO } from '.';
 
 // # Utility Types / Enums / Constants
 
-export class ExchangeStatus {
-	static readonly ACTIVE = { active: {} };
-	static readonly FUNDING_PAUSED = { fundingPaused: {} };
-	static readonly AMM_PAUSED = { ammPaused: {} };
-	static readonly FILL_PAUSED = { fillPaused: {} };
-	static readonly LIQ_PAUSED = { liqPaused: {} };
-	static readonly WITHDRAW_PAUSED = { withdrawPaused: {} };
-	static readonly PAUSED = { paused: {} };
+export enum ExchangeStatus {
+	ACTIVE = 0,
+	DEPOSIT_PAUSED = 1,
+	WITHDRAW_PAUSED = 2,
+	AMM_PAUSED = 4,
+	FILL_PAUSED = 8,
+	LIQ_PAUSED = 16,
+	FUNDING_PAUSED = 32,
+	SETTLE_PNL_PAUSED = 64,
+	PAUSED = 127,
 }
 
 export class MarketStatus {
@@ -501,7 +503,7 @@ export type OrderActionRecord = {
 
 export type StateAccount = {
 	admin: PublicKey;
-	exchangeStatus: ExchangeStatus;
+	exchangeStatus: number;
 	whitelistMint: PublicKey;
 	discountMint: PublicKey;
 	oracleGuardRails: OracleGuardRails;

package/src/user.ts

@@ -1335,7 +1335,7 @@ export class User {
 		// if the position value after the trade is less than free collateral, there is no liq price
 		if (
 			totalPositionValueAfterTrade.lte(freeCollateralExcludingTargetMarket) &&
-			proposedPerpPosition.baseAssetAmount.abs().gt(ZERO)
+			proposedPerpPosition.baseAssetAmount.gt(ZERO)
 		) {
 			return new BN(-1);
 		}

package/tests/dlob/helpers.ts

@@ -19,7 +19,6 @@ import {
 	UserMapInterface,
 	Wallet,
 	OrderRecord,
-	ExchangeStatus,
 	ZERO,
 	ContractTier,
 } from '../../src';
@@ -478,7 +477,7 @@ export const mockStateAccount: StateAccount = {
 	defaultMarketOrderTimeInForce: 0,
 	defaultSpotAuctionDuration: 0,
 	discountMint: PublicKey.default,
-	exchangeStatus: ExchangeStatus.ACTIVE,
+	exchangeStatus: 0,
 	liquidationMarginBufferRatio: 0,
 	lpCooldownTime: new BN(0),
 	minPerpAuctionDuration: 0,