@drift-labs/sdk 2.20.0-beta.0 → 2.20.0-beta.2

package/lib/user.js

@@ -13,6 +13,12 @@ const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccoun
 const spotPosition_1 = require("./math/spotPosition");
 const oracles_1 = require("./math/oracles");
 class User {
+    get isSubscribed() {
+        return this._isSubscribed && this.accountSubscriber.isSubscribed;
+    }
+    set isSubscribed(val) {
+        this._isSubscribed = val;
+    }
     constructor(config) {
         var _a;
         this._isSubscribed = false;
@@ -26,12 +32,6 @@ class User {
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
     }
-    get isSubscribed() {
-        return this._isSubscribed && this.accountSubscriber.isSubscribed;
-    }
-    set isSubscribed(val) {
-        this._isSubscribed = val;
-    }
     /**
      * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result
@@ -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 {
     getPerpBuyingPower(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.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount);
     }
     getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(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,7 +322,7 @@ 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);
     }
     getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, now) {
@@ -335,15 +335,15 @@ class User {
             const countForQuote = marketIndex === undefined ||
                 marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX ||
                 (includeOpenOrders && spotPosition.openOrders !== 0);
-            if (spotPosition_1.isSpotPositionAvailable(spotPosition) ||
+            if ((0, spotPosition_1.isSpotPositionAvailable)(spotPosition) ||
                 (!countForBase && !countForQuote)) {
                 continue;
             }
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX &&
                 countForQuote) {
-                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));
@@ -355,27 +355,27 @@ class User {
                     continue;
                 }
                 else {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     netQuoteValue = netQuoteValue.add(tokenAmount);
                     continue;
                 }
             }
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (!includeOpenOrders && countForBase) {
-                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);
                     totalLiabilityValue = totalLiabilityValue.add(liabilityValue);
                     continue;
                 }
                 else {
-                    const tokenAmount = spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
+                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
                     const assetValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
                     totalAssetValue = totalAssetValue.add(assetValue);
                     continue;
                 }
             }
-            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));
             if (worstCaseTokenAmount.gt(numericConstants_1.ZERO) && countForBase) {
                 const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
                 totalAssetValue = totalAssetValue.add(baseAssetValue);
@@ -417,15 +417,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));
             }
@@ -445,22 +445,22 @@ 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;
     }
     getSpotTokenAmount(marketIndex) {
         const spotPosition = this.getSpotPosition(marketIndex);
-        return spotBalance_1.getTokenAmount(spotPosition.scaledBalance, this.driftClient.getSpotMarketAccount(marketIndex), spotPosition.balanceType);
+        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, this.driftClient.getSpotMarketAccount(marketIndex), spotPosition.balanceType);
     }
     getSpotPositionValue(marketIndex, marginCategory, includeOpenOrders, strict = false, now) {
         const { totalAssetValue, totalLiabilityValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, undefined, includeOpenOrders, strict, now);
@@ -483,8 +483,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');
@@ -530,25 +530,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
@@ -568,7 +568,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)) {
@@ -587,11 +587,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,
@@ -602,10 +602,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];
@@ -667,7 +667,7 @@ class User {
             return numericConstants_1.ZERO;
         }
         const totalLiabilityValue = perpLiabilityValue.add(spotLiabilityValue);
-        const marginRatio = _1.calculateMarketMarginRatio(market, numericConstants_1.ZERO, // todo
+        const marginRatio = (0, _1.calculateMarketMarginRatio)(market, numericConstants_1.ZERO, // todo
         category);
         const freeCollateral = this.getFreeCollateral();
         // how much more liabilities can be opened w remaining free collateral
@@ -702,14 +702,14 @@ class User {
         const tradeQuoteAmount = this.getMaxTradeSizeUSDCForSpot(spotMarketIndex, direction, currentQuoteAssetValue, currentSpotMarketNetValue);
         let assetValueToAdd = numericConstants_1.ZERO;
         let liabilityValueToAdd = numericConstants_1.ZERO;
-        const newQuoteNetValue = types_1.isVariant(direction, 'short')
+        const newQuoteNetValue = (0, types_1.isVariant)(direction, 'short')
             ? currentQuoteValue.add(tradeQuoteAmount)
             : currentQuoteValue.sub(tradeQuoteAmount);
         const newQuoteAssetValue = _1.BN.max(newQuoteNetValue, numericConstants_1.ZERO);
         const newQuoteLiabilityValue = _1.BN.min(newQuoteNetValue, numericConstants_1.ZERO).abs();
         assetValueToAdd = assetValueToAdd.add(newQuoteAssetValue.sub(currentQuoteAssetValue));
         liabilityValueToAdd = liabilityValueToAdd.add(newQuoteLiabilityValue.sub(currentQuoteLiabilityValue));
-        const newSpotMarketNetValue = types_1.isVariant(direction, 'long')
+        const newSpotMarketNetValue = (0, types_1.isVariant)(direction, 'long')
             ? currentSpotMarketNetValue.add(tradeQuoteAmount)
             : currentSpotMarketNetValue.sub(tradeQuoteAmount);
         const newSpotMarketAssetValue = _1.BN.max(newSpotMarketNetValue, numericConstants_1.ZERO);
@@ -740,7 +740,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);
         }
@@ -748,13 +748,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
@@ -788,7 +788,7 @@ class User {
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
         const freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
         const market = this.driftClient.getSpotMarketAccount(marketIndex);
-        let signedTokenAmount = _1.getSignedTokenAmount(spotBalance_1.getTokenAmount(currentSpotPosition.scaledBalance, market, currentSpotPosition.balanceType), currentSpotPosition.balanceType);
+        let signedTokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(currentSpotPosition.scaledBalance, market, currentSpotPosition.balanceType), currentSpotPosition.balanceType);
         signedTokenAmount = signedTokenAmount.add(positionBaseSizeChange);
         if (signedTokenAmount.eq(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
@@ -841,7 +841,7 @@ class User {
         if (spotMarketWithSameOracle) {
             const spotPosition = this.getSpotPosition(spotMarketWithSameOracle.marketIndex);
             if (spotPosition) {
-                const signedTokenAmount = _1.getSignedTokenAmount(spotBalance_1.getTokenAmount(spotPosition.scaledBalance, spotMarketWithSameOracle, spotPosition.balanceType), spotPosition.balanceType);
+                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);
             }
@@ -861,11 +861,11 @@ class User {
     }
     calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange) {
         const currentBaseAssetAmount = perpPosition.baseAssetAmount;
-        const worstCaseBaseAssetAmount = margin_1.calculateWorstCaseBaseAssetAmount(perpPosition);
+        const worstCaseBaseAssetAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
         const orderBaseAssetAmount = worstCaseBaseAssetAmount.sub(currentBaseAssetAmount);
         const proposedBaseAssetAmount = currentBaseAssetAmount.add(positionBaseSizeChange);
         const proposedWorstCaseBaseAssetAmount = worstCaseBaseAssetAmount.add(positionBaseSizeChange);
-        const marginRatio = _1.calculateMarketMarginRatio(market, proposedWorstCaseBaseAssetAmount.abs(), 'Maintenance');
+        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);
@@ -892,14 +892,14 @@ class User {
     calculateFreeCollateralDeltaForSpot(market, signedTokenAmount) {
         const tokenPrecision = new _1.BN(Math.pow(10, market.decimals));
         if (signedTokenAmount.gt(numericConstants_1.ZERO)) {
-            const assetWeight = spotBalance_1.calculateAssetWeight(signedTokenAmount, market, 'Maintenance');
+            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 = spotBalance_1.calculateLiabilityWeight(signedTokenAmount.abs(), market, 'Maintenance');
+            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)
@@ -949,7 +949,7 @@ class User {
     getMaxTradeSizeUSDCForPerp(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';
@@ -1013,26 +1013,26 @@ class User {
         currentSpotMarketNetValue =
             currentSpotMarketNetValue !== null && currentSpotMarketNetValue !== void 0 ? currentSpotMarketNetValue : this.getSpotPositionValue(targetMarketIndex);
         let freeCollateral = this.getFreeCollateral();
-        const marginRatio = _1.calculateSpotMarketMarginRatio(market, 'Initial', numericConstants_1.ZERO, types_1.isVariant(direction, 'long')
+        const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', numericConstants_1.ZERO, (0, types_1.isVariant)(direction, 'long')
             ? _1.SpotBalanceType.DEPOSIT
             : _1.SpotBalanceType.BORROW);
         let tradeAmount = numericConstants_1.ZERO;
         if (this.getUserAccount().isMarginTradingEnabled) {
             // if the user is buying/selling and already short/long, need to account for closing out short/long
-            if (types_1.isVariant(direction, 'long') && currentSpotMarketNetValue.lt(numericConstants_1.ZERO)) {
+            if ((0, types_1.isVariant)(direction, 'long') && currentSpotMarketNetValue.lt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue.abs();
-                const marginRatio = _1.calculateSpotMarketMarginRatio(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.BORROW);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.BORROW);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new _1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
-            else if (types_1.isVariant(direction, 'short') &&
+            else if ((0, types_1.isVariant)(direction, 'short') &&
                 currentSpotMarketNetValue.gt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue;
-                const marginRatio = _1.calculateSpotMarketMarginRatio(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.DEPOSIT);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getSpotTokenAmount(targetMarketIndex), _1.SpotBalanceType.DEPOSIT);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new _1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             tradeAmount = tradeAmount.add(freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio)));
         }
-        else if (types_1.isVariant(direction, 'long')) {
+        else if ((0, types_1.isVariant)(direction, 'long')) {
             tradeAmount = _1.BN.min(currentQuoteAssetValue, freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new _1.BN(marginRatio)));
         }
         else {
@@ -1051,7 +1051,7 @@ class User {
      * @returns leverageRatio : Precision TEN_THOUSAND
      */
     accountLeverageRatioAfterTrade(targetMarketIndex, targetMarketType, tradeQuoteAmount, tradeSide, includeOpenOrders = true) {
-        const tradeIsPerp = types_1.isVariant(targetMarketType, 'perp');
+        const tradeIsPerp = (0, types_1.isVariant)(targetMarketType, 'perp');
         if (!tradeIsPerp) {
             // calculate new asset/liability values for base and quote market to find new account leverage
             const totalLiabilityValue = this.getTotalLiabilityValue();
@@ -1142,7 +1142,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));
@@ -1188,7 +1188,7 @@ class User {
                 netDeposits,
             };
         }
-        if (types_1.isVariant(position.balanceType, 'borrow')) {
+        if ((0, types_1.isVariant)(position.balanceType, 'borrow')) {
             return {
                 canBypass: false,
                 maxDepositAmount,
@@ -1196,7 +1196,7 @@ class User {
                 depositAmount: numericConstants_1.ZERO,
             };
         }
-        const depositAmount = spotBalance_1.getTokenAmount(position.scaledBalance, spotMarket, _1.SpotBalanceType.DEPOSIT);
+        const depositAmount = (0, spotBalance_1.getTokenAmount)(position.scaledBalance, spotMarket, _1.SpotBalanceType.DEPOSIT);
         if (netDeposits.lt(numericConstants_1.ZERO)) {
             return {
                 canBypass: false,

package/lib/userConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserConfig = {
+export type UserConfig = {
     accountSubscription?: UserSubscriptionConfig;
     driftClient: DriftClient;
     userAccountPublicKey: PublicKey;
 };
-export declare type UserSubscriptionConfig = {
+export type UserSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

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: programUserAccount.publicKey,
                 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),
             };
         }
     }

package/lib/userStatsConfig.d.ts

@@ -1,12 +1,12 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
-export declare type UserStatsConfig = {
+export type UserStatsConfig = {
     accountSubscription?: UserStatsSubscriptionConfig;
     driftClient: DriftClient;
     userStatsAccountPublicKey: PublicKey;
 };
-export declare type UserStatsSubscriptionConfig = {
+export type UserStatsSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/package.json

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

package/src/accounts/bulkAccountLoader.ts

@@ -183,9 +183,13 @@ export class BulkAccountLoader {
 			const accountsToLoad = accountsToLoadChunks[i];
 			for (const j in accountsToLoad) {
 				const accountToLoad = accountsToLoad[j];
-				const key = accountToLoad.publicKey.toString();
+				const key = accountToLoad.publicKey.toBase58();
 				const oldRPCResponse = this.bufferAndSlotMap.get(key);
 
+				if (oldRPCResponse && newSlot <= oldRPCResponse.slot) {
+					continue;
+				}
+
 				let newBuffer: Buffer | undefined = undefined;
 				if (rpcResponse.result.value[j]) {
 					const raw: string = rpcResponse.result.value[j].data[0];
@@ -202,10 +206,6 @@ export class BulkAccountLoader {
 					continue;
 				}
 
-				if (newSlot <= oldRPCResponse.slot) {
-					continue;
-				}
-
 				const oldBuffer = oldRPCResponse.buffer;
 				if (newBuffer && (!oldBuffer || !newBuffer.equals(oldBuffer))) {
 					this.bufferAndSlotMap.set(key, {

package/src/accounts/fetch.ts

@@ -19,6 +19,14 @@ export async function fetchUserAccounts(
 		);
 	}
 
+	return fetchUserAccountsUsingKeys(connection, program, userAccountPublicKeys);
+}
+
+export async function fetchUserAccountsUsingKeys(
+	connection: Connection,
+	program: Program,
+	userAccountPublicKeys: PublicKey[]
+): Promise<(UserAccount | undefined)[]> {
 	const accountInfos = await connection.getMultipleAccountsInfo(
 		userAccountPublicKeys,
 		'confirmed'

package/src/addresses/pda.ts

@@ -188,3 +188,16 @@ export function getSerumFulfillmentConfigPublicKey(
 		programId
 	)[0];
 }
+
+export function getReferrerNamePublicKeySync(
+	programId: PublicKey,
+	nameBuffer: number[]
+): PublicKey {
+	return PublicKey.findProgramAddressSync(
+		[
+			Buffer.from(anchor.utils.bytes.utf8.encode('referrer_name')),
+			Buffer.from(nameBuffer),
+		],
+		programId
+	)[0];
+}