@drift-labs/sdk 2.14.0-beta.0 → 2.15.0-beta.0

package/lib/user.js

@@ -142,7 +142,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);
@@ -245,13 +245,13 @@ class User {
     getBuyingPower(marketIndex) {
         const perpPosition = this.getPerpPosition(marketIndex);
         const worstCaseBaseAssetAmount = perpPosition
-            ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
+            ? margin_1.calculateWorstCaseBaseAssetAmount(perpPosition)
             : numericConstants_1.ZERO;
         const freeCollateral = this.getFreeCollateral();
         return this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount);
     }
     getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount) {
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial');
+        const marginRatio = _1.calculateMarketMarginRatio(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial');
         return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio));
     }
     /**
@@ -302,11 +302,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));
                 }
             }
@@ -322,21 +322,21 @@ 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, strict = false, now) {
         now = now || new _1.BN(new Date().getTime() / 1000);
         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));
@@ -352,8 +352,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, strict, now);
                     return totalLiabilityValue.add(liabilityValue);
                 }
@@ -361,7 +361,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, strict, now);
@@ -387,15 +387,15 @@ class User {
     getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict = false, now) {
         let liabilityValue = null;
         if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
-            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+            const estOracleTwap = oracles_1.calculateLiveOracleTwap(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
-            liabilityValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
+            liabilityValue = _1.getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
         }
         else {
-            liabilityValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+            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));
             }
@@ -411,7 +411,7 @@ class User {
     getSpotMarketAssetValue(marketIndex, marginCategory, includeOpenOrders, strict = false, now) {
         now = now || new _1.BN(new Date().getTime() / 1000);
         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;
@@ -419,8 +419,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 {
@@ -429,8 +429,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, strict, now);
                     return totalAssetValue.add(assetValue);
                 }
@@ -438,7 +438,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, strict, now);
@@ -453,15 +453,15 @@ class User {
     getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict = false, now) {
         let assetValue = null;
         if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
-            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+            const estOracleTwap = oracles_1.calculateLiveOracleTwap(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
-            assetValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
+            assetValue = _1.getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
         }
         else {
-            assetValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+            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;
@@ -482,8 +482,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');
@@ -529,25 +529,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
@@ -567,7 +567,7 @@ class User {
     getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
         const userPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
-        return (0, margin_1.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData, includeOpenOrders);
+        return margin_1.calculateBaseAssetValueWithOracle(market, userPosition, oraclePriceData, includeOpenOrders);
     }
     getPositionSide(currentPosition) {
         if (currentPosition.baseAssetAmount.gt(numericConstants_1.ZERO)) {
@@ -586,11 +586,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,
@@ -601,10 +601,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];
@@ -656,7 +656,7 @@ class User {
             return numericConstants_1.ZERO;
         }
         const totalLiabilityValue = totalPerpLiability.add(totalSpotLiability);
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, 
+        const marginRatio = _1.calculateMarketMarginRatio(market, 
         // worstCaseBaseAssetAmount.abs(),
         numericConstants_1.ZERO, // todo
         category);
@@ -689,7 +689,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);
         }
@@ -697,13 +697,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
@@ -737,7 +737,7 @@ class User {
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
         const freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
         const market = this.driftClient.getSpotMarketAccount(marketIndex);
-        const signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(currentSpotPosition.scaledBalance, market, currentSpotPosition.balanceType), currentSpotPosition.balanceType);
+        const signedTokenAmount = _1.getSignedTokenAmount(spotBalance_1.getTokenAmount(currentSpotPosition.scaledBalance, market, currentSpotPosition.balanceType), currentSpotPosition.balanceType);
         if (signedTokenAmount.eq(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
@@ -777,7 +777,7 @@ class User {
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
         const freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
-        const currentPerpPosition = this.getPerpPosition(marketIndex);
+        const currentPerpPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
         let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange);
         if (!freeCollateralDelta) {
             return new _1.BN(-1);
@@ -789,7 +789,7 @@ class User {
         if (spotMarketWithSameOracle) {
             const spotPosition = this.getSpotPosition(spotMarketWithSameOracle.marketIndex);
             if (spotPosition) {
-                const signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
+                const signedTokenAmount = _1.getSignedTokenAmount(spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
                 const spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount);
                 freeCollateralDelta = freeCollateralDelta.add(spotFreeCollateralDelta || numericConstants_1.ZERO);
             }
@@ -809,11 +809,11 @@ class User {
     }
     calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange) {
         const currentBaseAssetAmount = perpPosition.baseAssetAmount;
-        const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
+        const worstCaseBaseAssetAmount = margin_1.calculateWorstCaseBaseAssetAmount(perpPosition);
         const orderBaseAssetAmount = worstCaseBaseAssetAmount.sub(currentBaseAssetAmount);
         const proposedBaseAssetAmount = currentBaseAssetAmount.add(positionBaseSizeChange);
         const proposedWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
-        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, proposedWorstCaseBaseAssetAmount.abs(), 'Maintenance');
+        const marginRatio = _1.calculateMarketMarginRatio(market, proposedWorstCaseBaseAssetAmount.abs(), 'Maintenance');
         const marginRatioQuotePrecision = new _1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
@@ -840,14 +840,14 @@ class User {
     calculateFreeCollateralDeltaForSpot(market, signedTokenAmount) {
         const tokenPrecision = new _1.BN(Math.pow(10, market.decimals));
         if (signedTokenAmount.gt(numericConstants_1.ZERO)) {
-            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, market, 'Maintenance');
+            const assetWeight = spotBalance_1.calculateAssetWeight(signedTokenAmount, market, 'Maintenance');
             return numericConstants_1.QUOTE_PRECISION.mul(assetWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
                 .mul(signedTokenAmount)
                 .div(tokenPrecision);
         }
         else {
-            const liabilityWeight = (0, spotBalance_1.calculateLiabilityWeight)(signedTokenAmount.abs(), market, 'Maintenance');
+            const liabilityWeight = spotBalance_1.calculateLiabilityWeight(signedTokenAmount.abs(), market, 'Maintenance');
             return numericConstants_1.QUOTE_PRECISION.neg()
                 .mul(liabilityWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
@@ -897,7 +897,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';
@@ -1009,7 +1009,7 @@ class User {
         const nowTs = new _1.BN(Math.floor(Date.now() / 1000));
         const spotMarket = this.driftClient.getSpotMarketAccount(marketIndex);
         // eslint-disable-next-line prefer-const
-        let { borrowLimit, withdrawLimit } = (0, spotBalance_1.calculateWithdrawLimit)(spotMarket, nowTs);
+        let { 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));
@@ -1055,7 +1055,7 @@ class User {
                 netDeposits,
             };
         }
-        if ((0, types_1.isVariant)(position.balanceType, 'borrow')) {
+        if (types_1.isVariant(position.balanceType, 'borrow')) {
             return {
                 canBypass: false,
                 maxDepositAmount,
@@ -1063,7 +1063,7 @@ class User {
                 depositAmount: numericConstants_1.ZERO,
             };
         }
-        const depositAmount = (0, spotBalance_1.getTokenAmount)(position.scaledBalance, spotMarket, 'deposit');
+        const depositAmount = spotBalance_1.getTokenAmount(position.scaledBalance, spotMarket, 'deposit');
         if (netDeposits.lt(numericConstants_1.ZERO)) {
             return {
                 canBypass: false,

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.14.0-beta.0",
+	"version": "2.15.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/assert/assert.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assert = void 0;
+function assert(condition, error) {
+    if (!condition) {
+        throw new Error(error || 'Unspecified AssertionError');
+    }
+}
+exports.assert = assert;

package/src/constants/numericConstants.ts

@@ -17,6 +17,7 @@ export const BN_MAX = new BN(Number.MAX_SAFE_INTEGER);
 export const TEN_MILLION = TEN_THOUSAND.mul(TEN_THOUSAND);
 
 export const MAX_LEVERAGE = new BN(5);
+export const MAX_LEVERAGE_ORDER_SIZE = new BN('18446744073709551615');
 
 export const PERCENTAGE_PRECISION_EXP = new BN(6);
 export const PERCENTAGE_PRECISION = new BN(10).pow(PERCENTAGE_PRECISION_EXP);

package/src/constants/perpMarkets.ts

@@ -44,6 +44,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1637691133472,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Aptos',
+		category: ['L1', 'Infra'],
+		symbol: 'APT-PERP',
+		baseAssetSymbol: 'APT',
+		marketIndex: 3,
+		oracle: new PublicKey('5d2QJ6u2NveZufmJ4noHja5EHs3Bv1DUMPLG5xfasSVs'),
+		launchTs: 1675610186000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [

package/src/dlob/DLOB.ts

@@ -951,7 +951,7 @@ export class DLOB {
 	}
 
 	isRestingLimitOrder(order: Order, slot: number): boolean {
-		return order.postOnly || new BN(slot).sub(order.slot).gte(new BN(15));
+		return order.postOnly || new BN(slot).sub(order.slot).gte(new BN(45));
 	}
 
 	*getLimitBids(

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.14.0-beta.0",
+  "version": "2.15.0-0",
   "name": "drift",
   "instructions": [
     {

package/src/token/index.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseTokenAccount = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+function parseTokenAccount(data) {
+    const accountInfo = spl_token_1.AccountLayout.decode(data);
+    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
+    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
+    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
+    if (accountInfo.delegateOption === 0) {
+        accountInfo.delegate = null;
+        // eslint-disable-next-line new-cap
+        accountInfo.delegatedAmount = new spl_token_1.u64(0);
+    }
+    else {
+        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
+        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
+    }
+    accountInfo.isInitialized = accountInfo.state !== 0;
+    accountInfo.isFrozen = accountInfo.state === 2;
+    if (accountInfo.isNativeOption === 1) {
+        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
+        accountInfo.isNative = true;
+    }
+    else {
+        accountInfo.rentExemptReserve = null;
+        accountInfo.isNative = false;
+    }
+    if (accountInfo.closeAuthorityOption === 0) {
+        accountInfo.closeAuthority = null;
+    }
+    else {
+        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
+    }
+    return accountInfo;
+}
+exports.parseTokenAccount = parseTokenAccount;

package/src/tx/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/tx/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapInTx = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const COMPUTE_UNITS_DEFAULT = 200000;
+function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
+) {
+    const tx = new web3_js_1.Transaction();
+    if (computeUnits != COMPUTE_UNITS_DEFAULT) {
+        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
+            units: computeUnits,
+            additionalFee: 0,
+        }));
+    }
+    return tx.add(instruction);
+}
+exports.wrapInTx = wrapInTx;

package/src/user.ts

@@ -1377,7 +1377,8 @@ export class User {
 		);
 
 		const market = this.driftClient.getPerpMarketAccount(marketIndex);
-		const currentPerpPosition = this.getPerpPosition(marketIndex);
+		const currentPerpPosition =
+			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
 
 		let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(
 			market,

package/src/util/computeUnits.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findComputeUnitConsumption = void 0;
+function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tx = yield connection.getTransaction(txSignature, { commitment });
+        const computeUnits = [];
+        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
+        tx.meta.logMessages.forEach((logMessage) => {
+            const match = logMessage.match(regex);
+            if (match && match[1]) {
+                computeUnits.push(match[1]);
+            }
+        });
+        return computeUnits;
+    });
+}
+exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getTokenAddress = void 0;
+const spl_token_1 = require("@solana/spl-token");
+const web3_js_1 = require("@solana/web3.js");
+const getTokenAddress = (mintAddress, userPubKey) => {
+    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
+};
+exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promiseTimeout = void 0;
+function promiseTimeout(promise, timeoutMs) {
+    let timeoutId;
+    const timeoutPromise = new Promise((resolve) => {
+        timeoutId = setTimeout(() => resolve(null), timeoutMs);
+    });
+    return Promise.race([promise, timeoutPromise]).then((result) => {
+        clearTimeout(timeoutId);
+        return result;
+    });
+}
+exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -0,0 +1,27 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.estimateTps = void 0;
+function estimateTps(programId, connection, failed) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
+        if (failed) {
+            signatures = signatures.filter((signature) => signature.err);
+        }
+        const numberOfSignatures = signatures.length;
+        if (numberOfSignatures === 0) {
+            return 0;
+        }
+        return (numberOfSignatures /
+            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
+    });
+}
+exports.estimateTps = estimateTps;