@drift-labs/sdk 2.38.1-beta.8 → 2.39.1-beta.0

package/lib/tx/priorityFeeCalculator.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PriorityFeeCalculator = void 0;
+const web3_js_1 = require("@solana/web3.js");
+/**
+ * This class determines whether a priority fee needs to be included in a transaction based on
+ * a recent history of timed out transactions.
+ */
+class PriorityFeeCalculator {
+    /**
+     * Constructor for the PriorityFeeCalculator class.
+     * @param currentTimeMs - The current time in milliseconds.
+     * @param priorityFeeLatchDurationMs - The duration for how long to stay in triggered state before resetting. Default value is 10 seconds.
+     */
+    constructor(currentTimeMs, priorityFeeLatchDurationMs = 10 * 1000) {
+        this.lastTxTimeoutCount = 0;
+        this.priorityFeeTriggered = false;
+        this.lastTxTimeoutCountTriggered = currentTimeMs;
+        this.priorityFeeLatchDurationMs = priorityFeeLatchDurationMs;
+    }
+    /**
+     * Update the priority fee state based on the current time and the current timeout count.
+     * @param currentTimeMs current time in milliseconds
+     * @returns true if priority fee should be included in the next transaction
+     */
+    updatePriorityFee(currentTimeMs, txTimeoutCount) {
+        let triggerPriorityFee = false;
+        if (txTimeoutCount > this.lastTxTimeoutCount) {
+            this.lastTxTimeoutCount = txTimeoutCount;
+            this.lastTxTimeoutCountTriggered = currentTimeMs;
+            triggerPriorityFee = true;
+        }
+        else {
+            if (!this.priorityFeeTriggered) {
+                triggerPriorityFee = false;
+            }
+            else if (currentTimeMs - this.lastTxTimeoutCountTriggered <
+                this.priorityFeeLatchDurationMs) {
+                triggerPriorityFee = true;
+            }
+        }
+        this.priorityFeeTriggered = triggerPriorityFee;
+        return triggerPriorityFee;
+    }
+    /**
+     * This method returns a transaction instruction list that sets the compute limit on the ComputeBudget program.
+     * @param computeUnitLimit - The maximum number of compute units that can be used by the transaction.
+     * @returns An array of transaction instructions.
+     */
+    generateComputeBudgetIxs(computeUnitLimit) {
+        const ixs = [
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                units: computeUnitLimit,
+            }),
+        ];
+        return ixs;
+    }
+    /**
+     * Calculates the compute unit price to use based on the desired additional fee to pay and the compute unit limit.
+     * @param computeUnitLimit desired CU to use
+     * @param additionalFeeMicroLamports desired additional fee to pay, in micro lamports
+     * @returns the compute unit price to use, in micro lamports
+     */
+    calculateComputeUnitPrice(computeUnitLimit, additionalFeeMicroLamports) {
+        return additionalFeeMicroLamports / computeUnitLimit;
+    }
+    /**
+     * This method generates a list of transaction instructions for the ComputeBudget program, and includes a priority fee if it's required
+     * @param computeUnitLimit - The maximum number of compute units that can be used by the transaction.
+     * @param usePriorityFee - A boolean indicating whether to include a priority fee in the transaction, this should be from `this.updatePriorityFee()` or `this.priorityFeeTriggered()`.
+     * @param additionalFeeMicroLamports - The additional fee to be paid, in micro lamports, the actual price will be calculated.
+     * @returns An array of transaction instructions.
+     */
+    generateComputeBudgetWithPriorityFeeIx(computeUnitLimit, usePriorityFee, additionalFeeMicroLamports) {
+        const ixs = this.generateComputeBudgetIxs(computeUnitLimit);
+        if (usePriorityFee) {
+            const computeUnitPrice = this.calculateComputeUnitPrice(computeUnitLimit, additionalFeeMicroLamports);
+            ixs.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: computeUnitPrice,
+            }));
+        }
+        return ixs;
+    }
+}
+exports.PriorityFeeCalculator = PriorityFeeCalculator;

package/lib/types.d.ts

@@ -724,6 +724,7 @@ export type SpotMarketAccount = {
     maintenanceLiabilityWeight: number;
     liquidatorFee: number;
     imfFactor: number;
+    scaleInitialAssetWeightStart: BN;
     withdrawGuardThreshold: BN;
     depositTokenTwap: BN;
     borrowTokenTwap: BN;

package/lib/user.d.ts

@@ -8,6 +8,7 @@ import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './account
 import { PositionDirection, BN, SpotMarketAccount, MarketType } from '.';
 import { OraclePriceData } from './oracles/types';
 import { UserConfig } from './userConfig';
+import { StrictOraclePrice } from './oracles/strictOraclePrice';
 export declare class User {
     driftClient: DriftClient;
     userAccountPublicKey: PublicKey;
@@ -138,9 +139,9 @@ export declare class User {
         totalLiabilityValue: BN;
     };
     getSpotMarketLiabilityValue(marketIndex?: number, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean, now?: BN): BN;
-    getSpotLiabilityValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, liquidationBuffer?: BN, strict?: boolean, now?: BN): BN;
+    getSpotLiabilityValue(tokenAmount: BN, strictOraclePrice: StrictOraclePrice, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, liquidationBuffer?: BN): BN;
     getSpotMarketAssetValue(marketIndex?: number, marginCategory?: MarginCategory, includeOpenOrders?: boolean, strict?: boolean, now?: BN): BN;
-    getSpotAssetValue(tokenAmount: BN, oraclePriceData: OraclePriceData, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory, strict?: boolean, now?: BN): BN;
+    getSpotAssetValue(tokenAmount: BN, strictOraclePrice: StrictOraclePrice, spotMarketAccount: SpotMarketAccount, marginCategory?: MarginCategory): BN;
     getSpotPositionValue(marketIndex: number, marginCategory?: MarginCategory, includeOpenOrders?: boolean, strict?: boolean, now?: BN): BN;
     getNetSpotMarketValue(withWeightMarginCategory?: MarginCategory): BN;
     /**
@@ -306,8 +307,8 @@ export declare class User {
         leverage: BN;
     };
     cloneAndUpdateSpotPosition(position: SpotPosition, tokenAmount: BN, market: SpotMarketAccount): SpotPosition;
-    calculateSpotPositionFreeCollateralContribution(spotPosition: SpotPosition): BN;
-    calculateSpotPositionLeverageContribution(spotPosition: SpotPosition): {
+    calculateSpotPositionFreeCollateralContribution(spotPosition: SpotPosition, strictOraclePrice: StrictOraclePrice): BN;
+    calculateSpotPositionLeverageContribution(spotPosition: SpotPosition, strictOraclePrice: StrictOraclePrice): {
         totalAssetValue: BN;
         totalLiabilityValue: BN;
     };

package/lib/user.js

@@ -13,6 +13,7 @@ const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccoun
 const spotPosition_1 = require("./math/spotPosition");
 const oracles_1 = require("./math/oracles");
 const tiers_1 = require("./math/tiers");
+const strictOraclePrice_1 = require("./oracles/strictOraclePrice");
 class User {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -543,15 +544,21 @@ class User {
             }
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
+            let twap5min;
+            if (strict) {
+                twap5min = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
+                );
+            }
+            const strictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(oraclePriceData.price, twap5min);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX &&
                 countForQuote) {
                 const tokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType), spotPosition.balanceType);
                 if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const weightedTokenValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
+                    const weightedTokenValue = this.getSpotLiabilityValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory, liquidationBuffer).abs();
                     netQuoteValue = netQuoteValue.sub(weightedTokenValue);
                 }
                 else {
-                    const weightedTokenValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
+                    const weightedTokenValue = this.getSpotAssetValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory);
                     netQuoteValue = netQuoteValue.add(weightedTokenValue);
                 }
                 continue;
@@ -559,24 +566,24 @@ class User {
             if (!includeOpenOrders && countForBase) {
                 if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
                     const tokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType), _1.SpotBalanceType.BORROW);
-                    const liabilityValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
+                    const liabilityValue = this.getSpotLiabilityValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory, liquidationBuffer).abs();
                     totalLiabilityValue = totalLiabilityValue.add(liabilityValue);
                     continue;
                 }
                 else {
                     const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    const assetValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
+                    const assetValue = this.getSpotAssetValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory);
                     totalAssetValue = totalAssetValue.add(assetValue);
                     continue;
                 }
             }
-            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, this.getOracleDataForSpotMarket(spotPosition.marketIndex));
+            const { tokenAmount: worstCaseTokenAmount, ordersValue: worstCaseQuoteTokenAmount, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory !== null && marginCategory !== void 0 ? marginCategory : 'Initial');
             if (worstCaseTokenAmount.gt(numericConstants_1.ZERO) && countForBase) {
-                const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
+                const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, strictOraclePrice, spotMarketAccount, marginCategory);
                 totalAssetValue = totalAssetValue.add(baseAssetValue);
             }
             if (worstCaseTokenAmount.lt(numericConstants_1.ZERO) && countForBase) {
-                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
+                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, strictOraclePrice, spotMarketAccount, marginCategory, liquidationBuffer).abs();
                 totalLiabilityValue = totalLiabilityValue.add(baseLiabilityValue);
             }
             if (worstCaseQuoteTokenAmount.gt(numericConstants_1.ZERO) && countForQuote) {
@@ -609,16 +616,8 @@ class User {
         const { totalLiabilityValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict, now);
         return totalLiabilityValue;
     }
-    getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict = false, now) {
-        let liabilityValue = null;
-        if (strict) {
-            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
-            );
-            liabilityValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
-        }
-        else {
-            liabilityValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
-        }
+    getSpotLiabilityValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory, liquidationBuffer) {
+        let liabilityValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, strictOraclePrice);
         if (marginCategory !== undefined) {
             let weight = (0, spotBalance_1.calculateLiabilityWeight)(tokenAmount, spotMarketAccount, marginCategory);
             if (marginCategory === 'Initial') {
@@ -637,18 +636,10 @@ class User {
         const { totalAssetValue } = this.getSpotMarketAssetAndLiabilityValue(marketIndex, marginCategory, undefined, includeOpenOrders, strict, now);
         return totalAssetValue;
     }
-    getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict = false, now) {
-        let assetValue = null;
-        if (strict) {
-            const estOracleTwap = (0, oracles_1.calculateLiveOracleTwap)(spotMarketAccount.historicalOracleData, oraclePriceData, now, numericConstants_1.FIVE_MINUTE // 5MIN
-            );
-            assetValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData, estOracleTwap);
-        }
-        else {
-            assetValue = (0, _1.getTokenValue)(tokenAmount, spotMarketAccount.decimals, oraclePriceData);
-        }
+    getSpotAssetValue(tokenAmount, strictOraclePrice, spotMarketAccount, marginCategory) {
+        let assetValue = (0, _1.getStrictTokenValue)(tokenAmount, spotMarketAccount.decimals, strictOraclePrice);
         if (marginCategory !== undefined) {
-            const weight = (0, spotBalance_1.calculateAssetWeight)(tokenAmount, spotMarketAccount, marginCategory);
+            const weight = (0, spotBalance_1.calculateAssetWeight)(tokenAmount, strictOraclePrice.current, spotMarketAccount, marginCategory);
             assetValue = assetValue.mul(weight).div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
         }
         return assetValue;
@@ -1157,7 +1148,7 @@ class User {
     calculateFreeCollateralDeltaForSpot(market, signedTokenAmount) {
         const tokenPrecision = new _1.BN(Math.pow(10, market.decimals));
         if (signedTokenAmount.gt(numericConstants_1.ZERO)) {
-            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, market, 'Maintenance');
+            const assetWeight = (0, spotBalance_1.calculateAssetWeight)(signedTokenAmount, this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price, market, 'Maintenance');
             return numericConstants_1.QUOTE_PRECISION.mul(assetWeight)
                 .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
                 .mul(signedTokenAmount)
@@ -1279,11 +1270,12 @@ class User {
      */
     getMaxTradeSizeUSDCForSpot(targetMarketIndex, direction, currentQuoteAssetValue, currentSpotMarketNetValue) {
         const market = this.driftClient.getSpotMarketAccount(targetMarketIndex);
+        const oraclePrice = this.driftClient.getOraclePriceDataAndSlot(market.oracle).data.price;
         currentQuoteAssetValue = this.getSpotMarketAssetValue(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
         currentSpotMarketNetValue =
             currentSpotMarketNetValue !== null && currentSpotMarketNetValue !== void 0 ? currentSpotMarketNetValue : this.getSpotPositionValue(targetMarketIndex);
         let freeCollateral = this.getFreeCollateral();
-        const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', numericConstants_1.ZERO, (0, types_1.isVariant)(direction, 'long')
+        const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', numericConstants_1.ZERO, (0, types_1.isVariant)(direction, 'long')
             ? _1.SpotBalanceType.DEPOSIT
             : _1.SpotBalanceType.BORROW);
         let tradeAmount = numericConstants_1.ZERO;
@@ -1291,13 +1283,13 @@ class User {
             // if the user is buying/selling and already short/long, need to account for closing out short/long
             if ((0, types_1.isVariant)(direction, 'long') && currentSpotMarketNetValue.lt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue.abs();
-                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getTokenAmount(targetMarketIndex).abs(), _1.SpotBalanceType.BORROW);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(targetMarketIndex).abs(), _1.SpotBalanceType.BORROW);
                 freeCollateral = freeCollateral.add(tradeAmount.mul(new _1.BN(marginRatio)).div(numericConstants_1.MARGIN_PRECISION));
             }
             else if ((0, types_1.isVariant)(direction, 'short') &&
                 currentSpotMarketNetValue.gt(numericConstants_1.ZERO)) {
                 tradeAmount = currentSpotMarketNetValue;
-                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, 'Initial', this.getTokenAmount(targetMarketIndex), _1.SpotBalanceType.DEPOSIT);
+                const marginRatio = (0, _1.calculateSpotMarketMarginRatio)(market, oraclePrice, 'Initial', this.getTokenAmount(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)));
@@ -1322,8 +1314,12 @@ class User {
     getMaxSwapAmount({ inMarketIndex, outMarketIndex, calculateSwap, iterationLimit = 1000, }) {
         const inMarket = this.driftClient.getSpotMarketAccount(inMarketIndex);
         const outMarket = this.driftClient.getSpotMarketAccount(outMarketIndex);
-        const inOraclePrice = this.getOracleDataForSpotMarket(inMarketIndex).price;
-        const outOraclePrice = this.getOracleDataForSpotMarket(outMarketIndex).price;
+        const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
+        const inOraclePrice = inOraclePriceData.price;
+        const outOraclePriceData = this.getOracleDataForSpotMarket(outMarketIndex);
+        const outOraclePrice = outOraclePriceData.price;
+        const inStrictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(inOraclePrice);
+        const outStrictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(outOraclePrice);
         const inPrecision = new _1.BN(10 ** inMarket.decimals);
         const outPrecision = new _1.BN(10 ** outMarket.decimals);
         const inSpotPosition = this.getSpotPosition(inMarketIndex) ||
@@ -1331,10 +1327,10 @@ class User {
         const outSpotPosition = this.getSpotPosition(outMarketIndex) ||
             this.getEmptySpotPosition(outMarketIndex);
         const freeCollateral = this.getFreeCollateral();
-        const inContributionInitial = this.calculateSpotPositionFreeCollateralContribution(inSpotPosition);
-        const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition);
-        const outContributionInitial = this.calculateSpotPositionFreeCollateralContribution(outSpotPosition);
-        const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition);
+        const inContributionInitial = this.calculateSpotPositionFreeCollateralContribution(inSpotPosition, inStrictOraclePrice);
+        const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition, inStrictOraclePrice);
+        const outContributionInitial = this.calculateSpotPositionFreeCollateralContribution(outSpotPosition, outStrictOraclePrice);
+        const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
         const initialContribution = inContributionInitial.add(outContributionInitial);
         const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         if (!calculateSwap) {
@@ -1374,8 +1370,8 @@ class User {
                 outSwap = calculateSwap(inSwap);
                 const inPositionAfter = this.cloneAndUpdateSpotPosition(inSpotPosition, inSwap.neg(), inMarket);
                 const outPositionAfter = this.cloneAndUpdateSpotPosition(outSpotPosition, outSwap, outMarket);
-                const inContributionAfter = this.calculateSpotPositionFreeCollateralContribution(inPositionAfter);
-                const outContributionAfter = this.calculateSpotPositionFreeCollateralContribution(outPositionAfter);
+                const inContributionAfter = this.calculateSpotPositionFreeCollateralContribution(inPositionAfter, inStrictOraclePrice);
+                const outContributionAfter = this.calculateSpotPositionFreeCollateralContribution(outPositionAfter, outStrictOraclePrice);
                 const contributionAfter = inContributionAfter.add(outContributionAfter);
                 const contributionDelta = contributionAfter.sub(initialContribution);
                 freeCollateralAfter = freeCollateral.add(contributionDelta);
@@ -1395,8 +1391,8 @@ class User {
         }
         const inPositionAfter = this.cloneAndUpdateSpotPosition(inSpotPosition, inSwap.neg(), inMarket);
         const outPositionAfter = this.cloneAndUpdateSpotPosition(outSpotPosition, outSwap, outMarket);
-        const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter);
-        const { totalAssetValue: outTotalAssetValueAfter, totalLiabilityValue: outTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(outPositionAfter);
+        const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter, inStrictOraclePrice);
+        const { totalAssetValue: outTotalAssetValueAfter, totalLiabilityValue: outTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(outPositionAfter, outStrictOraclePrice);
         const spotAssetValueDelta = inTotalAssetValueAfter
             .add(outTotalAssetValueAfter)
             .sub(inTotalAssetValueInitial)
@@ -1441,45 +1437,28 @@ class User {
         }
         return clonedPosition;
     }
-    calculateSpotPositionFreeCollateralContribution(spotPosition) {
-        let freeCollateralContribution = numericConstants_1.ZERO;
-        const now = new _1.BN(new Date().getTime() / 1000);
-        const strict = true;
+    calculateSpotPositionFreeCollateralContribution(spotPosition, strictOraclePrice) {
         const marginCategory = 'Initial';
         const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
-        const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
-        const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, oraclePriceData);
-        if (worstCaseTokenAmount.gt(numericConstants_1.ZERO)) {
-            const baseAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
-            freeCollateralContribution =
-                freeCollateralContribution.add(baseAssetValue);
-        }
-        else {
-            const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, undefined, strict, now).abs();
-            freeCollateralContribution =
-                freeCollateralContribution.sub(baseLiabilityValue);
-        }
-        freeCollateralContribution.add(worstCaseQuoteTokenAmount);
+        const { freeCollateralContribution } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory);
         return freeCollateralContribution;
     }
-    calculateSpotPositionLeverageContribution(spotPosition) {
+    calculateSpotPositionLeverageContribution(spotPosition, strictOraclePrice) {
         let totalAssetValue = numericConstants_1.ZERO;
         let totalLiabilityValue = numericConstants_1.ZERO;
-        const now = new _1.BN(new Date().getTime() / 1000);
         const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
-        const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
-        const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, oraclePriceData);
-        if (worstCaseTokenAmount.gt(numericConstants_1.ZERO)) {
-            totalAssetValue = this.getSpotAssetValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, undefined, false, now);
+        const { tokenValue, ordersValue } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, 'Initial');
+        if (tokenValue.gte(numericConstants_1.ZERO)) {
+            totalAssetValue = tokenValue;
         }
         else {
-            totalLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, undefined, undefined, false, now).abs();
+            totalLiabilityValue = tokenValue.abs();
         }
-        if (worstCaseQuoteTokenAmount.gt(numericConstants_1.ZERO)) {
-            totalAssetValue = totalAssetValue.add(worstCaseQuoteTokenAmount);
+        if (ordersValue.gt(numericConstants_1.ZERO)) {
+            totalAssetValue = totalAssetValue.add(ordersValue);
         }
         else {
-            totalLiabilityValue = totalLiabilityValue.add(worstCaseQuoteTokenAmount.abs());
+            totalLiabilityValue = totalLiabilityValue.add(ordersValue.abs());
         }
         return {
             totalAssetValue,
@@ -1496,17 +1475,23 @@ class User {
     accountLeverageAfterSwap({ inMarketIndex, outMarketIndex, inAmount, outAmount, }) {
         const inMarket = this.driftClient.getSpotMarketAccount(inMarketIndex);
         const outMarket = this.driftClient.getSpotMarketAccount(outMarketIndex);
+        const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
+        const inOraclePrice = inOraclePriceData.price;
+        const outOraclePriceData = this.getOracleDataForSpotMarket(outMarketIndex);
+        const outOraclePrice = outOraclePriceData.price;
+        const inStrictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(inOraclePrice);
+        const outStrictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(outOraclePrice);
         const inSpotPosition = this.getSpotPosition(inMarketIndex) ||
             this.getEmptySpotPosition(inMarketIndex);
         const outSpotPosition = this.getSpotPosition(outMarketIndex) ||
             this.getEmptySpotPosition(outMarketIndex);
-        const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition);
-        const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition);
+        const { totalAssetValue: inTotalAssetValueInitial, totalLiabilityValue: inTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(inSpotPosition, inStrictOraclePrice);
+        const { totalAssetValue: outTotalAssetValueInitial, totalLiabilityValue: outTotalLiabilityValueInitial, } = this.calculateSpotPositionLeverageContribution(outSpotPosition, outStrictOraclePrice);
         const { perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue } = this.getLeverageComponents();
         const inPositionAfter = this.cloneAndUpdateSpotPosition(inSpotPosition, inAmount.abs().neg(), inMarket);
         const outPositionAfter = this.cloneAndUpdateSpotPosition(outSpotPosition, outAmount.abs(), outMarket);
-        const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter);
-        const { totalAssetValue: outTotalAssetValueAfter, totalLiabilityValue: outTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(outPositionAfter);
+        const { totalAssetValue: inTotalAssetValueAfter, totalLiabilityValue: inTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(inPositionAfter, inStrictOraclePrice);
+        const { totalAssetValue: outTotalAssetValueAfter, totalLiabilityValue: outTotalLiabilityValueAfter, } = this.calculateSpotPositionLeverageContribution(outPositionAfter, outStrictOraclePrice);
         const spotAssetValueDelta = inTotalAssetValueAfter
             .add(outTotalAssetValueAfter)
             .sub(inTotalAssetValueInitial)
@@ -1634,7 +1619,7 @@ class User {
         if (canBypass) {
             withdrawLimit = _1.BN.max(withdrawLimit, userDepositAmount);
         }
-        const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, spotMarket, 'Initial');
+        const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, oracleData.price, spotMarket, 'Initial');
         const amountWithdrawable = assetWeight.eq(numericConstants_1.ZERO)
             ? userDepositAmount
             : freeCollateral
@@ -1816,26 +1801,17 @@ class User {
         for (const spotPosition of this.getActiveSpotPositions()) {
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
+            const strictOraclePrice = new strictOraclePrice_1.StrictOraclePrice(oraclePriceData.price);
             if (spotPosition.marketIndex === numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
                 const tokenAmount = (0, _1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType), spotPosition.balanceType);
                 netQuoteValue = netQuoteValue.add(tokenAmount);
                 continue;
             }
-            const [worstCaseTokenAmount, worstCaseQuoteTokenAmount] = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, oraclePriceData);
-            netQuoteValue = netQuoteValue.add(worstCaseQuoteTokenAmount);
-            const baseAssetValue = (0, _1.getTokenValue)(worstCaseTokenAmount.abs(), spotMarketAccount.decimals, oraclePriceData);
-            const isLiability = (0, types_1.isVariant)(spotPosition.balanceType, 'borrow');
-            let weight;
-            if (isLiability) {
-                weight = (0, spotBalance_1.calculateLiabilityWeight)(worstCaseTokenAmount.abs(), spotMarketAccount, marginCategory);
-            }
-            else {
-                weight = (0, spotBalance_1.calculateAssetWeight)(worstCaseTokenAmount, spotMarketAccount, marginCategory);
-            }
-            const weightedValue = baseAssetValue
-                .mul(weight)
-                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
-            if (isLiability) {
+            const { tokenAmount: worstCaseTokenAmount, tokenValue: tokenValue, weight, weightedTokenValue: weightedTokenValue, ordersValue: ordersValue, } = (0, spotPosition_1.getWorstCaseTokenAmounts)(spotPosition, spotMarketAccount, strictOraclePrice, marginCategory);
+            netQuoteValue = netQuoteValue.add(ordersValue);
+            const baseAssetValue = tokenValue.abs();
+            const weightedValue = weightedTokenValue.abs();
+            if (weightedTokenValue.lt(numericConstants_1.ZERO)) {
                 healthComponents.borrows.push({
                     marketIndex: spotMarketAccount.marketIndex,
                     size: worstCaseTokenAmount,
@@ -1857,25 +1833,15 @@ class User {
         if (!netQuoteValue.eq(numericConstants_1.ZERO)) {
             const spotMarketAccount = this.driftClient.getQuoteSpotMarketAccount();
             const oraclePriceData = this.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-            const baseAssetValue = (0, _1.getTokenValue)(netQuoteValue.abs(), spotMarketAccount.decimals, oraclePriceData);
-            const isLiability = netQuoteValue.lt(numericConstants_1.ZERO);
-            let weight;
-            if (isLiability) {
-                weight = (0, spotBalance_1.calculateLiabilityWeight)(netQuoteValue.abs(), spotMarketAccount, marginCategory);
-            }
-            else {
-                weight = (0, spotBalance_1.calculateAssetWeight)(netQuoteValue, spotMarketAccount, marginCategory);
-            }
-            const weightedValue = baseAssetValue
-                .mul(weight)
-                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
-            if (isLiability) {
+            const baseAssetValue = (0, _1.getTokenValue)(netQuoteValue, spotMarketAccount.decimals, oraclePriceData);
+            const { weight, weightedTokenValue } = (0, spotPosition_1.calculateWeightedTokenValue)(netQuoteValue, baseAssetValue, oraclePriceData.price, spotMarketAccount, marginCategory);
+            if (netQuoteValue.lt(numericConstants_1.ZERO)) {
                 healthComponents.borrows.push({
                     marketIndex: spotMarketAccount.marketIndex,
                     size: netQuoteValue,
-                    value: baseAssetValue,
+                    value: baseAssetValue.abs(),
                     weight: weight,
-                    weightedValue: weightedValue,
+                    weightedValue: weightedTokenValue.abs(),
                 });
             }
             else {
@@ -1884,7 +1850,7 @@ class User {
                     size: netQuoteValue,
                     value: baseAssetValue,
                     weight: weight,
-                    weightedValue: weightedValue,
+                    weightedValue: weightedTokenValue,
                 });
             }
         }

package/package.json

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

package/src/adminClient.ts

@@ -909,6 +909,29 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async updateSpotMarketScaleInitialAssetWeightStart(
+		spotMarketIndex: number,
+		scaleInitialAssetWeightStart: BN
+	): Promise<TransactionSignature> {
+		const tx =
+			this.program.transaction.updateSpotMarketScaleInitialAssetWeightStart(
+				scaleInitialAssetWeightStart,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						spotMarket: await getSpotMarketPublicKey(
+							this.program.programId,
+							spotMarketIndex
+						),
+					},
+				}
+			);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
 	public async updateInsuranceFundUnstakingPeriod(
 		spotMarketIndex: number,
 		insuranceWithdrawEscrowPeriod: BN