@drift-labs/sdk-browser 2.162.0-beta.2 → 2.163.0-beta.10

package/lib/node/user.js

@@ -185,7 +185,6 @@ class User {
             settledPnl: numericConstants_1.ZERO,
             lpShares: numericConstants_1.ZERO,
             lastQuoteAssetAmountPerLp: numericConstants_1.ZERO,
-            perLpBase: 0,
             maxMarginRatio: 0,
             isolatedPositionScaledBalance: numericConstants_1.ZERO,
             positionFlag: 0,
@@ -303,7 +302,7 @@ class User {
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
-    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = undefined, maxMarginRatio = undefined, positionType = 'cross') {
+    getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, maxMarginRatio = undefined, positionType = 'cross') {
         const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
         const perpMarket = this.driftClient.getPerpMarketAccount(marketIndex);
         const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
@@ -315,27 +314,26 @@ class User {
         if (positionType === 'isolated') {
             const { totalAssetValue: quoteSpotMarketAssetValue, totalLiabilityValue: quoteSpotMarketLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(perpMarket.quoteSpotMarketIndex, 'Initial', undefined, undefined, true);
             const usdcAvailableForIsolatedMargin = quoteSpotMarketAssetValue.sub(quoteSpotMarketLiabilityValue);
-            const generalFreeCollateral = this.getFreeCollateral('Initial', enterHighLeverageMode, undefined);
+            const generalFreeCollateral = this.getFreeCollateral('Initial', undefined);
             freeCollateral = anchor_1.BN.min(usdcAvailableForIsolatedMargin, generalFreeCollateral).sub(collateralBuffer);
         }
         else {
             // free collateral from the cross account only
-            freeCollateral = this.getFreeCollateral('Initial', enterHighLeverageMode, undefined).sub(collateralBuffer);
+            freeCollateral = this.getFreeCollateral('Initial', undefined).sub(collateralBuffer);
         }
-        return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount, enterHighLeverageMode, maxMarginRatio || perpPosition.maxMarginRatio);
+        return this.getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, worstCaseBaseAssetAmount, maxMarginRatio || perpPosition.maxMarginRatio);
     }
-    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, enterHighLeverageMode = undefined, perpMarketMaxMarginRatio = undefined) {
+    getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(marketIndex, freeCollateral, baseAssetAmount, perpMarketMaxMarginRatio = undefined) {
         const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
-        const marginRatio = (0, market_1.calculateMarketMarginRatio)(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial', maxMarginRatio, enterHighLeverageMode || this.isHighLeverageMode('Initial'));
+        const marginRatio = (0, market_1.calculateMarketMarginRatio)(this.driftClient.getPerpMarketAccount(marketIndex), baseAssetAmount, 'Initial', maxMarginRatio);
         return freeCollateral.mul(numericConstants_1.MARGIN_PRECISION).div(new anchor_1.BN(marginRatio));
     }
     /**
      * calculates Free Collateral = Total collateral - margin requirement
      * @returns : Precision QUOTE_PRECISION
      */
-    getFreeCollateral(marginCategory = 'Initial', enterHighLeverageMode = false, perpMarketIndex) {
+    getFreeCollateral(marginCategory = 'Initial', perpMarketIndex) {
         const calc = this.getMarginCalculation(marginCategory, {
-            enteringHighLeverage: enterHighLeverageMode,
             strict: marginCategory === 'Initial',
         });
         if (perpMarketIndex !== undefined) {
@@ -351,7 +349,7 @@ class User {
             return calc.getCrossFreeCollateral();
         }
     }
-    getMarginRequirement(marginCategory, liquidationBuffer, strict, includeOpenOrders, enteringHighLeverage, perpMarketIndex) {
+    getMarginRequirement(marginCategory, liquidationBuffer, strict, includeOpenOrders, perpMarketIndex) {
         const liquidationBufferMap = new Map();
         if (liquidationBuffer && perpMarketIndex !== undefined) {
             liquidationBufferMap.set(perpMarketIndex, liquidationBuffer);
@@ -362,7 +360,6 @@ class User {
         const marginCalc = this.getMarginCalculation(marginCategory, {
             strict,
             includeOpenOrders,
-            enteringHighLeverage,
             liquidationBufferMap,
         });
         // If perpMarketIndex is provided, compute only for that market index
@@ -385,8 +382,8 @@ class User {
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
      */
-    getInitialMarginRequirement(enterHighLeverageMode = false, perpMarketIndex) {
-        return this.getMarginRequirement('Initial', undefined, true, undefined, enterHighLeverageMode, perpMarketIndex);
+    getInitialMarginRequirement(perpMarketIndex) {
+        return this.getMarginRequirement('Initial', undefined, true, undefined, perpMarketIndex);
     }
     /**
      * @returns The maintenance margin requirement in USDC. : QUOTE_PRECISION
@@ -394,7 +391,6 @@ class User {
     getMaintenanceMarginRequirement(liquidationBuffer, perpMarketIndex) {
         return this.getMarginRequirement('Maintenance', liquidationBuffer, false, // strict default
         true, // includeOpenOrders default
-        false, // enteringHighLeverage default
         perpMarketIndex);
     }
     getActivePerpPositionsForUserAccount(userAccount) {
@@ -721,7 +717,7 @@ class User {
         }
         return health;
     }
-    calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = undefined) {
+    calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
         const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
         let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
         if ((0, types_1.isVariant)(market.status, 'settlement')) {
@@ -736,14 +732,11 @@ class User {
         }
         else {
             baseAssetAmount = perpPosition.baseAssetAmount;
-            liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, valuationPrice, (0, types_1.isVariant)(market.contractType, 'prediction'));
+            liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, valuationPrice);
         }
         if (marginCategory) {
             const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
-            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
-                ? Math.max(market.marginRatioInitial, userCustomMargin)
-                : userCustomMargin, this.isHighLeverageMode(marginCategory) ||
-                enteringHighLeverage === true));
+            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, userCustomMargin));
             if (liquidationBuffer !== undefined) {
                 marginRatio = marginRatio.add(liquidationBuffer);
             }
@@ -782,9 +775,9 @@ class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionLiability(marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = undefined) {
+    getTotalPerpPositionLiability(marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
         return this.getActivePerpPositions().reduce((totalPerpValue, perpPosition) => {
-            const baseAssetValue = this.calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict, enteringHighLeverage);
+            const baseAssetValue = this.calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
             return totalPerpValue.add(baseAssetValue);
         }, numericConstants_1.ZERO);
     }
@@ -808,7 +801,7 @@ class User {
             return (0, margin_1.calculateWorstCasePerpLiabilityValue)(userPosition, market, oraclePriceData.price).worstCaseLiabilityValue;
         }
         else {
-            return (0, margin_1.calculatePerpLiabilityValue)(userPosition.baseAssetAmount, oraclePriceData.price, (0, types_1.isVariant)(market.contractType, 'prediction'));
+            return (0, margin_1.calculatePerpLiabilityValue)(userPosition.baseAssetAmount, oraclePriceData.price);
         }
     }
     getPositionSide(currentPosition) {
@@ -973,10 +966,9 @@ class User {
      * for large sizes where imf factor activates, result is a lower bound
      * @param marginCategory {Initial, Maintenance}
      * @param isLp if calculating max leveraging for adding lp, need to add buffer
-     * @param enterHighLeverageMode can pass this as true to calculate max leverage if the user was to enter high leverage mode
      * @returns : Precision TEN_THOUSAND
      */
-    getMaxLeverageForPerp(perpMarketIndex, _marginCategory = 'Initial', isLp = false, enterHighLeverageMode = undefined) {
+    getMaxLeverageForPerp(perpMarketIndex, _marginCategory = 'Initial', isLp = false) {
         const market = this.driftClient.getPerpMarketAccount(perpMarketIndex);
         const marketPrice = this.driftClient.getOracleDataForPerpMarket(perpMarketIndex).price;
         const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
@@ -990,7 +982,7 @@ class User {
             ? marketPrice.mul(market.amm.orderStepSize).div(numericConstants_1.AMM_RESERVE_PRECISION)
             : numericConstants_1.ZERO;
         // absolute max fesible size (upper bound)
-        const maxSizeQuote = anchor_1.BN.max(anchor_1.BN.min(this.getMaxTradeSizeUSDCForPerp(perpMarketIndex, types_2.PositionDirection.LONG, false, enterHighLeverageMode || this.isHighLeverageMode('Initial')).tradeSize, this.getMaxTradeSizeUSDCForPerp(perpMarketIndex, types_2.PositionDirection.SHORT, false, enterHighLeverageMode || this.isHighLeverageMode('Initial')).tradeSize).sub(lpBuffer), numericConstants_1.ZERO);
+        const maxSizeQuote = anchor_1.BN.max(anchor_1.BN.min(this.getMaxTradeSizeUSDCForPerp(perpMarketIndex, types_2.PositionDirection.LONG, false).tradeSize, this.getMaxTradeSizeUSDCForPerp(perpMarketIndex, types_2.PositionDirection.SHORT, false).tradeSize).sub(lpBuffer), numericConstants_1.ZERO);
         return totalLiabilityValue
             .add(maxSizeQuote)
             .mul(numericConstants_1.TEN_THOUSAND)
@@ -1150,11 +1142,6 @@ class User {
     isBankrupt() {
         return (this.getUserAccount().status & types_1.UserStatus.BANKRUPT) > 0;
     }
-    isHighLeverageMode(marginCategory) {
-        return ((0, types_1.isVariant)(this.getUserAccount().marginMode, 'highLeverage') ||
-            (marginCategory === 'Maintenance' &&
-                (0, types_1.isVariant)(this.getUserAccount().marginMode, 'highLeverageMaintenance')));
-    }
     /**
      * Checks if any user position cumulative funding differs from respective market cumulative funding
      * @returns
@@ -1233,7 +1220,7 @@ class User {
      * @param offsetCollateral // allows calculating the liquidation price after this offset collateral is added to the user's account (e.g. : what will the liquidation price be for this position AFTER I deposit $x worth of collateral)
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, enteringHighLeverage = false, marginType) {
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO, marginCategory = 'Maintenance', includeOpenOrders = false, offsetCollateral = numericConstants_1.ZERO, marginType) {
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
@@ -1242,14 +1229,13 @@ class User {
             const marginCalculation = this.getMarginCalculation(marginCategory, {
                 strict: false,
                 includeOpenOrders,
-                enteringHighLeverage,
             });
             const isolatedMarginCalculation = marginCalculation.isolatedMarginCalculations.get(marketIndex);
             if (!isolatedMarginCalculation)
                 return new anchor_1.BN(-1);
             const { totalCollateral, marginRequirement } = isolatedMarginCalculation;
             const freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
-            const freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders, enteringHighLeverage);
+            const freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders);
             if (!freeCollateralDelta || freeCollateralDelta.eq(numericConstants_1.ZERO)) {
                 return new anchor_1.BN(-1);
             }
@@ -1263,12 +1249,12 @@ class User {
             return liqPrice;
         }
         const totalCollateral = this.getTotalCollateral(marginCategory, false, includeOpenOrders);
-        const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders, enteringHighLeverage);
+        const marginRequirement = this.getMarginRequirement(marginCategory, undefined, false, includeOpenOrders);
         let freeCollateral = anchor_1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(marginRequirement)).add(offsetCollateral);
         positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
-        const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage);
+        const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
-        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders, enteringHighLeverage);
+        let freeCollateralDelta = this.calculateFreeCollateralDeltaForPerp(market, currentPerpPosition, positionBaseSizeChange, oraclePrice, marginCategory, includeOpenOrders);
         if (!freeCollateralDelta) {
             return new anchor_1.BN(-1);
         }
@@ -1301,7 +1287,7 @@ class User {
         }
         return liqPrice;
     }
-    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage = undefined, marginCategory = 'Maintenance') {
+    calculateEntriesEffectOnFreeCollateral(market, oraclePrice, perpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, marginCategory = 'Maintenance') {
         let freeCollateralChange = numericConstants_1.ZERO;
         // update free collateral to account for change in pnl from new position
         if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) &&
@@ -1336,12 +1322,10 @@ class User {
             }
             else {
                 baseAssetAmount = perpPosition.baseAssetAmount;
-                liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, oraclePrice, (0, types_1.isVariant)(market.contractType, 'prediction'));
+                liabilityValue = (0, margin_1.calculatePerpLiabilityValue)(baseAssetAmount, oraclePrice);
             }
             const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
-            const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
-                ? Math.max(market.marginRatioInitial, userCustomMargin)
-                : userCustomMargin, this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true);
+            const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, baseAssetAmount.abs(), marginCategory, userCustomMargin);
             return liabilityValue.mul(new anchor_1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION);
         };
         const freeCollateralConsumptionBefore = calculateMarginRequirement(perpPosition);
@@ -1350,7 +1334,7 @@ class User {
         const freeCollateralConsumptionAfter = calculateMarginRequirement(perpPositionAfter);
         return freeCollateralChange.sub(freeCollateralConsumptionAfter.sub(freeCollateralConsumptionBefore));
     }
-    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, oraclePrice, marginCategory = 'Maintenance', includeOpenOrders = false, enteringHighLeverage = undefined) {
+    calculateFreeCollateralDeltaForPerp(market, perpPosition, positionBaseSizeChange, oraclePrice, marginCategory = 'Maintenance', includeOpenOrders = false) {
         const baseAssetAmount = includeOpenOrders
             ? (0, margin_2.calculateWorstCaseBaseAssetAmount)(perpPosition, market, oraclePrice)
             : perpPosition.baseAssetAmount;
@@ -1358,9 +1342,7 @@ class User {
         const orderBaseAssetAmount = baseAssetAmount.sub(perpPosition.baseAssetAmount);
         const proposedBaseAssetAmount = baseAssetAmount.add(positionBaseSizeChange);
         const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
-        const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, enteringHighLeverage === false
-            ? Math.max(market.marginRatioInitial, userCustomMargin)
-            : userCustomMargin, this.isHighLeverageMode(marginCategory) || enteringHighLeverage === true);
+        const marginRatio = (0, market_1.calculateMarketMarginRatio)(market, proposedBaseAssetAmount.abs(), marginCategory, userCustomMargin);
         const marginRatioQuotePrecision = new anchor_1.BN(marginRatio)
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(numericConstants_1.MARGIN_PRECISION);
@@ -1368,33 +1350,21 @@ class User {
             return undefined;
         }
         let freeCollateralDelta = numericConstants_1.ZERO;
-        if ((0, types_1.isVariant)(market.contractType, 'prediction')) {
-            // for prediction market, increase in pnl and margin requirement will net out for position
-            // open order margin requirement will change with price though
-            if (orderBaseAssetAmount.gt(numericConstants_1.ZERO)) {
-                freeCollateralDelta = marginRatioQuotePrecision.neg();
-            }
-            else if (orderBaseAssetAmount.lt(numericConstants_1.ZERO)) {
-                freeCollateralDelta = marginRatioQuotePrecision;
-            }
+        if (proposedBaseAssetAmount.gt(numericConstants_1.ZERO)) {
+            freeCollateralDelta = numericConstants_1.QUOTE_PRECISION.sub(marginRatioQuotePrecision)
+                .mul(proposedBaseAssetAmount)
+                .div(numericConstants_1.BASE_PRECISION);
         }
         else {
-            if (proposedBaseAssetAmount.gt(numericConstants_1.ZERO)) {
-                freeCollateralDelta = numericConstants_1.QUOTE_PRECISION.sub(marginRatioQuotePrecision)
-                    .mul(proposedBaseAssetAmount)
-                    .div(numericConstants_1.BASE_PRECISION);
-            }
-            else {
-                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
-                    .mul(orderBaseAssetAmount.abs())
-                    .div(numericConstants_1.BASE_PRECISION));
-            }
+            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
+                .mul(orderBaseAssetAmount.abs())
+                .div(numericConstants_1.BASE_PRECISION));
         }
         return freeCollateralDelta;
     }
@@ -1435,12 +1405,11 @@ class User {
     }
     getMarginUSDCRequiredForTrade(targetMarketIndex, baseSize, estEntryPrice, perpMarketMaxMarginRatio) {
         const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
-        return (0, margin_2.calculateMarginUSDCRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, maxMarginRatio, undefined, estEntryPrice);
+        return (0, margin_2.calculateMarginUSDCRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, maxMarginRatio, estEntryPrice);
     }
     getCollateralDepositRequiredForTrade(targetMarketIndex, baseSize, collateralIndex, perpMarketMaxMarginRatio) {
         const maxMarginRatio = Math.max(perpMarketMaxMarginRatio, this.getUserAccount().maxMarginRatio);
-        return (0, margin_2.calculateCollateralDepositRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, collateralIndex, maxMarginRatio, false // assume user cant be high leverage if they havent created user account ?
-        );
+        return (0, margin_2.calculateCollateralDepositRequiredForTrade)(this.driftClient, targetMarketIndex, baseSize, collateralIndex, maxMarginRatio);
     }
     /**
      * Separates the max trade size into two parts:
@@ -1451,7 +1420,7 @@ class User {
      * @param isLp
      * @returns { tradeSize: BN, oppositeSideTradeSize: BN} : Precision QUOTE_PRECISION
      */
-    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = undefined, maxMarginRatio = undefined, positionType = 'cross') {
+    getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, maxMarginRatio = undefined, positionType = 'cross') {
         let tradeSize = numericConstants_1.ZERO;
         let oppositeSideTradeSize = numericConstants_1.ZERO;
         const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
@@ -1472,8 +1441,8 @@ class User {
         // add any position we have on the opposite side of the current trade, because we can "flip" the size of this position without taking any extra leverage.
         const oppositeSizeLiabilityValue = targetingSameSide
             ? numericConstants_1.ZERO
-            : (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price, (0, types_1.isVariant)(marketAccount.contractType, 'prediction'));
-        const maxPositionSize = this.getPerpBuyingPower(targetMarketIndex, lpBuffer, enterHighLeverageMode, maxMarginRatio, positionType);
+            : (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price);
+        const maxPositionSize = this.getPerpBuyingPower(targetMarketIndex, lpBuffer, maxMarginRatio, positionType);
         if (maxPositionSize.gte(numericConstants_1.ZERO)) {
             if (oppositeSizeLiabilityValue.eq(numericConstants_1.ZERO)) {
                 // case 1 : Regular trade where current total position less than max, and no opposite position to account for
@@ -1489,10 +1458,9 @@ class User {
         else {
             // current leverage is greater than max leverage - can only reduce position size
             if (!targetingSameSide) {
-                const market = this.driftClient.getPerpMarketAccount(targetMarketIndex);
-                const perpLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price, (0, types_1.isVariant)(market.contractType, 'prediction'));
+                const perpLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(currentPosition.baseAssetAmount, oracleData.price);
                 const totalCollateral = this.getTotalCollateral();
-                const marginRequirement = this.getInitialMarginRequirement(enterHighLeverageMode);
+                const marginRequirement = this.getInitialMarginRequirement();
                 const marginRatio = Math.max(currentPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
                 const marginFreedByClosing = perpLiabilityValue
                     .mul(new anchor_1.BN(marginRatio))
@@ -1513,11 +1481,11 @@ class User {
                 tradeSize = maxPositionSize;
             }
         }
-        const freeCollateral = this.getFreeCollateral('Initial', enterHighLeverageMode);
+        const freeCollateral = this.getFreeCollateral('Initial');
         let baseTradeSize = targetSide === 'long'
             ? tradeSize.mul(numericConstants_1.BASE_PRECISION).div(oracleData.price)
             : tradeSize.mul(numericConstants_1.BASE_PRECISION).div(oracleData.price).neg();
-        let freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(marketAccount, oracleData.price, currentPosition, baseTradeSize, oracleData.price, false, enterHighLeverageMode, 'Initial');
+        let freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(marketAccount, oracleData.price, currentPosition, baseTradeSize, oracleData.price, false, 'Initial');
         while (freeCollateralChangeFromNewPosition.isNeg() &&
             freeCollateralChangeFromNewPosition.abs().gt(freeCollateral)) {
             tradeSize = tradeSize.mul(new anchor_1.BN(99)).div(new anchor_1.BN(100));
@@ -1526,7 +1494,7 @@ class User {
                     ? tradeSize.mul(numericConstants_1.BASE_PRECISION).div(oracleData.price)
                     : tradeSize.mul(numericConstants_1.BASE_PRECISION).div(oracleData.price).neg();
             freeCollateralChangeFromNewPosition =
-                this.calculateEntriesEffectOnFreeCollateral(marketAccount, oracleData.price, currentPosition, baseTradeSize, oracleData.price, false, enterHighLeverageMode, 'Initial');
+                this.calculateEntriesEffectOnFreeCollateral(marketAccount, oracleData.price, currentPosition, baseTradeSize, oracleData.price, false, 'Initial');
         }
         return { tradeSize, oppositeSideTradeSize };
     }
@@ -1871,9 +1839,6 @@ class User {
         const state = this.driftClient.getStateAccount();
         const feeTierIndex = 0;
         if ((0, types_1.isVariant)(marketType, 'perp')) {
-            if (this.isHighLeverageMode('Initial')) {
-                return state.perpFeeStructure.feeTiers[0];
-            }
             const userStatsAccount = this.driftClient
                 .getUserStats()
                 .getAccount();
@@ -1924,9 +1889,9 @@ class User {
      * @param quoteAmount
      * @returns feeForQuote : Precision QUOTE_PRECISION
      */
-    calculateFeeForQuoteAmount(quoteAmount, marketIndex, enteringHighLeverageMode) {
+    calculateFeeForQuoteAmount(quoteAmount, marketIndex) {
         if (marketIndex !== undefined) {
-            const takerFeeMultiplier = this.driftClient.getMarketFees(types_2.MarketType.PERP, marketIndex, this, enteringHighLeverageMode).takerFee;
+            const takerFeeMultiplier = this.driftClient.getMarketFees(types_2.MarketType.PERP, marketIndex, this).takerFee;
             const feeAmountNum = bigNum_1.BigNum.from(quoteAmount, numericConstants_1.QUOTE_PRECISION_EXP).toNum() *
                 takerFeeMultiplier;
             return bigNum_1.BigNum.fromPrint(feeAmountNum.toString(), numericConstants_1.QUOTE_PRECISION_EXP).val;
@@ -2158,10 +2123,10 @@ class User {
         }
         else {
             worstCaseBaseAmount = perpPosition.baseAssetAmount;
-            worstCaseLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(perpPosition.baseAssetAmount, oraclePrice, (0, types_1.isVariant)(perpMarket.contractType, 'prediction'));
+            worstCaseLiabilityValue = (0, margin_1.calculatePerpLiabilityValue)(perpPosition.baseAssetAmount, oraclePrice);
         }
         const userCustomMargin = Math.max(perpPosition.maxMarginRatio, this.getUserAccount().maxMarginRatio);
-        const marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, userCustomMargin, this.isHighLeverageMode(marginCategory)));
+        const marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, userCustomMargin));
         const _quoteOraclePriceData = quoteOraclePriceData ||
             this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         let marginRequirement = worstCaseLiabilityValue
@@ -2317,23 +2282,22 @@ class User {
      * Consumers can use this to avoid duplicating work across separate calls.
      */
     getMarginCalculation(marginCategory = 'Initial', opts) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const strict = (_a = opts === null || opts === void 0 ? void 0 : opts.strict) !== null && _a !== void 0 ? _a : false;
-        const enteringHighLeverage = (_b = opts === null || opts === void 0 ? void 0 : opts.enteringHighLeverage) !== null && _b !== void 0 ? _b : false;
-        const liquidationBufferMap = (_c = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _c !== void 0 ? _c : new Map();
-        const includeOpenOrders = (_d = opts === null || opts === void 0 ? void 0 : opts.includeOpenOrders) !== null && _d !== void 0 ? _d : true;
+        const liquidationBufferMap = (_b = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _b !== void 0 ? _b : new Map();
+        const includeOpenOrders = (_c = opts === null || opts === void 0 ? void 0 : opts.includeOpenOrders) !== null && _c !== void 0 ? _c : true;
         // Equivalent to on-chain user_custom_margin_ratio
         const userCustomMarginRatio = marginCategory === 'Initial' ? this.getUserAccount().maxMarginRatio : 0;
         // Initialize calc via JS mirror of Rust/on-chain MarginCalculation
         const isolatedMarginBuffers = new Map();
-        for (const [marketIndex, isolatedMarginBuffer,] of (_e = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _e !== void 0 ? _e : new Map()) {
+        for (const [marketIndex, isolatedMarginBuffer,] of (_d = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) !== null && _d !== void 0 ? _d : new Map()) {
             if (marketIndex !== 'cross') {
                 isolatedMarginBuffers.set(marketIndex, isolatedMarginBuffer);
             }
         }
         const ctx = marginCalculation_1.MarginContext.standard(marginCategory)
             .strictMode(strict)
-            .setCrossMarginBuffer((_g = (_f = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) === null || _f === void 0 ? void 0 : _f.get('cross')) !== null && _g !== void 0 ? _g : numericConstants_1.ZERO)
+            .setCrossMarginBuffer((_f = (_e = opts === null || opts === void 0 ? void 0 : opts.liquidationBufferMap) === null || _e === void 0 ? void 0 : _e.get('cross')) !== null && _f !== void 0 ? _f : numericConstants_1.ZERO)
             .setIsolatedMarginBuffers(isolatedMarginBuffers);
         const calc = new marginCalculation_1.MarginCalculation(ctx);
         // SPOT POSITIONS
@@ -2356,7 +2320,7 @@ class User {
                 }
                 else {
                     // borrow on quote contributes to margin requirement
-                    const tokenValueAbs = this.getSpotLiabilityValue(tokenAmount, strictOracle, spotMarket, marginCategory, (_h = liquidationBufferMap.get('cross')) !== null && _h !== void 0 ? _h : new anchor_1.BN(0)).abs();
+                    const tokenValueAbs = this.getSpotLiabilityValue(tokenAmount, strictOracle, spotMarket, marginCategory, (_g = liquidationBufferMap.get('cross')) !== null && _g !== void 0 ? _g : new anchor_1.BN(0)).abs();
                     calc.addCrossMarginRequirement(tokenValueAbs, tokenValueAbs);
                 }
                 continue;
@@ -2399,7 +2363,7 @@ class User {
             const { worstCaseBaseAssetAmount, worstCaseLiabilityValue } = (0, margin_1.calculateWorstCasePerpLiabilityValue)(marketPosition, market, nonMmmOraclePriceData.price, includeOpenOrders);
             // margin ratio for this perp
             const customMarginRatio = Math.max(userCustomMarginRatio, marketPosition.maxMarginRatio);
-            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, worstCaseBaseAssetAmount.abs(), marginCategory, customMarginRatio, this.isHighLeverageMode(marginCategory) || enteringHighLeverage));
+            let marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(market, worstCaseBaseAssetAmount.abs(), marginCategory, customMarginRatio));
             if ((0, types_1.isVariant)(market.status, 'settlement')) {
                 marginRatio = numericConstants_1.ZERO;
             }
@@ -2443,13 +2407,13 @@ class User {
             if (isIsolated) {
                 // derive isolated quote deposit value, mirroring on-chain logic
                 let depositValue = numericConstants_1.ZERO;
-                if ((_j = marketPosition.isolatedPositionScaledBalance) === null || _j === void 0 ? void 0 : _j.gt(numericConstants_1.ZERO)) {
+                if ((_h = marketPosition.isolatedPositionScaledBalance) === null || _h === void 0 ? void 0 : _h.gt(numericConstants_1.ZERO)) {
                     const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
                     const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
                     const strictQuote = new strictOraclePrice_1.StrictOraclePrice(quoteOraclePriceData.price, strict
                         ? quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min
                         : undefined);
-                    const quoteTokenAmount = (0, spotBalance_2.getTokenAmount)((_k = marketPosition.isolatedPositionScaledBalance) !== null && _k !== void 0 ? _k : numericConstants_1.ZERO, quoteSpotMarket, types_2.SpotBalanceType.DEPOSIT);
+                    const quoteTokenAmount = (0, spotBalance_2.getTokenAmount)((_j = marketPosition.isolatedPositionScaledBalance) !== null && _j !== void 0 ? _j : numericConstants_1.ZERO, quoteSpotMarket, types_2.SpotBalanceType.DEPOSIT);
                     depositValue = (0, spotBalance_1.getStrictTokenValue)(quoteTokenAmount, quoteSpotMarket.decimals, strictQuote);
                 }
                 calc.addIsolatedMarginCalculation(market.marketIndex, depositValue, positionUnrealizedPnl, worstCaseLiabilityValue, perpMarginRequirement);

package/lib/node/userMap/WebsocketSubscription.js

@@ -22,7 +22,7 @@ class WebsocketSubscription {
             if (this.additionalFilters) {
                 filters.push(...this.additionalFilters);
             }
-            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'User', this.userMap.driftClient.program, this.decodeFn, {
+            this.subscriber = new webSocketProgramAccountSubscriber_1.WebSocketProgramAccountSubscriber('UserMap', 'user', this.userMap.driftClient.program, this.decodeFn, {
                 filters,
                 commitment: this.commitment,
             }, this.resubOpts);

package/lib/node/userMap/grpcSubscription.js

@@ -22,7 +22,7 @@ class grpcSubscription {
             if (this.additionalFilters) {
                 filters.push(...this.additionalFilters);
             }
-            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'UserMap', 'User', this.userMap.driftClient.program, this.decodeFn, {
+            this.subscriber = await grpcProgramAccountSubscriber_1.grpcProgramAccountSubscriber.create(this.grpcConfigs, 'UserMap', 'user', this.userMap.driftClient.program, this.decodeFn, {
                 filters,
             }, this.resubOpts);
         }

package/lib/node/userMap/revenueShareEscrowMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"revenueShareEscrowMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/revenueShareEscrowMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,qBAAa,qBAAqB;IACjC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAgD;IAC1E,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAU;IAE9B,OAAO,CAAC,YAAY,CAAC,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAa;IAEzC;;;;;OAKG;gBACS,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,OAAO;IAK5D;;OAEG;IACU,SAAS;IASf,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CACT,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG,SAAS;IAIxC;;;;;OAKG;IACU,OAAO,CACnB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAOpC,qBAAqB,CAAC,SAAS,EAAE,MAAM;IA6B7C,IAAI,IAAI,MAAM;IAIR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAqBzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA0FrC;;OAEG;IACI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAIvD;;OAEG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;OAEG;IACI,+BAA+B,IAAI,GAAG,CAC5C,MAAM,EACN,yBAAyB,CACzB;IAUD;;OAEG;IACI,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAUrE;;OAEG;IACI,aAAa,CACnB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,GAAG,SAAS;IASxC;;OAEG;IACI,gBAAgB,CACtB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,EAAE;IAUjB,WAAW;CAGxB"}
+{"version":3,"file":"revenueShareEscrowMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/revenueShareEscrowMap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAC;AAIrD,qBAAa,qBAAqB;IACjC;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAgD;IAC1E,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,YAAY,CAAU;IAE9B,OAAO,CAAC,YAAY,CAAC,CAAgB;IACrC,OAAO,CAAC,oBAAoB,CAAa;IAEzC;;;;;OAKG;gBACS,WAAW,EAAE,WAAW,EAAE,YAAY,CAAC,EAAE,OAAO;IAK5D;;OAEG;IACU,SAAS;IASf,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CACT,kBAAkB,EAAE,MAAM,GACxB,yBAAyB,GAAG,SAAS;IAIxC;;;;;OAKG;IACU,OAAO,CACnB,kBAAkB,EAAE,MAAM,GACxB,OAAO,CAAC,yBAAyB,GAAG,SAAS,CAAC;IAOpC,qBAAqB,CAAC,SAAS,EAAE,MAAM;IA8B7C,IAAI,IAAI,MAAM;IAIR,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBlC;;;OAGG;IACU,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBzB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA4FrC;;OAEG;IACI,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAIvD;;OAEG;IACI,cAAc,IAAI,MAAM,EAAE;IAIjC;;OAEG;IACI,+BAA+B,IAAI,GAAG,CAC5C,MAAM,EACN,yBAAyB,CACzB;IAUD;;OAEG;IACI,oBAAoB,IAAI,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC;IAUrE;;OAEG;IACI,aAAa,CACnB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,GAAG,SAAS;IASxC;;OAEG;IACI,gBAAgB,CACtB,iBAAiB,EAAE,MAAM,GACvB,yBAAyB,EAAE;IAUjB,WAAW;CAGxB"}

package/lib/node/userMap/revenueShareEscrowMap.js

@@ -52,7 +52,7 @@ class RevenueShareEscrowMap {
         try {
             const accountInfo = await this.driftClient.connection.getAccountInfo(escrowAccountPublicKey, 'processed');
             if (accountInfo && accountInfo.data) {
-                const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('RevenueShareEscrow', accountInfo.data);
+                const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
                 this.authorityEscrowMap.set(authority, escrow);
             }
         }
@@ -89,7 +89,7 @@ class RevenueShareEscrowMap {
         }
         for (const authority of this.authorityEscrowMap.keys()) {
             const accountInfo = await this.driftClient.connection.getAccountInfo((0, pda_1.getRevenueShareEscrowAccountPublicKey)(this.driftClient.program.programId, new web3_js_1.PublicKey(authority)), 'confirmed');
-            const escrowNew = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('RevenueShareEscrow', accountInfo.data);
+            const escrowNew = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', accountInfo.data);
             this.authorityEscrowMap.set(authority, escrowNew);
         }
     }
@@ -115,7 +115,7 @@ class RevenueShareEscrowMap {
                     try {
                         // @ts-ignore
                         const buffer = Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
-                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('RevenueShareEscrow', buffer);
+                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
                         // Extract authority from the account data
                         const authorityKey = escrow.authority.toBase58();
                         this.authorityEscrowMap.set(authorityKey, escrow);
@@ -130,7 +130,7 @@ class RevenueShareEscrowMap {
                     try {
                         // @ts-ignore
                         const buffer = Buffer.from(programAccount.account.data[0], programAccount.account.data[1]);
-                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('RevenueShareEscrow', buffer);
+                        const escrow = this.driftClient.program.account.revenueShareEscrow.coder.accounts.decode('revenueShareEscrow', buffer);
                         // Extract authority from the account data
                         const authorityKey = escrow.authority.toBase58();
                         this.authorityEscrowMap.set(authorityKey, escrow);

package/lib/node/userMap/userMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"userMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userMap.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACN,WAAW,EACX,WAAW,EASX,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAEtD,OAAO,EAIN,SAAS,EAET,MAAM,iBAAiB,CAAC;AAQzB,OAAO,EAEN,yBAAyB,IAAI,kBAAkB,EAC/C,aAAa,EACb,MAAM,iBAAiB,CAAC;AAKzB,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,MAAM,WAAW,gBAAgB;IAChC,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC3D,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,SAAS,CACR,oBAAoB,EAAE,SAAS,EAC/B,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,sBAAsB,GAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACnC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IACxD,OAAO,CACN,GAAG,EAAE,MAAM,EACX,mBAAmB,CAAC,EAAE,sBAAsB,GAC1C,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,eAAe,CACd,GAAG,EAAE,MAAM,EACX,mBAAmB,CAAC,EAAE,sBAAsB,GAC1C,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9B,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC;IACrD,qBAAqB,CAAC,MAAM,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACjC,cAAc,IAAI,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACtD,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC5C,eAAe,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjE;AAED,qBAAa,OAAQ,YAAW,gBAAgB;IAC/C,OAAO,CAAC,OAAO,CAAwC;IACvD,WAAW,EAAE,WAAW,CAAC;IACzB,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC3D,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,iBAAiB,CAAC,CAAiB;IAC3C,OAAO,CAAC,gCAAgC,CAAU;IAClD,OAAO,CAAC,uBAAuB,CAAK;IACpC,OAAO,CAAC,YAAY,CAGA;IACpB,OAAO,CAAC,0BAA0B,CAKhC;IACF,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,cAAc,CAAK;IAC3B,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,mBAAmB,CAAa;IAExC,OAAO,CAAC,iBAAiB,CAAU;IAEnC;;OAEG;gBACS,MAAM,EAAE,aAAa;IAsEpB,SAAS;IAkBT,SAAS,CACrB,oBAAoB,EAAE,SAAS,EAC/B,WAAW,CAAC,EAAE,WAAW,EACzB,IAAI,CAAC,EAAE,MAAM,EACb,mBAAmB,CAAC,EAAE,sBAAsB;IAyBtC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAIhC;;;;OAIG;IACI,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS;IAGlC,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,SAAS;IAI9D;;;;OAIG;IACU,OAAO,CACnB,GAAG,EAAE,MAAM,EACX,mBAAmB,CAAC,EAAE,sBAAsB,GAC1C,OAAO,CAAC,IAAI,CAAC;IAWH,eAAe,CAC3B,GAAG,EAAE,MAAM,EACX,mBAAmB,CAAC,EAAE,sBAAsB,GAC1C,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAYhB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAKlE;;;;OAIG;IACI,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS;IAQ3D;;;;OAIG;IACU,OAAO,CACnB,IAAI,EAAE,MAAM,EACZ,uBAAuB,CAAC,EAAE,qBAAqB,GAC7C,OAAO,CAAC,IAAI,CAAC;IAMH,qBAAqB,CAAC,MAAM,EAAE,WAAW;IAMzC,qBAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC;IAoCpD,MAAM,IAAI,gBAAgB,CAAC,IAAI,CAAC;IAKjC,cAAc,IAAI,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAIpD,OAAO,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAK5C,eAAe,IAAI,gBAAgB,CAAC,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAIhE,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACI,oBAAoB,CAC1B,cAAc,CAAC,EAAE,kBAAkB,GACjC,SAAS,EAAE;IAmBD,IAAI;IAQjB,OAAO,CAAC,UAAU;IAclB;;;;OAIG;YACW,WAAW;IA4FzB;;;;OAIG;YACW,aAAa;IAqHd,WAAW;IAoBX,iBAAiB,CAC7B,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,MAAM;IAkBb,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI7B,OAAO,IAAI,MAAM;CAGxB"}

package/lib/node/userMap/userMap.js

@@ -50,8 +50,7 @@ class UserMap {
             decodeFn = (name, buffer) => (0, user_2.decodeUser)(buffer);
         }
         else {
-            decodeFn =
-                this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
+            decodeFn = this.driftClient.program.account.user.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.user.coder.accounts);
         }
         this.decode = decodeFn;
         if (config.subscriptionConfig.type === 'polling') {
@@ -323,12 +322,12 @@ class UserMap {
                 const currAccountWithSlot = this.getWithSlot(key);
                 if (currAccountWithSlot) {
                     if (slot >= currAccountWithSlot.slot) {
-                        const userAccount = this.decode('User', buffer);
+                        const userAccount = this.decode('user', buffer);
                         this.updateUserAccount(key, userAccount, slot);
                     }
                 }
                 else {
-                    const userAccount = this.decode('User', buffer);
+                    const userAccount = this.decode('user', buffer);
                     await this.addPubkey(new web3_js_1.PublicKey(key), userAccount, slot);
                 }
             })());
@@ -413,7 +412,7 @@ class UserMap {
                         const publicKeyString = chunk[j].toString();
                         const buffer = buffer_1.Buffer.from(accountInfo.data);
                         programAccountBufferMap.set(publicKeyString, buffer);
-                        const decodedUser = this.decode('User', buffer);
+                        const decodedUser = this.decode('user', buffer);
                         const currAccountWithSlot = this.getWithSlot(publicKeyString);
                         if (currAccountWithSlot &&
                             currAccountWithSlot.slot <= accountInfosSlot) {

package/lib/node/userMap/userStatsMap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userStatsMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userStatsMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EACN,WAAW,EACX,gBAAgB,EAShB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,YAAY;IACxB;;OAEG;IACH,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;;OAKG;gBAEF,WAAW,EAAE,WAAW,EACxB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,CAAC,EAAE,UAAU;IAsBX,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE;IAS/C;;;;;OAKG;IACU,WAAW,CACvB,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO;IAwBP,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;IAO3D,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,CAAC,EAAE,OAAO;IAiEX,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS;IAIjD;;;;;OAKG;IACU,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW7D,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIrC,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACU,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE;IAQ1C;;;;OAIG;YACW,WAAW;IASzB;;;OAGG;YACW,aAAa;IA8Gd,WAAW;CAMxB"}
+{"version":3,"file":"userStatsMap.d.ts","sourceRoot":"","sources":["../../../src/userMap/userStatsMap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EACN,WAAW,EACX,gBAAgB,EAShB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,qBAAa,YAAY;IACxB;;OAEG;IACH,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,WAAW,CAAc;IACjC,OAAO,CAAC,iBAAiB,CAAoB;IAC7C,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,UAAU,CAAa;IAE/B,OAAO,CAAC,WAAW,CAAC,CAAgB;IACpC,OAAO,CAAC,mBAAmB,CAAa;IAExC;;;;;OAKG;gBAEF,WAAW,EAAE,WAAW,EACxB,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,UAAU,CAAC,EAAE,UAAU;IAuBX,SAAS,CAAC,WAAW,EAAE,SAAS,EAAE;IAS/C;;;;;OAKG;IACU,WAAW,CACvB,SAAS,EAAE,SAAS,EACpB,gBAAgB,CAAC,EAAE,gBAAgB,EACnC,SAAS,CAAC,EAAE,OAAO;IAwBP,qBAAqB,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO;IAO3D,qBAAqB,CACjC,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,EACzB,OAAO,CAAC,EAAE,OAAO;IAiEX,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO;IAIxC,GAAG,CAAC,kBAAkB,EAAE,MAAM,GAAG,SAAS;IAIjD;;;;;OAKG;IACU,OAAO,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAW7D,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC;IAIrC,IAAI,IAAI,MAAM;IAIrB;;;;OAIG;IACU,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE;IAQ1C;;;;OAIG;YACW,WAAW;IASzB;;;OAGG;YACW,aAAa;IA8Gd,WAAW;CAMxB"}

package/lib/node/userMap/userStatsMap.js

@@ -26,8 +26,7 @@ class UserStatsMap {
         this.syncConfig = syncConfig !== null && syncConfig !== void 0 ? syncConfig : {
             type: 'default',
         };
-        this.decode =
-            this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.userStats.coder.accounts);
+        this.decode = this.driftClient.program.account.userStats.coder.accounts.decodeUnchecked.bind(this.driftClient.program.account.userStats.coder.accounts);
     }
     async subscribe(authorities) {
         if (this.size() > 0) {
@@ -235,7 +234,7 @@ class UserStatsMap {
                         const publicKeyString = chunk[j].toString();
                         if (!this.has(publicKeyString)) {
                             const buffer = Buffer.from(accountInfo.data);
-                            const decodedUserStats = this.decode('UserStats', buffer);
+                            const decodedUserStats = this.decode('userStats', buffer);
                             programAccountBufferMap.add(decodedUserStats.authority.toBase58());
                             this.addUserStat(decodedUserStats.authority, decodedUserStats, false);
                         }