@drift-labs/sdk 2.13.0 → 2.14.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] = amm_1.calculateMarketOpenBidAsk(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
+        const [marketOpenBids, marketOpenAsks] = (0, 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
-            ? margin_1.calculateWorstCaseBaseAssetAmount(perpPosition)
+            ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
             : numericConstants_1.ZERO;
         const freeCollateral = this.getFreeCollateral();
         return this.getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount);
     }
     getBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount) {
-        const marginRatio = _1.calculateMarketMarginRatio(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial');
+        const marginRatio = (0, _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 = _1.calculatePositionPNL(market, perpPosition, withFunding, oraclePriceData);
+            let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                     positionUnrealizedPnl = positionUnrealizedPnl
-                        .mul(_1.calculateUnrealizedAssetWeight(market, quoteSpotMarket, positionUnrealizedPnl, withWeightMarginCategory, oraclePriceData))
+                        .mul((0, _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(_1.calculatePositionFundingPNL(market, perpPosition));
+            return pnl.add((0, _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 (spotPosition_1.isSpotPositionAvailable(spotPosition) ||
+            if ((0, 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 (types_1.isVariant(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
+                    const tokenAmount = (0, 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 (types_1.isVariant(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
+                    const tokenAmount = (0, 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] = spotPosition_1.getWorstCaseTokenAmounts(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
+            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, 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 = oracles_1.calculateLiveOracleTwap(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
-            liabilityValue = _1.getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
+            liabilityValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
         }
         else {
-            liabilityValue = _1.getTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+            liabilityValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
         }
         if (marginCategory !== undefined) {
-            let weight = spotBalance_1.calculateLiabilityWeight(tokenAmount, spotMarketAccount, marginCategory);
+            let weight = (0, 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 (spotPosition_1.isSpotPositionAvailable(spotPosition) ||
+            if ((0, 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 (types_1.isVariant(spotPosition.balanceType, 'deposit')) {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
+                    const tokenAmount = (0, 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 (types_1.isVariant(spotPosition.balanceType, 'deposit')) {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                if ((0, types_1.isVariant)(spotPosition.balanceType, 'deposit')) {
+                    const tokenAmount = (0, 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] = spotPosition_1.getWorstCaseTokenAmounts(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
+            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, 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 = oracles_1.calculateLiveOracleTwap(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
             );
-            assetValue = _1.getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
+            assetValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
         }
         else {
-            assetValue = _1.getTokenValue(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
+            assetValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
         }
         if (marginCategory !== undefined) {
-            const weight = spotBalance_1.calculateAssetWeight(tokenAmount, spotMarketAccount, marginCategory);
+            const weight = (0, 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 (types_1.isVariant(userAccount.status, 'beingLiquidated') ||
-            types_1.isVariant(userAccount.status, 'bankrupt')) {
+        if ((0, types_1.isVariant)(userAccount.status, 'beingLiquidated') ||
+            (0, 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 (types_1.isVariant(market.status, 'settlement')) {
+            if ((0, types_1.isVariant)(market.status, 'settlement')) {
                 valuationPrice = market.expiryPrice;
             }
             const baseAssetAmount = includeOpenOrders
-                ? margin_1.calculateWorstCaseBaseAssetAmount(perpPosition)
+                ? (0, 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(_1.calculateMarketMarginRatio(market, baseAssetAmount.abs(), marginCategory));
+                let marginRatio = new _1.BN((0, _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 (types_1.isVariant(market.status, 'settlement')) {
+                if ((0, 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 margin_1.calculateBaseAssetValueWithOracle(market, userPosition, oraclePriceData, includeOpenOrders);
+        return (0, 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 = position_1.calculateEntryPrice(position);
+        const entryPrice = (0, position_1.calculateEntryPrice)(position);
         const oraclePriceData = this.getOracleDataForPerpMarket(position.marketIndex);
         if (amountToClose) {
             if (amountToClose.eq(numericConstants_1.ZERO)) {
-                return [_1.calculateReservePrice(market, oraclePriceData), numericConstants_1.ZERO];
+                return [(0, _1.calculateReservePrice)(market, oraclePriceData), numericConstants_1.ZERO];
             }
             position = {
                 baseAssetAmount: amountToClose,
@@ -601,10 +601,10 @@ class User {
         }
         let baseAssetValue;
         if (useAMMClose) {
-            baseAssetValue = _1.calculateBaseAssetValue(market, position, oraclePriceData);
+            baseAssetValue = (0, _1.calculateBaseAssetValue)(market, position, oraclePriceData);
         }
         else {
-            baseAssetValue = margin_1.calculateBaseAssetValueWithOracle(market, position, oraclePriceData);
+            baseAssetValue = (0, 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 = _1.calculateMarketMarginRatio(market, 
+        const marginRatio = (0, _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 = types_1.isVariant(this.getUserAccount().status, 'beingLiquidated');
+        const isBeingLiquidated = (0, 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 types_1.isOneOfVariant(this.getUserAccount().status, [
+        return (0, types_1.isOneOfVariant)(this.getUserAccount().status, [
             'beingLiquidated',
             'bankrupt',
         ]);
     }
     isBankrupt() {
-        return types_1.isVariant(this.getUserAccount().status, 'bankrupt');
+        return (0, types_1.isVariant)(this.getUserAccount().status, 'bankrupt');
     }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
@@ -724,139 +724,136 @@ class User {
         return false;
     }
     /**
-     * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
-     * @param PerpPosition
-     * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
-     * @param partial
+     * Calculate the liquidation price of a spot position
+     * @param marketIndex
      * @returns Precision : PRICE_PRECISION
      */
-    spotLiquidationPrice(spotPosition) {
-        const currentSpotPosition = this.getSpotPosition(spotPosition.marketIndex);
+    spotLiquidationPrice(marketIndex) {
+        const currentSpotPosition = this.getSpotPosition(marketIndex);
         if (!currentSpotPosition) {
             return new _1.BN(-1);
         }
-        const mtc = this.getTotalCollateral('Maintenance');
-        const mmr = this.getMaintenanceMarginRequirement();
-        const deltaValueToLiq = mtc.sub(mmr); // QUOTE_PRECISION
-        const currentSpotMarket = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
-        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));
-        if (tokenAmountQP.abs().eq(numericConstants_1.ZERO)) {
+        const totalCollateral = this.getTotalCollateral('Maintenance');
+        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);
+        if (signedTokenAmount.eq(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
-        let liqPriceDelta;
-        if (types_1.isVariant(currentSpotPosition.balanceType, 'borrow')) {
-            liqPriceDelta = deltaValueToLiq
-                .mul(numericConstants_1.PRICE_PRECISION)
-                .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
-                .div(tokenAmountQP)
-                .div(new _1.BN(currentSpotMarket.maintenanceLiabilityWeight));
+        let freeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(market, signedTokenAmount);
+        const oracle = market.oracle;
+        const perpMarketWithSameOracle = this.driftClient
+            .getPerpMarketAccounts()
+            .find((market) => market.amm.oracle.equals(oracle));
+        if (perpMarketWithSameOracle) {
+            const perpPosition = this.getPerpPosition(perpMarketWithSameOracle.marketIndex);
+            if (perpPosition) {
+                const freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO);
+                freeCollateralDelta = freeCollateralDelta.add(freeCollateralDeltaForPerp || numericConstants_1.ZERO);
+            }
         }
-        else {
-            liqPriceDelta = deltaValueToLiq
-                .mul(numericConstants_1.PRICE_PRECISION)
-                .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
-                .div(tokenAmountQP)
-                .div(new _1.BN(currentSpotMarket.maintenanceAssetWeight))
-                .mul(new _1.BN(-1));
+        if (freeCollateralDelta.eq(numericConstants_1.ZERO)) {
+            return new _1.BN(-1);
+        }
+        const oraclePrice = this.driftClient.getOracleDataForSpotMarket(marketIndex).price;
+        const liqPriceDelta = freeCollateral
+            .mul(numericConstants_1.QUOTE_PRECISION)
+            .div(freeCollateralDelta);
+        const liqPrice = oraclePrice.sub(liqPriceDelta);
+        if (liqPrice.lt(numericConstants_1.ZERO)) {
+            return new _1.BN(-1);
         }
-        const currentPrice = this.driftClient.getOracleDataForSpotMarket(spotPosition.marketIndex).price;
-        const liqPrice = currentPrice.add(liqPriceDelta);
         return liqPrice;
     }
     /**
      * Calculate the liquidation price of a perp position, with optional parameter to calculate the liquidation price after a trade
-     * @param PerpPosition
+     * @param marketIndex
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
-     * @param partial
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(perpPosition, positionBaseSizeChange = numericConstants_1.ZERO) {
-        // solves formula for example canBeLiquidated below
-        /* example: assume BTC price is $40k (examine 10% up/down)
-
-        if 10k deposit and levered 10x short BTC => BTC up $400 means:
-        1. higher base_asset_value (+$4k)
-        2. lower collateral (-$4k)
-        3. (10k - 4k)/(100k + 4k) => 6k/104k => .0576
-
-        for 10x long, BTC down $400:
-        3. (10k - 4k) / (100k - 4k) = 6k/96k => .0625 */
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO) {
         const totalCollateral = this.getTotalCollateral('Maintenance');
-        // calculate the total position value ignoring any value from the target market of the trade
-        const totalPositionValueExcludingTargetMarket = this.getTotalPerpPositionValueExcludingMarket(perpPosition.marketIndex, undefined, undefined, true);
-        const currentPerpPosition = this.getPerpPosition(perpPosition.marketIndex) ||
-            this.getEmptyPosition(perpPosition.marketIndex);
-        const currentPerpPositionBaseSize = currentPerpPosition.baseAssetAmount;
-        const proposedBaseAssetAmount = currentPerpPositionBaseSize.add(positionBaseSizeChange);
-        // calculate position for current market after trade
-        const proposedPerpPosition = {
-            marketIndex: perpPosition.marketIndex,
-            baseAssetAmount: proposedBaseAssetAmount,
-            remainderBaseAssetAmount: 0,
-            quoteAssetAmount: currentPerpPosition.quoteAssetAmount,
-            lastCumulativeFundingRate: numericConstants_1.ZERO,
-            quoteBreakEvenAmount: new _1.BN(0),
-            quoteEntryAmount: new _1.BN(0),
-            openOrders: 0,
-            openBids: currentPerpPosition.openBids,
-            openAsks: currentPerpPosition.openAsks,
-            settledPnl: numericConstants_1.ZERO,
-            lpShares: numericConstants_1.ZERO,
-            lastBaseAssetAmountPerLp: numericConstants_1.ZERO,
-            lastQuoteAssetAmountPerLp: numericConstants_1.ZERO,
-        };
-        if (proposedBaseAssetAmount.eq(numericConstants_1.ZERO))
+        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);
+        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange);
+        if (!freeCollateralDelta) {
             return new _1.BN(-1);
-        const market = this.driftClient.getPerpMarketAccount(proposedPerpPosition.marketIndex);
-        const proposedPerpPositionValue = margin_1.calculateBaseAssetValueWithOracle(market, proposedPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex), true);
-        // total position value after trade
-        const totalPositionValueAfterTrade = totalPositionValueExcludingTargetMarket.add(proposedPerpPositionValue);
-        const marginRequirementOfAll = this.getMaintenanceMarginRequirement();
-        const positionValue = margin_1.calculateBaseAssetValueWithOracle(market, currentPerpPosition, this.getOracleDataForPerpMarket(market.marketIndex), true);
-        const marginRequirementOfTargetMarket = positionValue
-            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, margin_1.calculateWorstCaseBaseAssetAmount(currentPerpPosition).abs(), 'Maintenance')))
-            .div(numericConstants_1.MARGIN_PRECISION);
-        const marginRequirementExcludingTargetMarket = marginRequirementOfAll.sub(marginRequirementOfTargetMarket);
-        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.gt(numericConstants_1.ZERO)) {
+        }
+        const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
+        const spotMarketWithSameOracle = this.driftClient
+            .getSpotMarketAccounts()
+            .find((market) => market.oracle.equals(oracle));
+        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 spotFreeCollateralDelta = this.calculateFreeCollateralDeltaForSpot(spotMarketWithSameOracle, signedTokenAmount);
+                freeCollateralDelta = freeCollateralDelta.add(spotFreeCollateralDelta || numericConstants_1.ZERO);
+            }
+        }
+        if (freeCollateralDelta.eq(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
-        const proposedWorstCastBaseAssetAmount = margin_1.calculateWorstCaseBaseAssetAmount(proposedPerpPosition);
-        const marginRequirementTargetMarket = proposedPerpPositionValue
-            .mul(new _1.BN(_1.calculateMarketMarginRatio(market, proposedWorstCastBaseAssetAmount.abs(), 'Maintenance')))
+        const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
+        const liqPriceDelta = freeCollateral
+            .mul(numericConstants_1.QUOTE_PRECISION)
+            .div(freeCollateralDelta);
+        const liqPrice = oraclePrice.sub(liqPriceDelta);
+        if (liqPrice.lt(numericConstants_1.ZERO)) {
+            return new _1.BN(-1);
+        }
+        return liqPrice;
+    }
+    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange) {
+        const currentBaseAssetAmount = perpPosition.baseAssetAmount;
+        const worstCaseBaseAssetAmount = (0, 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 marginRatioQuotePrecision = new _1.BN(marginRatio)
+            .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
-        const marginRequirementAfterTrade = marginRequirementExcludingTargetMarket.add(marginRequirementTargetMarket);
-        const freeCollateralAfterTrade = totalCollateral.sub(marginRequirementAfterTrade);
-        const marketMaxMaintLeverage = new _1.BN(numericConstants_1.TEN_THOUSAND.mul(numericConstants_1.TEN_THOUSAND).toNumber() /
-            _1.calculateMarketMarginRatio(market, proposedWorstCastBaseAssetAmount.abs(), 'Maintenance'));
-        let priceDelta;
-        if (proposedBaseAssetAmount.lt(numericConstants_1.ZERO)) {
-            priceDelta = freeCollateralAfterTrade
-                .mul(marketMaxMaintLeverage) // precision is TEN_THOUSAND
-                .div(marketMaxMaintLeverage.add(numericConstants_1.TEN_THOUSAND))
-                .mul(numericConstants_1.PRICE_TO_QUOTE_PRECISION)
-                .mul(numericConstants_1.AMM_RESERVE_PRECISION)
-                .div(proposedBaseAssetAmount);
+        if (proposedWorstCaseBaseAssetAmount.eq(numericConstants_1.ZERO)) {
+            return undefined;
+        }
+        let freeCollateralDelta = numericConstants_1.ZERO;
+        if (proposedBaseAssetAmount.gt(numericConstants_1.ZERO)) {
+            freeCollateralDelta = numericConstants_1.QUOTE_PRECISION.sub(marginRatioQuotePrecision)
+                .mul(proposedBaseAssetAmount)
+                .div(numericConstants_1.BASE_PRECISION);
         }
         else {
-            priceDelta = freeCollateralAfterTrade
-                .mul(marketMaxMaintLeverage) // precision is TEN_THOUSAND
-                .div(marketMaxMaintLeverage.sub(numericConstants_1.TEN_THOUSAND))
-                .mul(numericConstants_1.PRICE_TO_QUOTE_PRECISION)
-                .mul(numericConstants_1.AMM_RESERVE_PRECISION)
-                .div(proposedBaseAssetAmount);
-        }
-        const currentPrice = this.getOracleDataForPerpMarket(perpPosition.marketIndex).price;
-        if (priceDelta.gt(currentPrice) &&
-            proposedPerpPosition.baseAssetAmount.gte(numericConstants_1.ZERO)) {
-            return new _1.BN(-1);
+            freeCollateralDelta = numericConstants_1.QUOTE_PRECISION.neg()
+                .sub(marginRatioQuotePrecision)
+                .mul(proposedBaseAssetAmount.abs())
+                .div(numericConstants_1.BASE_PRECISION);
+        }
+        if (!orderBaseAssetAmount.eq(numericConstants_1.ZERO)) {
+            freeCollateralDelta = freeCollateralDelta.sub(marginRatioQuotePrecision);
+        }
+        return freeCollateralDelta;
+    }
+    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');
+            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');
+            return numericConstants_1.QUOTE_PRECISION.neg()
+                .mul(liabilityWeight)
+                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
+                .mul(signedTokenAmount.abs())
+                .div(tokenPrecision);
         }
-        return currentPrice.sub(priceDelta);
     }
     /**
      * Calculates the estimated liquidation price for a position after closing a quote amount of the position.
@@ -874,9 +871,7 @@ class User {
             .mul(closeQuoteAmount)
             .mod(currentPosition.quoteAssetAmount.abs()))
             .neg();
-        return this.liquidationPrice({
-            marketIndex: positionMarketIndex,
-        }, closeBaseAmount);
+        return this.liquidationPrice(positionMarketIndex, closeBaseAmount);
     }
     /**
      * Get the maximum trade size for a given market, taking into account the user's current leverage, positions, collateral, etc.
@@ -902,7 +897,7 @@ class User {
     getMaxTradeSizeUSDC(targetMarketIndex, tradeSide) {
         const currentPosition = this.getPerpPosition(targetMarketIndex) ||
             this.getEmptyPosition(targetMarketIndex);
-        const targetSide = types_1.isVariant(tradeSide, 'short') ? 'short' : 'long';
+        const targetSide = (0, types_1.isVariant)(tradeSide, 'short') ? 'short' : 'long';
         const currentPositionSide = (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())
             ? 'short'
             : 'long';
@@ -1014,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 } = spotBalance_1.calculateWithdrawLimit(spotMarket, nowTs);
+        let { borrowLimit, withdrawLimit } = (0, 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));
@@ -1060,7 +1055,7 @@ class User {
                 netDeposits,
             };
         }
-        if (types_1.isVariant(position.balanceType, 'borrow')) {
+        if ((0, types_1.isVariant)(position.balanceType, 'borrow')) {
             return {
                 canBypass: false,
                 maxDepositAmount,
@@ -1068,12 +1063,12 @@ class User {
                 depositAmount: numericConstants_1.ZERO,
             };
         }
-        const depositAmount = spotBalance_1.getTokenAmount(position.scaledBalance, spotMarket, 'deposit');
+        const depositAmount = (0, spotBalance_1.getTokenAmount)(position.scaledBalance, spotMarket, 'deposit');
         if (netDeposits.lt(numericConstants_1.ZERO)) {
             return {
                 canBypass: false,
                 maxDepositAmount,
-                depositAmount: numericConstants_1.ZERO,
+                depositAmount,
                 netDeposits,
             };
         }

package/lib/userMap/userMap.js

@@ -26,7 +26,7 @@ class UserMap {
             userAccountArray.push(programUserAccount.account);
         }
         if (this.accountSubscription.type === 'polling') {
-            await __1.bulkPollingUserSubscribe(userArray, this.accountSubscription.accountLoader);
+            await (0, __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: __1.getUserStatsAccountPublicKey(this.driftClient.program.programId, userStat.authority),
+                userStatsAccountPublicKey: (0, __1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, userStat.authority),
                 accountSubscription: this.accountSubscription,
             });
             userStatArray.push(chUserStat);
             userStatsAccountArray.push(userStat);
         }
         if (this.accountSubscription.type === 'polling') {
-            await __1.bulkPollingUserStatsSubscribe(userStatArray, this.accountSubscription.accountLoader);
+            await (0, __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: __1.getUserStatsAccountPublicKey(this.driftClient.program.programId, authority),
+            userStatsAccountPublicKey: (0, __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: pda_1.getUserAccountPublicKeySync(this.driftClient.program.programId, this.getAccount().referrer, 0),
-                referrerStats: pda_1.getUserStatsAccountPublicKey(this.driftClient.program.programId, this.getAccount().referrer),
+                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),
             };
         }
     }