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

package/lib/user.js

@@ -141,7 +141,7 @@ class User {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
         }
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
-        const [marketOpenBids, marketOpenAsks] = (0, amm_1.calculateMarketOpenBidAsk)(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
+        const [marketOpenBids, marketOpenAsks] = amm_1.calculateMarketOpenBidAsk(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
         const lpOpenBids = marketOpenBids
             .mul(position.lpShares)
             .div(market.amm.sqrtK);
@@ -294,11 +294,11 @@ class User {
             if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
                 perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
             }
-            let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
+            let positionUnrealizedPnl = _1.calculatePositionPNL(market, perpPosition, withFunding, oraclePriceData);
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                     positionUnrealizedPnl = positionUnrealizedPnl
-                        .mul((0, _1.calculateUnrealizedAssetWeight)(market, quoteSpotMarket, positionUnrealizedPnl, withWeightMarginCategory, oraclePriceData))
+                        .mul(_1.calculateUnrealizedAssetWeight(market, quoteSpotMarket, positionUnrealizedPnl, withWeightMarginCategory, oraclePriceData))
                         .div(new _1.BN(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION));
                 }
             }
@@ -314,20 +314,20 @@ class User {
             .perpPositions.filter((pos) => marketIndex ? pos.marketIndex === marketIndex : true)
             .reduce((pnl, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
-            return pnl.add((0, _1.calculatePositionFundingPNL)(market, perpPosition));
+            return pnl.add(_1.calculatePositionFundingPNL(market, perpPosition));
         }, numericConstants_1.ZERO);
     }
     getSpotMarketLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders) {
         return this.getUserAccount().spotPositions.reduce((totalLiabilityValue, spotPosition) => {
-            if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition) ||
+            if (spotPosition_1.isSpotPositionAvailable(spotPosition) ||
                 (marketIndex !== undefined &&
                     spotPosition.marketIndex !== marketIndex)) {
                 return totalLiabilityValue;
             }
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
-                if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if (types_1.isVariant(spotPosition.balanceType, 'borrow')) {
+                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     let weight = numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION;
                     if (marginCategory === 'Initial') {
                         weight = _1.BN.max(weight, new _1.BN(this.getUserAccount().maxMarginRatio));
@@ -343,8 +343,8 @@ class User {
             }
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (!includeOpenOrders) {
-                if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if (types_1.isVariant(spotPosition.balanceType, 'borrow')) {
+                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     const liabilityValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer);
                     return totalLiabilityValue.add(liabilityValue);
                 }
@@ -352,7 +352,7 @@ class User {
                     return totalLiabilityValue;
                 }
             }
-            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
+            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = spotPosition_1.getWorstCaseTokenAmounts(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
             let newTotalLiabilityValue = totalLiabilityValue;
             if (worstCaseTokenAmount.lt(numericConstants_1.ZERO)) {
                 const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount.abs(), oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer);
@@ -376,9 +376,9 @@ class User {
         }, numericConstants_1.ZERO);
     }
     getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer) {
-        let liabilityValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+        let liabilityValue = _1.getTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
         if (marginCategory !== undefined) {
-            let weight = (0, spotBalance_1.calculateLiabilityWeight)(tokenAmount, spotMarketAccount, marginCategory);
+            let weight = spotBalance_1.calculateLiabilityWeight(tokenAmount, spotMarketAccount, marginCategory);
             if (marginCategory === 'Initial') {
                 weight = _1.BN.max(weight, new _1.BN(this.getUserAccount().maxMarginRatio));
             }
@@ -393,7 +393,7 @@ class User {
     }
     getSpotMarketAssetValue(marketIndex, marginCategory, includeOpenOrders) {
         return this.getUserAccount().spotPositions.reduce((totalAssetValue, spotPosition) => {
-            if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition) ||
+            if (spotPosition_1.isSpotPositionAvailable(spotPosition) ||
                 (marketIndex !== undefined &&
                     spotPosition.marketIndex !== marketIndex)) {
                 return totalAssetValue;
@@ -401,8 +401,8 @@ class User {
             // Todo this needs to account for whether it's based on initial or maintenance requirements
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
-                if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if (types_1.isVariant(spotPosition.balanceType, 'deposit')) {
+                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     return totalAssetValue.add(tokenAmount);
                 }
                 else {
@@ -411,8 +411,8 @@ class User {
             }
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (!includeOpenOrders) {
-                if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if (types_1.isVariant(spotPosition.balanceType, 'deposit')) {
+                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     const assetValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory);
                     return totalAssetValue.add(assetValue);
                 }
@@ -420,7 +420,7 @@ class User {
                     return totalAssetValue;
                 }
             }
-            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
+            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = spotPosition_1.getWorstCaseTokenAmounts(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
             let newTotalAssetValue = totalAssetValue;
             if (worstCaseTokenAmount.gt(numericConstants_1.ZERO)) {
                 const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory);
@@ -433,9 +433,9 @@ class User {
         }, numericConstants_1.ZERO);
     }
     getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory) {
-        let assetValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+        let assetValue = _1.getTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
         if (marginCategory !== undefined) {
-            const weight = (0, spotBalance_1.calculateAssetWeight)(tokenAmount, spotMarketAccount, marginCategory);
+            const weight = spotBalance_1.calculateAssetWeight(tokenAmount, spotMarketAccount, marginCategory);
             assetValue = assetValue.mul(weight).div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
         }
         return assetValue;
@@ -456,8 +456,8 @@ class User {
      */
     getHealth() {
         const userAccount = this.getUserAccount();
-        if ((0, types_1.isVariant)(userAccount.status, 'beingLiquidated') ||
-            (0, types_1.isVariant)(userAccount.status, 'bankrupt')) {
+        if (types_1.isVariant(userAccount.status, 'beingLiquidated') ||
+            types_1.isVariant(userAccount.status, 'bankrupt')) {
             return 0;
         }
         const totalCollateral = this.getTotalCollateral('Maintenance');
@@ -507,25 +507,25 @@ class User {
                 perpPosition.openBids = totalOpenBids;
             }
             let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
-            if ((0, types_1.isVariant)(market.status, 'settlement')) {
+            if (types_1.isVariant(market.status, 'settlement')) {
                 valuationPrice = market.expiryPrice;
             }
             const baseAssetAmount = includeOpenOrders
-                ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
+                ? margin_1.calculateWorstCaseBaseAssetAmount(perpPosition)
                 : perpPosition.baseAssetAmount;
             let baseAssetValue = baseAssetAmount
                 .abs()
                 .mul(valuationPrice)
                 .div(numericConstants_1.AMM_TO_QUOTE_PRECISION_RATIO.mul(numericConstants_1.PRICE_PRECISION));
             if (marginCategory) {
-                let marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory));
+                let marginRatio = new _1.BN(_1.calculateMarketMarginRatio(market, baseAssetAmount.abs(), marginCategory));
                 if (marginCategory === 'Initial') {
                     marginRatio = _1.BN.max(marginRatio, new _1.BN(this.getUserAccount().maxMarginRatio));
                 }
                 if (liquidationBuffer !== undefined) {
                     marginRatio = marginRatio.add(liquidationBuffer);
                 }
-                if ((0, types_1.isVariant)(market.status, 'settlement')) {
+                if (types_1.isVariant(market.status, 'settlement')) {
                     marginRatio = numericConstants_1.ZERO;
                 }
                 baseAssetValue = baseAssetValue
@@ -545,7 +545,7 @@ class User {
     getPerpPositionValue(marketIndex, oraclePriceData) {
         const userPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
-        return (0, margin_1.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData);
+        return margin_1.calculateBaseAssetValueWithOracle(market, userPosition, oraclePriceData);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -564,11 +564,11 @@ class User {
      */
     getPositionEstimatedExitPriceAndPnl(position, amountToClose, useAMMClose = false) {
         const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
-        const entryPrice = (0, position_1.calculateEntryPrice)(position);
+        const entryPrice = position_1.calculateEntryPrice(position);
         const oraclePriceData = this.getOracleDataForPerpMarket(position.marketIndex);
         if (amountToClose) {
             if (amountToClose.eq(numericConstants_1.ZERO)) {
-                return [(0, _1.calculateReservePrice)(market, oraclePriceData), numericConstants_1.ZERO];
+                return [_1.calculateReservePrice(market, oraclePriceData), numericConstants_1.ZERO];
             }
             position = {
                 baseAssetAmount: amountToClose,
@@ -579,10 +579,10 @@ class User {
         }
         let baseAssetValue;
         if (useAMMClose) {
-            baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position, oraclePriceData);
+            baseAssetValue = _1.calculateBaseAssetValue(market, position, oraclePriceData);
         }
         else {
-            baseAssetValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, position, oraclePriceData);
+            baseAssetValue = margin_1.calculateBaseAssetValueWithOracle(market, position, oraclePriceData);
         }
         if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
             return [numericConstants_1.ZERO, numericConstants_1.ZERO];
@@ -628,7 +628,7 @@ class User {
             return numericConstants_1.ZERO;
         }
         const totalLiabilityValue = this.getTotalLiabilityValue();
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, 
+        const marginRatio = _1.calculateMarketMarginRatio(market, 
         // worstCaseBaseAssetAmount.abs(),
         numericConstants_1.ZERO, // todo
         category);
@@ -658,7 +658,7 @@ class User {
         const totalCollateral = this.getTotalCollateral('Maintenance');
         // if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
         let liquidationBuffer = undefined;
-        const isBeingLiquidated = (0, types_1.isVariant)(this.getUserAccount().status, 'beingLiquidated');
+        const isBeingLiquidated = types_1.isVariant(this.getUserAccount().status, 'beingLiquidated');
         if (isBeingLiquidated) {
             liquidationBuffer = new _1.BN(this.driftClient.getStateAccount().liquidationMarginBufferRatio);
         }
@@ -666,13 +666,13 @@ class User {
         return totalCollateral.lt(maintenanceRequirement);
     }
     isBeingLiquidated() {
-        return (0, types_1.isOneOfVariant)(this.getUserAccount().status, [
+        return types_1.isOneOfVariant(this.getUserAccount().status, [
             'beingLiquidated',
             'bankrupt',
         ]);
     }
     isBankrupt() {
-        return (0, types_1.isVariant)(this.getUserAccount().status, 'bankrupt');
+        return types_1.isVariant(this.getUserAccount().status, 'bankrupt');
     }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
@@ -708,7 +708,7 @@ class User {
         const mmr = this.getMaintenanceMarginRequirement();
         const deltaValueToLiq = mtc.sub(mmr); // QUOTE_PRECISION
         const currentSpotMarket = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
-        const tokenAmount = (0, spotBalance_1.getTokenAmount)(currentSpotPosition.scaledBalance, currentSpotMarket, currentSpotPosition.balanceType);
+        const tokenAmount = spotBalance_1.getTokenAmount(currentSpotPosition.scaledBalance, currentSpotMarket, currentSpotPosition.balanceType);
         const tokenAmountQP = tokenAmount
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(new _1.BN(10 ** currentSpotMarket.decimals));
@@ -716,7 +716,7 @@ class User {
             return new _1.BN(-1);
         }
         let liqPriceDelta;
-        if ((0, types_1.isVariant)(currentSpotPosition.balanceType, 'borrow')) {
+        if (types_1.isVariant(currentSpotPosition.balanceType, 'borrow')) {
             liqPriceDelta = deltaValueToLiq
                 .mul(numericConstants_1.PRICE_PRECISION)
                 .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
@@ -780,15 +780,15 @@ class User {
         if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
             return new _1.BN(-1);
         const market = this.driftClient.getPerpMarketAccount(proposedPerpPosition.marketIndex);
-        const proposedPerpPositionValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex));
+        const proposedPerpPositionValue = margin_1.calculateBaseAssetValueWithOracle(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex));
         // total position value after trade
         const totalPositionValueAfterTrade = totalPositionValueExcludingTargetMarket.add(proposedPerpPositionValue);
         const marginRequirementExcludingTargetMarket = this.getUserAccount().perpPositions.reduce((totalMarginRequirement, position) => {
             if (position.marketIndex !== perpPosition.marketIndex) {
                 const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
-                const positionValue = (0, margin_1.calculateBaseAssetValueWithOracle)(market, position, this.getOracleDataForPerpMarket(market.marketIndex));
+                const positionValue = margin_1.calculateBaseAssetValueWithOracle(market, position, this.getOracleDataForPerpMarket(market.marketIndex));
                 const marketMarginRequirement = positionValue
-                    .mul(new _1.BN((0, _1.calculateMarketMarginRatio)(market, position.baseAssetAmount.abs(), 'Maintenance')))
+                    .mul(new _1.BN(_1.calculateMarketMarginRatio(market, position.baseAssetAmount.abs(), 'Maintenance')))
                     .div(numericConstants_1.MARGIN_PRECISION);
                 totalMarginRequirement = totalMarginRequirement.add(marketMarginRequirement);
             }
@@ -797,11 +797,11 @@ 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
-            .mul(new _1.BN((0, _1.calculateMarketMarginRatio)(market, proposedPerpPosition.baseAssetAmount.abs(), 'Maintenance')))
+            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, proposedPerpPosition.baseAssetAmount.abs(), 'Maintenance')))
             .div(numericConstants_1.MARGIN_PRECISION));
         const freeCollateralAfterTrade = totalCollateral.sub(marginRequirementAfterTrade);
         const marketMaxLeverage = this.getMaxLeverage(proposedPerpPosition.marketIndex, 'Maintenance');
@@ -824,13 +824,13 @@ class User {
         }
         let markPriceAfterTrade;
         if (positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
-            markPriceAfterTrade = (0, _1.calculateReservePrice)(this.driftClient.getPerpMarketAccount(perpPosition.marketIndex), this.getOracleDataForPerpMarket(perpPosition.marketIndex));
+            markPriceAfterTrade = _1.calculateReservePrice(this.driftClient.getPerpMarketAccount(perpPosition.marketIndex), this.getOracleDataForPerpMarket(perpPosition.marketIndex));
         }
         else {
             const direction = positionBaseSizeChange.gt(numericConstants_1.ZERO)
                 ? _1.PositionDirection.LONG
                 : _1.PositionDirection.SHORT;
-            markPriceAfterTrade = (0, _1.calculateTradeSlippage)(direction, positionBaseSizeChange.abs(), this.driftClient.getPerpMarketAccount(perpPosition.marketIndex), 'base', this.getOracleDataForPerpMarket(perpPosition.marketIndex))[3]; // newPrice after swap
+            markPriceAfterTrade = _1.calculateTradeSlippage(direction, positionBaseSizeChange.abs(), this.driftClient.getPerpMarketAccount(perpPosition.marketIndex), 'base', this.getOracleDataForPerpMarket(perpPosition.marketIndex))[3]; // newPrice after swap
         }
         if (priceDelta.gt(markPriceAfterTrade)) {
             return new _1.BN(-1);
@@ -881,7 +881,7 @@ class User {
     getMaxTradeSizeUSDC(targetMarketIndex, tradeSide) {
         const currentPosition = this.getPerpPosition(targetMarketIndex) ||
             this.getEmptyPosition(targetMarketIndex);
-        const targetSide = (0, types_1.isVariant)(tradeSide, 'short') ? 'short' : 'long';
+        const targetSide = types_1.isVariant(tradeSide, 'short') ? 'short' : 'long';
         const currentPositionSide = (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())
             ? 'short'
             : 'long';
@@ -992,7 +992,7 @@ class User {
     getWithdrawalLimit(marketIndex, reduceOnly) {
         const nowTs = new _1.BN(Math.floor(Date.now() / 1000));
         const spotMarket = this.driftClient.getSpotMarketAccount(marketIndex);
-        const { borrowLimit, withdrawLimit } = (0, spotBalance_1.calculateWithdrawLimit)(spotMarket, nowTs);
+        const { borrowLimit, withdrawLimit } = spotBalance_1.calculateWithdrawLimit(spotMarket, nowTs);
         const freeCollateral = this.getFreeCollateral();
         const oracleData = this.getOracleDataForSpotMarket(marketIndex);
         const precisionIncrease = numericConstants_1.TEN.pow(new _1.BN(spotMarket.decimals - 6));
@@ -1002,10 +1002,10 @@ class User {
             .mul(numericConstants_1.PRICE_PRECISION)
             .div(oracleData.price)
             .mul(precisionIncrease);
-        const userSpotPosition = this.getUserAccount().spotPositions.find((spotPosition) => (0, types_1.isVariant)(spotPosition.balanceType, 'deposit') &&
+        const userSpotPosition = this.getUserAccount().spotPositions.find((spotPosition) => types_1.isVariant(spotPosition.balanceType, 'deposit') &&
             spotPosition.marketIndex == marketIndex);
         const userSpotBalance = userSpotPosition
-            ? (0, spotBalance_1.getTokenAmount)(userSpotPosition.scaledBalance, this.driftClient.getSpotMarketAccount(marketIndex), _1.SpotBalanceType.DEPOSIT)
+            ? spotBalance_1.getTokenAmount(userSpotPosition.scaledBalance, this.driftClient.getSpotMarketAccount(marketIndex), _1.SpotBalanceType.DEPOSIT)
             : numericConstants_1.ZERO;
         const maxWithdrawValue = _1.BN.min(_1.BN.min(amountWithdrawable, userSpotBalance), withdrawLimit.abs());
         if (reduceOnly) {

package/lib/userMap/userMap.js

@@ -26,7 +26,7 @@ class UserMap {
             userAccountArray.push(programUserAccount.account);
         }
         if (this.accountSubscription.type === 'polling') {
-            await (0, __1.bulkPollingUserSubscribe)(userArray, this.accountSubscription.accountLoader);
+            await __1.bulkPollingUserSubscribe(userArray, this.accountSubscription.accountLoader);
         }
         else {
             await Promise.all(userArray.map((user, i) => user.subscribe(userAccountArray[i])));

package/lib/userMap/userStatsMap.js

@@ -23,14 +23,14 @@ class UserStatsMap {
             }
             const chUserStat = new __1.UserStats({
                 driftClient: this.driftClient,
-                userStatsAccountPublicKey: (0, __1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, userStat.authority),
+                userStatsAccountPublicKey: __1.getUserStatsAccountPublicKey(this.driftClient.program.programId, userStat.authority),
                 accountSubscription: this.accountSubscription,
             });
             userStatArray.push(chUserStat);
             userStatsAccountArray.push(userStat);
         }
         if (this.accountSubscription.type === 'polling') {
-            await (0, __1.bulkPollingUserStatsSubscribe)(userStatArray, this.accountSubscription.accountLoader);
+            await __1.bulkPollingUserStatsSubscribe(userStatArray, this.accountSubscription.accountLoader);
         }
         else {
             await Promise.all(userStatArray.map((userStat, i) => userStat.subscribe(userStatsAccountArray[i])));
@@ -42,7 +42,7 @@ class UserStatsMap {
     async addUserStat(authority) {
         const userStat = new __1.UserStats({
             driftClient: this.driftClient,
-            userStatsAccountPublicKey: (0, __1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, authority),
+            userStatsAccountPublicKey: __1.getUserStatsAccountPublicKey(this.driftClient.program.programId, authority),
             accountSubscription: this.accountSubscription,
         });
         await userStat.subscribe();

package/lib/userStats.js

@@ -40,8 +40,8 @@ class UserStats {
         }
         else {
             return {
-                referrer: (0, pda_1.getUserAccountPublicKeySync)(this.driftClient.program.programId, this.getAccount().referrer, 0),
-                referrerStats: (0, pda_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, this.getAccount().referrer),
+                referrer: pda_1.getUserAccountPublicKeySync(this.driftClient.program.programId, this.getAccount().referrer, 0),
+                referrerStats: pda_1.getUserStatsAccountPublicKey(this.driftClient.program.programId, this.getAccount().referrer),
             };
         }
     }

package/package.json

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

package/src/driftClient.ts

@@ -22,6 +22,7 @@ import {
 	OrderType,
 	ReferrerInfo,
 	MarketType,
+	TxParams,
 	SerumV3FulfillmentConfigAccount,
 	isVariant,
 } from './types';
@@ -2248,7 +2249,8 @@ export class DriftClient {
 		order?: Order,
 		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
 		makerInfo?: MakerInfo,
-		referrerInfo?: ReferrerInfo
+		referrerInfo?: ReferrerInfo,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
 			wrapInTx(
@@ -2259,7 +2261,9 @@ export class DriftClient {
 					fulfillmentConfig,
 					makerInfo,
 					referrerInfo
-				)
+				),
+				txParams?.computeUnits,
+				txParams?.computeUnitsPrice
 			),
 			[],
 			this.opts
@@ -2704,7 +2708,8 @@ export class DriftClient {
 		orderParams: OptionalOrderParams,
 		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
 		makerInfo?: MakerInfo,
-		referrerInfo?: ReferrerInfo
+		referrerInfo?: ReferrerInfo,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
@@ -2713,7 +2718,9 @@ export class DriftClient {
 					fulfillmentConfig,
 					makerInfo,
 					referrerInfo
-				)
+				),
+				txParams?.computeUnits,
+				txParams?.computeUnitsPrice
 			),
 			[],
 			this.opts

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.12.0-beta.1",
+  "version": "2.12.0-beta.3",
   "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/tx/utils.ts

@@ -8,14 +8,22 @@ const COMPUTE_UNITS_DEFAULT = 200_000;
 
 export function wrapInTx(
 	instruction: TransactionInstruction,
-	computeUnits = 600_000 // TODO, requires less code change
+	computeUnits = 600_000,
+	computeUnitsPrice = 0
 ): Transaction {
 	const tx = new Transaction();
 	if (computeUnits != COMPUTE_UNITS_DEFAULT) {
 		tx.add(
-			ComputeBudgetProgram.requestUnits({
+			ComputeBudgetProgram.setComputeUnitLimit({
 				units: computeUnits,
-				additionalFee: 0,
+			})
+		);
+	}
+
+	if (computeUnitsPrice != 0) {
+		tx.add(
+			ComputeBudgetProgram.setComputeUnitPrice({
+				microLamports: computeUnitsPrice,
 			})
 		);
 	}

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;
@@ -907,6 +909,11 @@ export type ReferrerInfo = {
 	referrerStats: PublicKey;
 };
 
+export type TxParams = {
+	computeUnits?: number;
+	computeUnitsPrice?: number;
+};
+
 // # Misc Types
 export interface IWallet {
 	signTransaction(tx: Transaction): Promise<Transaction>;

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,