@drift-labs/sdk 2.37.1-beta.1 → 2.37.1-beta.10

package/lib/tx/retryTxSender.js

@@ -1,17 +1,13 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
-const web3_js_1 = require("@solana/web3.js");
 const anchor_1 = require("@coral-xyz/anchor");
-const assert_1 = __importDefault(require("assert"));
-const bs58_1 = __importDefault(require("bs58"));
+const baseTxSender_1 = require("./baseTxSender");
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
-class RetryTxSender {
+class RetryTxSender extends baseTxSender_1.BaseTxSender {
     constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, additionalConnections = new Array(), }) {
+        super({ connection, wallet, opts, timeout, additionalConnections });
         this.timoutCount = 0;
         this.connection = connection;
         this.wallet = wallet;
@@ -20,66 +16,11 @@ class RetryTxSender {
         this.retrySleep = retrySleep;
         this.additionalConnections = additionalConnections;
     }
-    async send(tx, additionalSigners, opts, preSigned) {
-        if (additionalSigners === undefined) {
-            additionalSigners = [];
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        const signedTx = preSigned
-            ? tx
-            : await this.prepareTx(tx, additionalSigners, opts);
-        return this.sendRawTransaction(signedTx.serialize(), opts);
-    }
-    async prepareTx(tx, additionalSigners, opts) {
-        tx.feePayer = this.wallet.publicKey;
-        tx.recentBlockhash = (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
-        additionalSigners
-            .filter((s) => s !== undefined)
-            .forEach((kp) => {
-            tx.partialSign(kp);
+    async sleep(reference) {
+        return new Promise((resolve) => {
+            reference.resolve = resolve;
+            setTimeout(resolve, this.retrySleep);
         });
-        const signedTx = await this.wallet.signTransaction(tx);
-        return signedTx;
-    }
-    async getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
-        if (additionalSigners === undefined) {
-            additionalSigners = [];
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        const message = new web3_js_1.TransactionMessage({
-            payerKey: this.wallet.publicKey,
-            recentBlockhash: (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash,
-            instructions: ixs,
-        }).compileToV0Message(lookupTableAccounts);
-        const tx = new web3_js_1.VersionedTransaction(message);
-        return tx;
-    }
-    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
-        let signedTx;
-        if (preSigned) {
-            signedTx = tx;
-            // @ts-ignore
-        }
-        else if (this.wallet.payer) {
-            // @ts-ignore
-            tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.wallet.payer));
-            signedTx = tx;
-        }
-        else {
-            additionalSigners === null || additionalSigners === void 0 ? void 0 : additionalSigners.filter((s) => s !== undefined).forEach((kp) => {
-                tx.sign([kp]);
-            });
-            // @ts-ignore
-            signedTx = await this.wallet.signTransaction(tx);
-        }
-        if (opts === undefined) {
-            opts = this.opts;
-        }
-        return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async sendRawTransaction(rawTransaction, opts) {
         const startTime = this.getTimestamp();
@@ -130,97 +71,5 @@ class RetryTxSender {
         }
         return { txSig: txid, slot };
     }
-    async confirmTransaction(signature, commitment) {
-        let decodedSignature;
-        try {
-            decodedSignature = bs58_1.default.decode(signature);
-        }
-        catch (err) {
-            throw new Error('signature must be base58 encoded: ' + signature);
-        }
-        (0, assert_1.default)(decodedSignature.length === 64, 'signature has invalid length');
-        const start = Date.now();
-        const subscriptionCommitment = commitment || this.opts.commitment;
-        const subscriptionIds = new Array();
-        const connections = [this.connection, ...this.additionalConnections];
-        let response = null;
-        const promises = connections.map((connection, i) => {
-            let subscriptionId;
-            const confirmPromise = new Promise((resolve, reject) => {
-                try {
-                    subscriptionId = connection.onSignature(signature, (result, context) => {
-                        subscriptionIds[i] = undefined;
-                        response = {
-                            context,
-                            value: result,
-                        };
-                        resolve(null);
-                    }, subscriptionCommitment);
-                }
-                catch (err) {
-                    reject(err);
-                }
-            });
-            subscriptionIds.push(subscriptionId);
-            return confirmPromise;
-        });
-        try {
-            await this.promiseTimeout(promises, this.timeout);
-        }
-        finally {
-            for (const [i, subscriptionId] of subscriptionIds.entries()) {
-                if (subscriptionId) {
-                    connections[i].removeSignatureListener(subscriptionId);
-                }
-            }
-        }
-        if (response === null) {
-            this.timoutCount += 1;
-            const duration = (Date.now() - start) / 1000;
-            throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
-        }
-        return response;
-    }
-    getTimestamp() {
-        return new Date().getTime();
-    }
-    async sleep(reference) {
-        return new Promise((resolve) => {
-            reference.resolve = resolve;
-            setTimeout(resolve, this.retrySleep);
-        });
-    }
-    promiseTimeout(promises, timeoutMs) {
-        let timeoutId;
-        const timeoutPromise = new Promise((resolve) => {
-            timeoutId = setTimeout(() => resolve(null), timeoutMs);
-        });
-        return Promise.race([...promises, timeoutPromise]).then((result) => {
-            clearTimeout(timeoutId);
-            return result;
-        });
-    }
-    sendToAdditionalConnections(rawTx, opts) {
-        this.additionalConnections.map((connection) => {
-            connection.sendRawTransaction(rawTx, opts).catch((e) => {
-                console.error(
-                // @ts-ignore
-                `error sending tx to additional connection ${connection._rpcEndpoint}`);
-                console.error(e);
-            });
-        });
-    }
-    addAdditionalConnection(newConnection) {
-        const alreadyUsingConnection = this.additionalConnections.filter((connection) => {
-            // @ts-ignore
-            return connection._rpcEndpoint === newConnection.rpcEndpoint;
-        }).length > 0;
-        if (!alreadyUsingConnection) {
-            this.additionalConnections.push(newConnection);
-        }
-    }
-    getTimeoutCount() {
-        return this.timoutCount;
-    }
 }
 exports.RetryTxSender = RetryTxSender;

package/lib/types.d.ts

@@ -50,6 +50,9 @@ export declare class UserStatus {
     static readonly BANKRUPT: {
         bankrupt: {};
     };
+    static readonly REDUCE_ONLY: {
+        reduceOnly: {};
+    };
 }
 export declare class ContractType {
     static readonly PERPETUAL: {
@@ -818,6 +821,7 @@ export type AMM = {
     bidQuoteAssetReserve: BN;
     askBaseAssetReserve: BN;
     askQuoteAssetReserve: BN;
+    perLpBase: number;
 };
 export type PerpPosition = {
     baseAssetAmount: BN;
@@ -834,6 +838,7 @@ export type PerpPosition = {
     remainderBaseAssetAmount: number;
     lastBaseAssetAmountPerLp: BN;
     lastQuoteAssetAmountPerLp: BN;
+    perLpBase: number;
 };
 export type UserStatsAccount = {
     numberOfSubAccounts: number;
@@ -1114,3 +1119,16 @@ export type PerpMarketExtendedInfo = {
     pnlPoolValue: BN;
     contractTier: ContractTier;
 };
+export type HealthComponents = {
+    deposits: HealthComponent[];
+    borrows: HealthComponent[];
+    perpPositions: HealthComponent[];
+    perpPnl: HealthComponent[];
+};
+export type HealthComponent = {
+    marketIndex: number;
+    size: BN;
+    value: BN;
+    weight: BN;
+    weightedValue: BN;
+};

package/lib/types.js

@@ -33,6 +33,7 @@ exports.UserStatus = UserStatus;
 UserStatus.ACTIVE = { active: {} };
 UserStatus.BEING_LIQUIDATED = { beingLiquidated: {} };
 UserStatus.BANKRUPT = { bankrupt: {} };
+UserStatus.REDUCE_ONLY = { reduceOnly: {} };
 class ContractType {
 }
 exports.ContractType = ContractType;

package/lib/user.d.ts

@@ -3,7 +3,7 @@ import { PublicKey } from '@solana/web3.js';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { DriftClient } from './driftClient';
-import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount } from './types';
+import { MarginCategory, Order, UserAccount, PerpPosition, SpotPosition, PerpMarketAccount, HealthComponents } from './types';
 import { UserAccountSubscriber, UserAccountEvents, DataAndSlot } from './accounts/types';
 import { PositionDirection, BN, SpotMarketAccount, MarketType } from '.';
 import { OraclePriceData } from './oracles/types';
@@ -153,6 +153,12 @@ export declare class User {
      * @returns : number (value from [0, 100])
      */
     getHealth(): number;
+    calculateWeightedPerpPositionValue(perpPosition: PerpPosition, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean): BN;
+    /**
+     * calculates position value of a single perp market in margin system
+     * @returns : Precision QUOTE_PRECISION
+     */
+    getPerpMarketLiabilityValue(marketIndex: number, marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean): BN;
     /**
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
@@ -352,6 +358,9 @@ export declare class User {
         perpTier: number;
         spotTier: number;
     };
+    getHealthComponents({ marginCategory, }: {
+        marginCategory: MarginCategory;
+    }): HealthComponents;
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/lib/user.js

@@ -145,6 +145,7 @@ class User {
             lpShares: numericConstants_1.ZERO,
             lastBaseAssetAmountPerLp: numericConstants_1.ZERO,
             lastQuoteAssetAmountPerLp: numericConstants_1.ZERO,
+            perLpBase: 0,
         };
     }
     getClonedPosition(position) {
@@ -258,17 +259,54 @@ class User {
         }
         const position = this.getClonedPosition(originalPosition);
         const market = this.driftClient.getPerpMarketAccount(position.marketIndex);
+        if (market.amm.perLpBase != position.perLpBase) {
+            // perLpBase = 1 => per 10 LP shares, perLpBase = -1 => per 0.1 LP shares
+            const expoDiff = market.amm.perLpBase - position.perLpBase;
+            const marketPerLpRebaseScalar = new _1.BN(10 ** Math.abs(expoDiff));
+            if (expoDiff > 0) {
+                position.lastBaseAssetAmountPerLp =
+                    position.lastBaseAssetAmountPerLp.mul(marketPerLpRebaseScalar);
+                position.lastQuoteAssetAmountPerLp =
+                    position.lastQuoteAssetAmountPerLp.mul(marketPerLpRebaseScalar);
+            }
+            else {
+                position.lastBaseAssetAmountPerLp =
+                    position.lastBaseAssetAmountPerLp.div(marketPerLpRebaseScalar);
+                position.lastQuoteAssetAmountPerLp =
+                    position.lastQuoteAssetAmountPerLp.div(marketPerLpRebaseScalar);
+            }
+            position.perLpBase = position.perLpBase + expoDiff;
+        }
         const nShares = position.lpShares;
         // incorp unsettled funding on pre settled position
         const quoteFundingPnl = (0, _1.calculatePositionFundingPNL)(market, position);
+        let baseUnit = numericConstants_1.AMM_RESERVE_PRECISION;
+        if (market.amm.perLpBase == position.perLpBase) {
+            if (position.perLpBase >= 0 &&
+                position.perLpBase <= numericConstants_1.AMM_RESERVE_PRECISION_EXP.toNumber()) {
+                const marketPerLpRebase = new _1.BN(10 ** market.amm.perLpBase);
+                baseUnit = baseUnit.mul(marketPerLpRebase);
+            }
+            else if (position.perLpBase < 0 &&
+                position.perLpBase >= -numericConstants_1.AMM_RESERVE_PRECISION_EXP.toNumber()) {
+                const marketPerLpRebase = new _1.BN(10 ** Math.abs(market.amm.perLpBase));
+                baseUnit = baseUnit.div(marketPerLpRebase);
+            }
+            else {
+                throw 'cannot calc';
+            }
+        }
+        else {
+            throw 'market.amm.perLpBase != position.perLpBase';
+        }
         const deltaBaa = market.amm.baseAssetAmountPerLp
             .sub(position.lastBaseAssetAmountPerLp)
             .mul(nShares)
-            .div(numericConstants_1.AMM_RESERVE_PRECISION);
+            .div(baseUnit);
         const deltaQaa = market.amm.quoteAssetAmountPerLp
             .sub(position.lastQuoteAssetAmountPerLp)
             .mul(nShares)
-            .div(numericConstants_1.AMM_RESERVE_PRECISION);
+            .div(baseUnit);
         function sign(v) {
             return v.isNeg() ? new _1.BN(-1) : new _1.BN(1);
         }
@@ -464,7 +502,7 @@ class User {
             }
             positionUnrealizedPnl = positionUnrealizedPnl
                 .mul(quotePrice)
-                .div(new _1.BN(numericConstants_1.PRICE_PRECISION));
+                .div(numericConstants_1.PRICE_PRECISION);
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                     positionUnrealizedPnl = positionUnrealizedPnl
@@ -660,64 +698,81 @@ class User {
         }
         return health;
     }
+    calculateWeightedPerpPositionValue(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
+        const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
+        if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+            // is an lp, clone so we dont mutate the position
+            perpPosition = this.getPerpPositionWithLPSettle(market.marketIndex, this.getClonedPosition(perpPosition), !!marginCategory)[0];
+        }
+        let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
+        if ((0, types_1.isVariant)(market.status, 'settlement')) {
+            valuationPrice = market.expiryPrice;
+        }
+        const baseAssetAmount = includeOpenOrders
+            ? (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition)
+            : perpPosition.baseAssetAmount;
+        let baseAssetValue = baseAssetAmount
+            .abs()
+            .mul(valuationPrice)
+            .div(numericConstants_1.BASE_PRECISION);
+        if (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 ((0, types_1.isVariant)(market.status, 'settlement')) {
+                marginRatio = numericConstants_1.ZERO;
+            }
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
+            let quotePrice;
+            if (strict) {
+                quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+            }
+            else {
+                quotePrice = quoteOraclePriceData.price;
+            }
+            baseAssetValue = baseAssetValue
+                .mul(quotePrice)
+                .div(numericConstants_1.PRICE_PRECISION)
+                .mul(marginRatio)
+                .div(numericConstants_1.MARGIN_PRECISION);
+            if (includeOpenOrders) {
+                baseAssetValue = baseAssetValue.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
+                if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+                    baseAssetValue = baseAssetValue.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, valuationPrice
+                        .mul(market.amm.orderStepSize)
+                        .mul(numericConstants_1.QUOTE_PRECISION)
+                        .div(numericConstants_1.AMM_RESERVE_PRECISION)
+                        .div(numericConstants_1.PRICE_PRECISION)));
+                }
+            }
+        }
+        return baseAssetValue;
+    }
+    /**
+     * calculates position value of a single perp market in margin system
+     * @returns : Precision QUOTE_PRECISION
+     */
+    getPerpMarketLiabilityValue(marketIndex, marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
+        const perpPosition = this.getPerpPosition(marketIndex);
+        if (!perpPosition) {
+            return numericConstants_1.ZERO;
+        }
+        else {
+            return this.calculateWeightedPerpPositionValue(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
+        }
+    }
     /**
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
     getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders, strict = false) {
         return this.getActivePerpPositions().reduce((totalPerpValue, perpPosition) => {
-            const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
-            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                // is an lp, clone so we dont mutate the position
-                perpPosition = this.getPerpPositionWithLPSettle(market.marketIndex, this.getClonedPosition(perpPosition), !!marginCategory)[0];
-            }
-            let valuationPrice = this.getOracleDataForPerpMarket(market.marketIndex).price;
-            if ((0, types_1.isVariant)(market.status, 'settlement')) {
-                valuationPrice = market.expiryPrice;
-            }
-            const baseAssetAmount = includeOpenOrders
-                ? (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((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 ((0, types_1.isVariant)(market.status, 'settlement')) {
-                    marginRatio = numericConstants_1.ZERO;
-                }
-                const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
-                const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
-                let quotePrice;
-                if (strict) {
-                    quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
-                }
-                else {
-                    quotePrice = quoteOraclePriceData.price;
-                }
-                baseAssetValue = baseAssetValue
-                    .mul(quotePrice)
-                    .div(numericConstants_1.PRICE_PRECISION)
-                    .mul(marginRatio)
-                    .div(numericConstants_1.MARGIN_PRECISION);
-                if (includeOpenOrders) {
-                    baseAssetValue = baseAssetValue.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
-                    if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                        baseAssetValue = baseAssetValue.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, valuationPrice
-                            .mul(market.amm.orderStepSize)
-                            .mul(numericConstants_1.QUOTE_PRECISION)
-                            .div(numericConstants_1.AMM_RESERVE_PRECISION)
-                            .div(numericConstants_1.PRICE_PRECISION)));
-                    }
-                }
-            }
+            const baseAssetValue = this.calculateWeightedPerpPositionValue(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict);
             return totalPerpValue.add(baseAssetValue);
         }, numericConstants_1.ZERO);
     }
@@ -1589,12 +1644,15 @@ class User {
         if (canBypass) {
             withdrawLimit = _1.BN.max(withdrawLimit, userDepositAmount);
         }
-        const amountWithdrawable = freeCollateral
-            .mul(numericConstants_1.MARGIN_PRECISION)
-            .div(new _1.BN(spotMarket.initialAssetWeight))
-            .mul(numericConstants_1.PRICE_PRECISION)
-            .div(oracleData.price)
-            .mul(precisionIncrease);
+        const assetWeight = (0, spotBalance_1.calculateAssetWeight)(userDepositAmount, spotMarket, 'Initial');
+        const amountWithdrawable = assetWeight.eq(numericConstants_1.ZERO)
+            ? userDepositAmount
+            : freeCollateral
+                .mul(numericConstants_1.MARGIN_PRECISION)
+                .div(assetWeight)
+                .mul(numericConstants_1.PRICE_PRECISION)
+                .div(oracleData.price)
+                .mul(precisionIncrease);
         const maxWithdrawValue = _1.BN.min(_1.BN.min(amountWithdrawable, userDepositAmount), withdrawLimit.abs());
         if (reduceOnly) {
             return _1.BN.max(maxWithdrawValue, numericConstants_1.ZERO);
@@ -1702,6 +1760,146 @@ class User {
             spotTier: safestSpotTier,
         };
     }
+    getHealthComponents({ marginCategory, }) {
+        const healthComponents = {
+            deposits: [],
+            borrows: [],
+            perpPositions: [],
+            perpPnl: [],
+        };
+        for (const perpPosition of this.getActivePerpPositions()) {
+            const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
+            const oraclePriceData = this.driftClient.getOraclePriceDataAndSlot(perpMarket.amm.oracle).data;
+            const oraclePrice = oraclePriceData.price;
+            const worstCaseBaseAmount = (0, margin_1.calculateWorstCaseBaseAssetAmount)(perpPosition);
+            const marginRatio = new _1.BN((0, _1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory));
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
+            const quoteOraclePriceData = this.driftClient.getOraclePriceDataAndSlot(quoteSpotMarket.oracle).data;
+            const baseAssetValue = worstCaseBaseAmount
+                .abs()
+                .mul(oraclePrice)
+                .div(numericConstants_1.BASE_PRECISION);
+            let marginRequirement = baseAssetValue
+                .mul(quoteOraclePriceData.price)
+                .div(numericConstants_1.PRICE_PRECISION)
+                .mul(marginRatio)
+                .div(numericConstants_1.MARGIN_PRECISION);
+            marginRequirement = marginRequirement.add(new _1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
+            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
+                marginRequirement = marginRequirement.add(_1.BN.max(numericConstants_1.QUOTE_PRECISION, oraclePrice
+                    .mul(perpMarket.amm.orderStepSize)
+                    .mul(numericConstants_1.QUOTE_PRECISION)
+                    .div(numericConstants_1.AMM_RESERVE_PRECISION)
+                    .div(numericConstants_1.PRICE_PRECISION)));
+            }
+            healthComponents.perpPositions.push({
+                marketIndex: perpMarket.marketIndex,
+                size: worstCaseBaseAmount,
+                value: baseAssetValue,
+                weight: marginRatio,
+                weightedValue: marginRequirement,
+            });
+            const settledPerpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
+            const positionUnrealizedPnl = (0, _1.calculatePositionPNL)(perpMarket, settledPerpPosition, true, oraclePriceData);
+            let pnlWeight;
+            if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
+                pnlWeight = (0, _1.calculateUnrealizedAssetWeight)(perpMarket, quoteSpotMarket, positionUnrealizedPnl, marginCategory, oraclePriceData);
+            }
+            else {
+                pnlWeight = numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION;
+            }
+            const pnlValue = positionUnrealizedPnl
+                .mul(quoteOraclePriceData.price)
+                .div(numericConstants_1.PRICE_PRECISION);
+            const wegithedPnlValue = pnlValue
+                .mul(pnlWeight)
+                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+            healthComponents.perpPnl.push({
+                marketIndex: perpMarket.marketIndex,
+                size: positionUnrealizedPnl,
+                value: pnlValue,
+                weight: pnlWeight,
+                weightedValue: wegithedPnlValue,
+            });
+        }
+        let netQuoteValue = numericConstants_1.ZERO;
+        for (const spotPosition of this.getActiveSpotPositions()) {
+            const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
+            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) {
+                healthComponents.borrows.push({
+                    marketIndex: spotMarketAccount.marketIndex,
+                    size: worstCaseTokenAmount,
+                    value: baseAssetValue,
+                    weight: weight,
+                    weightedValue: weightedValue,
+                });
+            }
+            else {
+                healthComponents.deposits.push({
+                    marketIndex: spotMarketAccount.marketIndex,
+                    size: worstCaseTokenAmount,
+                    value: baseAssetValue,
+                    weight: weight,
+                    weightedValue: weightedValue,
+                });
+            }
+        }
+        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) {
+                healthComponents.borrows.push({
+                    marketIndex: spotMarketAccount.marketIndex,
+                    size: netQuoteValue,
+                    value: baseAssetValue,
+                    weight: weight,
+                    weightedValue: weightedValue,
+                });
+            }
+            else {
+                healthComponents.deposits.push({
+                    marketIndex: spotMarketAccount.marketIndex,
+                    size: netQuoteValue,
+                    value: baseAssetValue,
+                    weight: weight,
+                    weightedValue: weightedValue,
+                });
+            }
+        }
+        return healthComponents;
+    }
     /**
      * Get the total position value, excluding any position coming from the given target market
      * @param marketToIgnore

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.37.1-beta.1",
+	"version": "2.37.1-beta.10",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -55,7 +55,7 @@
 		"eslint-plugin-prettier": "^3.4.0",
 		"lodash": "^4.17.21",
 		"mocha": "^10.0.0",
-		"prettier": "^2.4.1",
+		"prettier": "^3.0.1",
 		"ts-node": "^10.8.0",
 		"typescript": "^4.9.5"
 	},