@drift-labs/sdk 2.22.0 → 2.23.0-beta.0

package/lib/driftClient.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 import { AnchorProvider, BN, Program, ProgramAccount } from '@project-serum/anchor';
-import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo } from './types';
+import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, ReferrerNameAccount, OrderTriggerCondition, PerpMarketExtendedInfo, UserStatsAccount } from './types';
 import * as anchor from '@project-serum/anchor';
 import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
@@ -104,6 +104,7 @@ export declare class DriftClient {
     fetchAllUserAccounts(includeIdle?: boolean): Promise<ProgramAccount<UserAccount>[]>;
     getUserAccountsForDelegate(delegate: PublicKey): Promise<UserAccount[]>;
     getUserAccountsForAuthority(authority: PublicKey): Promise<UserAccount[]>;
+    getReferredUserStatsAccountsByReferrer(referrer: PublicKey): Promise<UserStatsAccount[]>;
     getReferrerNameAccountsForAuthority(authority: PublicKey): Promise<ReferrerNameAccount[]>;
     deleteUser(subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getUser(subAccountId?: number): User;

package/lib/driftClient.js

@@ -464,6 +464,18 @@ class DriftClient {
         ]);
         return programAccounts.map((programAccount) => programAccount.account);
     }
+    async getReferredUserStatsAccountsByReferrer(referrer) {
+        const programAccounts = await this.program.account.userStats.all([
+            {
+                memcmp: {
+                    offset: 40,
+                    /** data to match, as base-58 encoded string and limited to less than 129 bytes */
+                    bytes: bs58_1.default.encode(referrer.toBuffer()),
+                },
+            },
+        ]);
+        return programAccounts.map((programAccount) => programAccount.account);
+    }
     async getReferrerNameAccountsForAuthority(authority) {
         const programAccounts = await this.program.account.referrerName.all([
             {
@@ -559,17 +571,30 @@ class DriftClient {
                 // if cache has more recent slot than user positions account slot, add market to remaining accounts
                 // otherwise remove from slot
                 if (slot > lastUserSlot) {
-                    const marketAccount = this.getPerpMarketAccount(marketIndex);
+                    const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
                     perpMarketAccountMap.set(marketIndex, {
-                        pubkey: marketAccount.pubkey,
+                        pubkey: perpMarketAccount.pubkey,
                         isSigner: false,
                         isWritable: false,
                     });
-                    oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-                        pubkey: marketAccount.amm.oracle,
+                    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+                        pubkey: perpMarketAccount.amm.oracle,
                         isSigner: false,
                         isWritable: false,
                     });
+                    const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
+                    spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+                        pubkey: spotMarketAccount.pubkey,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                            pubkey: spotMarketAccount.oracle,
+                            isSigner: false,
+                            isWritable: false,
+                        });
+                    }
                 }
                 else {
                     this.perpMarketLastSlotCache.delete(marketIndex);
@@ -579,15 +604,15 @@ class DriftClient {
                 // if cache has more recent slot than user positions account slot, add market to remaining accounts
                 // otherwise remove from slot
                 if (slot > lastUserSlot) {
-                    const marketAccount = this.getSpotMarketAccount(marketIndex);
+                    const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
                     spotMarketAccountMap.set(marketIndex, {
-                        pubkey: marketAccount.pubkey,
+                        pubkey: spotMarketAccount.pubkey,
                         isSigner: false,
                         isWritable: false,
                     });
-                    if (!marketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                        oracleAccountMap.set(marketAccount.oracle.toString(), {
-                            pubkey: marketAccount.oracle,
+                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                            pubkey: spotMarketAccount.oracle,
                             isSigner: false,
                             isWritable: false,
                         });
@@ -599,42 +624,68 @@ class DriftClient {
             }
         }
         if (params.readablePerpMarketIndex !== undefined) {
-            const marketAccount = this.getPerpMarketAccount(params.readablePerpMarketIndex);
+            const perpMarketAccount = this.getPerpMarketAccount(params.readablePerpMarketIndex);
             perpMarketAccountMap.set(params.readablePerpMarketIndex, {
-                pubkey: marketAccount.pubkey,
+                pubkey: perpMarketAccount.pubkey,
                 isSigner: false,
                 isWritable: false,
             });
-            oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-                pubkey: marketAccount.amm.oracle,
+            oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+                pubkey: perpMarketAccount.amm.oracle,
                 isSigner: false,
                 isWritable: false,
             });
+            const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
+            spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+                pubkey: spotMarketAccount.pubkey,
+                isSigner: false,
+                isWritable: false,
+            });
+            if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                    pubkey: spotMarketAccount.oracle,
+                    isSigner: false,
+                    isWritable: false,
+                });
+            }
+        }
+        if (params.readableSpotMarketIndexes !== undefined) {
+            for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
+                const spotMarketAccount = this.getSpotMarketAccount(readableSpotMarketIndex);
+                spotMarketAccountMap.set(readableSpotMarketIndex, {
+                    pubkey: spotMarketAccount.pubkey,
+                    isSigner: false,
+                    isWritable: false,
+                });
+                if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                    oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                        pubkey: spotMarketAccount.oracle,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                }
+            }
         }
         if (params.writablePerpMarketIndexes !== undefined) {
             for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-                const marketAccount = this.getPerpMarketAccount(writablePerpMarketIndex);
+                const perpMarketAccount = this.getPerpMarketAccount(writablePerpMarketIndex);
                 perpMarketAccountMap.set(writablePerpMarketIndex, {
-                    pubkey: marketAccount.pubkey,
+                    pubkey: perpMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: true,
                 });
-                oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-                    pubkey: marketAccount.amm.oracle,
+                oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+                    pubkey: perpMarketAccount.amm.oracle,
                     isSigner: false,
                     isWritable: false,
                 });
-            }
-        }
-        if (params.readableSpotMarketIndexes !== undefined) {
-            for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
-                const spotMarketAccount = this.getSpotMarketAccount(readableSpotMarketIndex);
-                spotMarketAccountMap.set(readableSpotMarketIndex, {
+                const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
+                spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
                     pubkey: spotMarketAccount.pubkey,
                     isSigner: false,
                     isWritable: false,
                 });
-                if (spotMarketAccount.marketIndex !== 0) {
+                if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
                     oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
                         pubkey: spotMarketAccount.oracle,
                         isSigner: false,
@@ -688,27 +739,48 @@ class DriftClient {
                     }
                     if (!spotPosition.openAsks.eq(numericConstants_1.ZERO) ||
                         !spotPosition.openBids.eq(numericConstants_1.ZERO)) {
+                        const quoteSpotMarket = this.getQuoteSpotMarketAccount();
                         spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, {
-                            pubkey: this.getQuoteSpotMarketAccount().pubkey,
+                            pubkey: quoteSpotMarket.pubkey,
                             isSigner: false,
                             isWritable: false,
                         });
+                        if (!quoteSpotMarket.oracle.equals(web3_js_1.PublicKey.default)) {
+                            oracleAccountMap.set(quoteSpotMarket.oracle.toString(), {
+                                pubkey: quoteSpotMarket.oracle,
+                                isSigner: false,
+                                isWritable: false,
+                            });
+                        }
                     }
                 }
             }
             for (const position of userAccount.perpPositions) {
                 if (!(0, position_1.positionIsAvailable)(position)) {
-                    const market = this.getPerpMarketAccount(position.marketIndex);
+                    const perpMarketAccount = this.getPerpMarketAccount(position.marketIndex);
                     perpMarketAccountMap.set(position.marketIndex, {
-                        pubkey: market.pubkey,
+                        pubkey: perpMarketAccount.pubkey,
                         isWritable: false,
                         isSigner: false,
                     });
-                    oracleAccountMap.set(market.amm.oracle.toString(), {
-                        pubkey: market.amm.oracle,
+                    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+                        pubkey: perpMarketAccount.amm.oracle,
                         isWritable: false,
                         isSigner: false,
                     });
+                    const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
+                    spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+                        pubkey: spotMarketAccount.pubkey,
+                        isSigner: false,
+                        isWritable: false,
+                    });
+                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                            pubkey: spotMarketAccount.oracle,
+                            isSigner: false,
+                            isWritable: false,
+                        });
+                    }
                 }
             }
         }

package/lib/factory/oracleClient.js

@@ -16,6 +16,9 @@ function getOracleClient(oracleSource, connection) {
     if ((0, types_1.isVariant)(oracleSource, 'pyth1M')) {
         return new pythClient_1.PythClient(connection, new anchor_1.BN(1000000));
     }
+    if ((0, types_1.isVariant)(oracleSource, 'pythStableCoin')) {
+        return new pythClient_1.PythClient(connection, undefined, true);
+    }
     // if (isVariant(oracleSource, 'switchboard')) {
     // 	return new SwitchboardClient(connection);
     // }

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.22.0",
+    "version": "2.23.0-beta.0",
     "name": "drift",
     "instructions": [
         {
@@ -4081,12 +4081,20 @@
                             "defined": "ContractTier"
                         }
                     },
+                    {
+                        "name": "padding1",
+                        "type": "bool"
+                    },
+                    {
+                        "name": "quoteSpotMarketIndex",
+                        "type": "u16"
+                    },
                     {
                         "name": "padding",
                         "type": {
                             "array": [
                                 "u8",
-                                51
+                                48
                             ]
                         }
                     }
@@ -6383,6 +6391,9 @@
                     },
                     {
                         "name": "Pyth1M"
+                    },
+                    {
+                        "name": "PythStableCoin"
                     }
                 ]
             }

package/lib/oracles/pythClient.d.ts

@@ -6,7 +6,8 @@ import { BN } from '@project-serum/anchor';
 export declare class PythClient implements OracleClient {
     private connection;
     private multiple;
-    constructor(connection: Connection, multiple?: BN);
+    private stableCoin;
+    constructor(connection: Connection, multiple?: BN, stableCoin?: boolean);
     getOraclePriceData(pricePublicKey: PublicKey): Promise<OraclePriceData>;
     getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData;
 }

package/lib/oracles/pythClient.js

@@ -5,9 +5,10 @@ const client_1 = require("@pythnetwork/client");
 const anchor_1 = require("@project-serum/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 class PythClient {
-    constructor(connection, multiple = numericConstants_1.ONE) {
+    constructor(connection, multiple = numericConstants_1.ONE, stableCoin = false) {
         this.connection = connection;
         this.multiple = multiple;
+        this.stableCoin = stableCoin;
     }
     async getOraclePriceData(pricePublicKey) {
         const accountInfo = await this.connection.getAccountInfo(pricePublicKey);
@@ -15,10 +16,15 @@ class PythClient {
     }
     getOraclePriceDataFromBuffer(buffer) {
         const priceData = (0, client_1.parsePriceData)(buffer);
+        const confidence = convertPythPrice(priceData.confidence, priceData.exponent, this.multiple);
+        let price = convertPythPrice(priceData.aggregate.price, priceData.exponent, this.multiple);
+        if (this.stableCoin) {
+            price = getStableCoinPrice(price, confidence);
+        }
         return {
-            price: convertPythPrice(priceData.aggregate.price, priceData.exponent, this.multiple),
+            price,
             slot: new anchor_1.BN(priceData.lastSlot.toString()),
-            confidence: convertPythPrice(priceData.confidence, priceData.exponent, this.multiple),
+            confidence,
             twap: convertPythPrice(priceData.twap.value, priceData.exponent, this.multiple),
             twapConfidence: convertPythPrice(priceData.twac.value, priceData.exponent, this.multiple),
             hasSufficientNumberOfDataPoints: true,
@@ -34,3 +40,12 @@ function convertPythPrice(price, exponent, multiple) {
         .div(pythPrecision);
 }
 exports.convertPythPrice = convertPythPrice;
+const fiveBPS = new anchor_1.BN(500);
+function getStableCoinPrice(price, confidence) {
+    if (price.sub(numericConstants_1.QUOTE_PRECISION).abs().lt(anchor_1.BN.min(confidence, fiveBPS))) {
+        return numericConstants_1.QUOTE_PRECISION;
+    }
+    else {
+        return price;
+    }
+}

package/lib/types.d.ts

@@ -139,6 +139,9 @@ export declare class OracleSource {
     static readonly QUOTE_ASSET: {
         quoteAsset: {};
     };
+    static readonly PYTH_STABLE_COIN: {
+        pythStableCoin: {};
+    };
 }
 export declare class OrderType {
     static readonly LIMIT: {
@@ -635,6 +638,7 @@ export type PerpMarketAccount = {
         quoteSettledInsurance: BN;
         quoteMaxInsurance: BN;
     };
+    quoteSpotMarketIndex: number;
 };
 export type HistoricalOracleData = {
     lastOraclePrice: BN;

package/lib/types.js

@@ -82,6 +82,7 @@ OracleSource.PYTH_1K = { pyth1K: {} };
 OracleSource.PYTH_1M = { pyth1M: {} };
 // static readonly SWITCHBOARD = { switchboard: {} };
 OracleSource.QUOTE_ASSET = { quoteAsset: {} };
+OracleSource.PYTH_STABLE_COIN = { pythStableCoin: {} };
 class OrderType {
 }
 exports.OrderType = OrderType;

package/lib/user.d.ts

@@ -104,7 +104,7 @@ export declare class User {
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getUnrealizedPNL(withFunding?: boolean, marketIndex?: number, withWeightMarginCategory?: MarginCategory): BN;
+    getUnrealizedPNL(withFunding?: boolean, marketIndex?: number, withWeightMarginCategory?: MarginCategory, strict?: boolean): BN;
     /**
      * calculates unrealized funding payment pnl
      * @returns : Precision QUOTE_PRECISION
@@ -125,7 +125,7 @@ export declare class User {
      * calculates TotalCollateral: collateral + unrealized pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalCollateral(marginCategory?: MarginCategory): BN;
+    getTotalCollateral(marginCategory?: MarginCategory, strict?: boolean): BN;
     /**
      * calculates User Health by comparing total collateral and maint. margin requirement
      * @returns : number (value from [0, 100])
@@ -135,7 +135,7 @@ export declare class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionValue(marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean): BN;
+    getTotalPerpPositionValue(marginCategory?: MarginCategory, liquidationBuffer?: BN, includeOpenOrders?: boolean, strict?: boolean): BN;
     /**
      * calculates position value in margin system
      * @returns : Precision QUOTE_PRECISION

package/lib/user.js

@@ -268,7 +268,7 @@ class User {
      * @returns The margin requirement of a certain type (Initial or Maintenance) in USDC. : QUOTE_PRECISION
      */
     getMarginRequirement(marginCategory, liquidationBuffer, strict = false) {
-        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, true).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, true, strict));
+        return this.getTotalPerpPositionValue(marginCategory, liquidationBuffer, true, strict).add(this.getSpotMarketLiabilityValue(undefined, marginCategory, liquidationBuffer, true, strict));
     }
     /**
      * @returns The initial margin requirement in USDC. : QUOTE_PRECISION
@@ -292,17 +292,31 @@ class User {
      * calculates unrealized position price pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory) {
-        const quoteSpotMarket = this.driftClient.getQuoteSpotMarketAccount();
+    getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory, strict = false) {
         return this.getActivePerpPositions()
             .filter((pos) => (marketIndex ? pos.marketIndex === marketIndex : true))
             .reduce((unrealizedPnl, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForPerpMarket(market.marketIndex);
+            const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
+            const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
             if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
                 perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
             }
             let positionUnrealizedPnl = (0, _1.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
+            let quotePrice;
+            if (strict && positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
+                quotePrice = _1.BN.min(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+            }
+            else if (strict && positionUnrealizedPnl.lt(numericConstants_1.ZERO)) {
+                quotePrice = _1.BN.max(quoteOraclePriceData.price, quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min);
+            }
+            else {
+                quotePrice = quoteOraclePriceData.price;
+            }
+            positionUnrealizedPnl = positionUnrealizedPnl
+                .mul(quotePrice)
+                .div(new _1.BN(numericConstants_1.PRICE_PRECISION));
             if (withWeightMarginCategory !== undefined) {
                 if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                     positionUnrealizedPnl = positionUnrealizedPnl
@@ -340,31 +354,24 @@ class User {
                 continue;
             }
             const spotMarketAccount = this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
+            const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             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 tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    let weight = numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION;
-                    if (marginCategory === 'Initial') {
-                        weight = _1.BN.max(weight, new _1.BN(this.getUserAccount().maxMarginRatio));
-                    }
-                    const weightedTokenValue = tokenAmount
-                        .mul(weight)
-                        .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+                    const weightedTokenValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
                     netQuoteValue = netQuoteValue.sub(weightedTokenValue);
-                    continue;
                 }
                 else {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    netQuoteValue = netQuoteValue.add(tokenAmount);
-                    continue;
+                    const weightedTokenValue = this.getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict, now);
+                    netQuoteValue = netQuoteValue.add(weightedTokenValue);
                 }
+                continue;
             }
-            const oraclePriceData = this.getOracleDataForSpotMarket(spotPosition.marketIndex);
             if (!includeOpenOrders && countForBase) {
                 if ((0, types_1.isVariant)(spotPosition.balanceType, 'borrow')) {
-                    const tokenAmount = (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarketAccount, spotPosition.balanceType);
-                    const liabilityValue = this.getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now);
+                    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();
                     totalLiabilityValue = totalLiabilityValue.add(liabilityValue);
                     continue;
                 }
@@ -381,7 +388,7 @@ class User {
                 totalAssetValue = totalAssetValue.add(baseAssetValue);
             }
             if (worstCaseTokenAmount.lt(numericConstants_1.ZERO) && countForBase) {
-                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount.abs(), oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now);
+                const baseLiabilityValue = this.getSpotLiabilityValue(worstCaseTokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict, now).abs();
                 totalLiabilityValue = totalLiabilityValue.add(baseLiabilityValue);
             }
             if (worstCaseQuoteTokenAmount.gt(numericConstants_1.ZERO) && countForQuote) {
@@ -416,7 +423,7 @@ class User {
     }
     getSpotLiabilityValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, liquidationBuffer, strict = false, now) {
         let liabilityValue = null;
-        if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+        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);
@@ -444,7 +451,7 @@ class User {
     }
     getSpotAssetValue(tokenAmount, oraclePriceData, spotMarketAccount, marginCategory, strict = false, now) {
         let assetValue = null;
-        if (strict && spotMarketAccount.marketIndex != numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+        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);
@@ -474,8 +481,8 @@ class User {
      * calculates TotalCollateral: collateral + unrealized pnl
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalCollateral(marginCategory = 'Initial') {
-        return this.getSpotMarketAssetValue(undefined, marginCategory, true).add(this.getUnrealizedPNL(true, undefined, marginCategory));
+    getTotalCollateral(marginCategory = 'Initial', strict = false) {
+        return this.getSpotMarketAssetValue(undefined, marginCategory, true, strict).add(this.getUnrealizedPNL(true, undefined, marginCategory, strict));
     }
     /**
      * calculates User Health by comparing total collateral and maint. margin requirement
@@ -513,7 +520,7 @@ class User {
      * calculates sum of position value across all positions in margin system
      * @returns : Precision QUOTE_PRECISION
      */
-    getTotalPerpPositionValue(marginCategory, liquidationBuffer, includeOpenOrders) {
+    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)) {
@@ -551,7 +558,18 @@ class User {
                 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) {

package/package.json

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

package/src/driftClient.ts

@@ -37,6 +37,7 @@ import {
 	PostOnlyParams,
 	SpotBalanceType,
 	PerpMarketExtendedInfo,
+	UserStatsAccount,
 } from './types';
 import * as anchor from '@project-serum/anchor';
 import driftIDL from './idl/drift.json';
@@ -776,6 +777,24 @@ export class DriftClient {
 		);
 	}
 
+	public async getReferredUserStatsAccountsByReferrer(
+		referrer: PublicKey
+	): Promise<UserStatsAccount[]> {
+		const programAccounts = await this.program.account.userStats.all([
+			{
+				memcmp: {
+					offset: 40,
+					/** data to match, as base-58 encoded string and limited to less than 129 bytes */
+					bytes: bs58.encode(referrer.toBuffer()),
+				},
+			},
+		]);
+
+		return programAccounts.map(
+			(programAccount) => programAccount.account as UserStatsAccount
+		);
+	}
+
 	public async getReferrerNameAccountsForAuthority(
 		authority: PublicKey
 	): Promise<ReferrerNameAccount[]> {
@@ -934,17 +953,32 @@ export class DriftClient {
 				// if cache has more recent slot than user positions account slot, add market to remaining accounts
 				// otherwise remove from slot
 				if (slot > lastUserSlot) {
-					const marketAccount = this.getPerpMarketAccount(marketIndex);
+					const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
 					perpMarketAccountMap.set(marketIndex, {
-						pubkey: marketAccount.pubkey,
+						pubkey: perpMarketAccount.pubkey,
+						isSigner: false,
+						isWritable: false,
+					});
+					oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+						pubkey: perpMarketAccount.amm.oracle,
 						isSigner: false,
 						isWritable: false,
 					});
-					oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-						pubkey: marketAccount.amm.oracle,
+					const spotMarketAccount = this.getSpotMarketAccount(
+						perpMarketAccount.quoteSpotMarketIndex
+					);
+					spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+						pubkey: spotMarketAccount.pubkey,
 						isSigner: false,
 						isWritable: false,
 					});
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
 				} else {
 					this.perpMarketLastSlotCache.delete(marketIndex);
 				}
@@ -957,15 +991,15 @@ export class DriftClient {
 				// if cache has more recent slot than user positions account slot, add market to remaining accounts
 				// otherwise remove from slot
 				if (slot > lastUserSlot) {
-					const marketAccount = this.getSpotMarketAccount(marketIndex);
+					const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 					spotMarketAccountMap.set(marketIndex, {
-						pubkey: marketAccount.pubkey,
+						pubkey: spotMarketAccount.pubkey,
 						isSigner: false,
 						isWritable: false,
 					});
-					if (!marketAccount.oracle.equals(PublicKey.default)) {
-						oracleAccountMap.set(marketAccount.oracle.toString(), {
-							pubkey: marketAccount.oracle,
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
 							isSigner: false,
 							isWritable: false,
 						});
@@ -977,50 +1011,80 @@ export class DriftClient {
 		}
 
 		if (params.readablePerpMarketIndex !== undefined) {
-			const marketAccount = this.getPerpMarketAccount(
+			const perpMarketAccount = this.getPerpMarketAccount(
 				params.readablePerpMarketIndex
 			);
 			perpMarketAccountMap.set(params.readablePerpMarketIndex, {
-				pubkey: marketAccount.pubkey,
+				pubkey: perpMarketAccount.pubkey,
+				isSigner: false,
+				isWritable: false,
+			});
+			oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+				pubkey: perpMarketAccount.amm.oracle,
 				isSigner: false,
 				isWritable: false,
 			});
-			oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-				pubkey: marketAccount.amm.oracle,
+			const spotMarketAccount = this.getSpotMarketAccount(
+				perpMarketAccount.quoteSpotMarketIndex
+			);
+			spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+				pubkey: spotMarketAccount.pubkey,
 				isSigner: false,
 				isWritable: false,
 			});
+			if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+				oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+					pubkey: spotMarketAccount.oracle,
+					isSigner: false,
+					isWritable: false,
+				});
+			}
+		}
+
+		if (params.readableSpotMarketIndexes !== undefined) {
+			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
+				const spotMarketAccount = this.getSpotMarketAccount(
+					readableSpotMarketIndex
+				);
+				spotMarketAccountMap.set(readableSpotMarketIndex, {
+					pubkey: spotMarketAccount.pubkey,
+					isSigner: false,
+					isWritable: false,
+				});
+				if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+					oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+						pubkey: spotMarketAccount.oracle,
+						isSigner: false,
+						isWritable: false,
+					});
+				}
+			}
 		}
 
 		if (params.writablePerpMarketIndexes !== undefined) {
 			for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-				const marketAccount = this.getPerpMarketAccount(
+				const perpMarketAccount = this.getPerpMarketAccount(
 					writablePerpMarketIndex
 				);
 				perpMarketAccountMap.set(writablePerpMarketIndex, {
-					pubkey: marketAccount.pubkey,
+					pubkey: perpMarketAccount.pubkey,
 					isSigner: false,
 					isWritable: true,
 				});
-				oracleAccountMap.set(marketAccount.amm.oracle.toString(), {
-					pubkey: marketAccount.amm.oracle,
+				oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+					pubkey: perpMarketAccount.amm.oracle,
 					isSigner: false,
 					isWritable: false,
 				});
-			}
-		}
-
-		if (params.readableSpotMarketIndexes !== undefined) {
-			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
 				const spotMarketAccount = this.getSpotMarketAccount(
-					readableSpotMarketIndex
+					perpMarketAccount.quoteSpotMarketIndex
 				);
-				spotMarketAccountMap.set(readableSpotMarketIndex, {
+				spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
 					pubkey: spotMarketAccount.pubkey,
 					isSigner: false,
 					isWritable: false,
 				});
-				if (spotMarketAccount.marketIndex !== 0) {
+				if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
 					oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
 						pubkey: spotMarketAccount.oracle,
 						isSigner: false,
@@ -1090,27 +1154,52 @@ export class DriftClient {
 						!spotPosition.openAsks.eq(ZERO) ||
 						!spotPosition.openBids.eq(ZERO)
 					) {
+						const quoteSpotMarket = this.getQuoteSpotMarketAccount();
 						spotMarketAccountMap.set(QUOTE_SPOT_MARKET_INDEX, {
-							pubkey: this.getQuoteSpotMarketAccount().pubkey,
+							pubkey: quoteSpotMarket.pubkey,
 							isSigner: false,
 							isWritable: false,
 						});
+						if (!quoteSpotMarket.oracle.equals(PublicKey.default)) {
+							oracleAccountMap.set(quoteSpotMarket.oracle.toString(), {
+								pubkey: quoteSpotMarket.oracle,
+								isSigner: false,
+								isWritable: false,
+							});
+						}
 					}
 				}
 			}
 			for (const position of userAccount.perpPositions) {
 				if (!positionIsAvailable(position)) {
-					const market = this.getPerpMarketAccount(position.marketIndex);
+					const perpMarketAccount = this.getPerpMarketAccount(
+						position.marketIndex
+					);
 					perpMarketAccountMap.set(position.marketIndex, {
-						pubkey: market.pubkey,
+						pubkey: perpMarketAccount.pubkey,
 						isWritable: false,
 						isSigner: false,
 					});
-					oracleAccountMap.set(market.amm.oracle.toString(), {
-						pubkey: market.amm.oracle,
+					oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+						pubkey: perpMarketAccount.amm.oracle,
 						isWritable: false,
 						isSigner: false,
 					});
+					const spotMarketAccount = this.getSpotMarketAccount(
+						perpMarketAccount.quoteSpotMarketIndex
+					);
+					spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
+						pubkey: spotMarketAccount.pubkey,
+						isSigner: false,
+						isWritable: false,
+					});
+					if (!spotMarketAccount.oracle.equals(PublicKey.default)) {
+						oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+							pubkey: spotMarketAccount.oracle,
+							isSigner: false,
+							isWritable: false,
+						});
+					}
 				}
 			}
 		}

package/src/factory/oracleClient.ts

@@ -22,6 +22,10 @@ export function getOracleClient(
 		return new PythClient(connection, new BN(1000000));
 	}
 
+	if (isVariant(oracleSource, 'pythStableCoin')) {
+		return new PythClient(connection, undefined, true);
+	}
+
 	// if (isVariant(oracleSource, 'switchboard')) {
 	// 	return new SwitchboardClient(connection);
 	// }

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.22.0",
+  "version": "2.23.0-beta.0",
   "name": "drift",
   "instructions": [
     {
@@ -4081,12 +4081,20 @@
               "defined": "ContractTier"
             }
           },
+          {
+            "name": "padding1",
+            "type": "bool"
+          },
+          {
+            "name": "quoteSpotMarketIndex",
+            "type": "u16"
+          },
           {
             "name": "padding",
             "type": {
               "array": [
                 "u8",
-                51
+                48
               ]
             }
           }
@@ -6383,6 +6391,9 @@
           },
           {
             "name": "Pyth1M"
+          },
+          {
+            "name": "PythStableCoin"
           }
         ]
       }

package/src/oracles/pythClient.ts

@@ -2,15 +2,26 @@ import { parsePriceData } from '@pythnetwork/client';
 import { Connection, PublicKey } from '@solana/web3.js';
 import { OracleClient, OraclePriceData } from './types';
 import { BN } from '@project-serum/anchor';
-import { ONE, PRICE_PRECISION, TEN } from '../constants/numericConstants';
+import {
+	ONE,
+	PRICE_PRECISION,
+	QUOTE_PRECISION,
+	TEN,
+} from '../constants/numericConstants';
 
 export class PythClient implements OracleClient {
 	private connection: Connection;
 	private multiple: BN;
+	private stableCoin: boolean;
 
-	public constructor(connection: Connection, multiple = ONE) {
+	public constructor(
+		connection: Connection,
+		multiple = ONE,
+		stableCoin = false
+	) {
 		this.connection = connection;
 		this.multiple = multiple;
+		this.stableCoin = stableCoin;
 	}
 
 	public async getOraclePriceData(
@@ -22,18 +33,24 @@ export class PythClient implements OracleClient {
 
 	public getOraclePriceDataFromBuffer(buffer: Buffer): OraclePriceData {
 		const priceData = parsePriceData(buffer);
+		const confidence = convertPythPrice(
+			priceData.confidence,
+			priceData.exponent,
+			this.multiple
+		);
+		let price = convertPythPrice(
+			priceData.aggregate.price,
+			priceData.exponent,
+			this.multiple
+		);
+		if (this.stableCoin) {
+			price = getStableCoinPrice(price, confidence);
+		}
+
 		return {
-			price: convertPythPrice(
-				priceData.aggregate.price,
-				priceData.exponent,
-				this.multiple
-			),
+			price,
 			slot: new BN(priceData.lastSlot.toString()),
-			confidence: convertPythPrice(
-				priceData.confidence,
-				priceData.exponent,
-				this.multiple
-			),
+			confidence,
 			twap: convertPythPrice(
 				priceData.twap.value,
 				priceData.exponent,
@@ -60,3 +77,12 @@ export function convertPythPrice(
 		.mul(PRICE_PRECISION)
 		.div(pythPrecision);
 }
+
+const fiveBPS = new BN(500);
+function getStableCoinPrice(price: BN, confidence: BN): BN {
+	if (price.sub(QUOTE_PRECISION).abs().lt(BN.min(confidence, fiveBPS))) {
+		return QUOTE_PRECISION;
+	} else {
+		return price;
+	}
+}

package/src/types.ts

@@ -80,6 +80,7 @@ export class OracleSource {
 	static readonly PYTH_1M = { pyth1M: {} };
 	// static readonly SWITCHBOARD = { switchboard: {} };
 	static readonly QUOTE_ASSET = { quoteAsset: {} };
+	static readonly PYTH_STABLE_COIN = { pythStableCoin: {} };
 }
 
 export class OrderType {
@@ -560,6 +561,7 @@ export type PerpMarketAccount = {
 		quoteSettledInsurance: BN;
 		quoteMaxInsurance: BN;
 	};
+	quoteSpotMarketIndex: number;
 };
 
 export type HistoricalOracleData = {

package/src/user.ts

@@ -424,7 +424,8 @@ export class User {
 		return this.getTotalPerpPositionValue(
 			marginCategory,
 			liquidationBuffer,
-			true
+			true,
+			strict
 		).add(
 			this.getSpotMarketLiabilityValue(
 				undefined,
@@ -467,9 +468,9 @@ export class User {
 	public getUnrealizedPNL(
 		withFunding?: boolean,
 		marketIndex?: number,
-		withWeightMarginCategory?: MarginCategory
+		withWeightMarginCategory?: MarginCategory,
+		strict = false
 	): BN {
-		const quoteSpotMarket = this.driftClient.getQuoteSpotMarketAccount();
 		return this.getActivePerpPositions()
 			.filter((pos) => (marketIndex ? pos.marketIndex === marketIndex : true))
 			.reduce((unrealizedPnl, perpPosition) => {
@@ -480,6 +481,13 @@ export class User {
 					market.marketIndex
 				);
 
+				const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
+					market.quoteSpotMarketIndex
+				);
+				const quoteOraclePriceData = this.getOracleDataForSpotMarket(
+					market.quoteSpotMarketIndex
+				);
+
 				if (perpPosition.lpShares.gt(ZERO)) {
 					perpPosition = this.getSettledLPPosition(perpPosition.marketIndex)[0];
 				}
@@ -491,6 +499,25 @@ export class User {
 					oraclePriceData
 				);
 
+				let quotePrice;
+				if (strict && positionUnrealizedPnl.gt(ZERO)) {
+					quotePrice = BN.min(
+						quoteOraclePriceData.price,
+						quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min
+					);
+				} else if (strict && positionUnrealizedPnl.lt(ZERO)) {
+					quotePrice = BN.max(
+						quoteOraclePriceData.price,
+						quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min
+					);
+				} else {
+					quotePrice = quoteOraclePriceData.price;
+				}
+
+				positionUnrealizedPnl = positionUnrealizedPnl
+					.mul(quotePrice)
+					.div(new BN(PRICE_PRECISION));
+
 				if (withWeightMarginCategory !== undefined) {
 					if (positionUnrealizedPnl.gt(ZERO)) {
 						positionUnrealizedPnl = positionUnrealizedPnl
@@ -558,55 +585,60 @@ export class User {
 			const spotMarketAccount: SpotMarketAccount =
 				this.driftClient.getSpotMarketAccount(spotPosition.marketIndex);
 
+			const oraclePriceData = this.getOracleDataForSpotMarket(
+				spotPosition.marketIndex
+			);
+
 			if (
 				spotPosition.marketIndex === QUOTE_SPOT_MARKET_INDEX &&
 				countForQuote
 			) {
-				if (isVariant(spotPosition.balanceType, 'borrow')) {
-					const tokenAmount = getTokenAmount(
+				const tokenAmount = getSignedTokenAmount(
+					getTokenAmount(
 						spotPosition.scaledBalance,
 						spotMarketAccount,
 						spotPosition.balanceType
-					);
-
-					let weight = SPOT_MARKET_WEIGHT_PRECISION;
-					if (marginCategory === 'Initial') {
-						weight = BN.max(
-							weight,
-							new BN(this.getUserAccount().maxMarginRatio)
-						);
-					}
+					),
+					spotPosition.balanceType
+				);
 
-					const weightedTokenValue = tokenAmount
-						.mul(weight)
-						.div(SPOT_MARKET_WEIGHT_PRECISION);
+				if (isVariant(spotPosition.balanceType, 'borrow')) {
+					const weightedTokenValue = this.getSpotLiabilityValue(
+						tokenAmount,
+						oraclePriceData,
+						spotMarketAccount,
+						marginCategory,
+						liquidationBuffer,
+						strict,
+						now
+					).abs();
 
 					netQuoteValue = netQuoteValue.sub(weightedTokenValue);
-
-					continue;
 				} else {
-					const tokenAmount = getTokenAmount(
-						spotPosition.scaledBalance,
+					const weightedTokenValue = this.getSpotAssetValue(
+						tokenAmount,
+						oraclePriceData,
 						spotMarketAccount,
-						spotPosition.balanceType
+						marginCategory,
+						strict,
+						now
 					);
 
-					netQuoteValue = netQuoteValue.add(tokenAmount);
-
-					continue;
+					netQuoteValue = netQuoteValue.add(weightedTokenValue);
 				}
-			}
 
-			const oraclePriceData = this.getOracleDataForSpotMarket(
-				spotPosition.marketIndex
-			);
+				continue;
+			}
 
 			if (!includeOpenOrders && countForBase) {
 				if (isVariant(spotPosition.balanceType, 'borrow')) {
-					const tokenAmount = getTokenAmount(
-						spotPosition.scaledBalance,
-						spotMarketAccount,
-						spotPosition.balanceType
+					const tokenAmount = getSignedTokenAmount(
+						getTokenAmount(
+							spotPosition.scaledBalance,
+							spotMarketAccount,
+							spotPosition.balanceType
+						),
+						SpotBalanceType.BORROW
 					);
 					const liabilityValue = this.getSpotLiabilityValue(
 						tokenAmount,
@@ -616,7 +648,7 @@ export class User {
 						liquidationBuffer,
 						strict,
 						now
-					);
+					).abs();
 					totalLiabilityValue = totalLiabilityValue.add(liabilityValue);
 
 					continue;
@@ -662,14 +694,14 @@ export class User {
 
 			if (worstCaseTokenAmount.lt(ZERO) && countForBase) {
 				const baseLiabilityValue = this.getSpotLiabilityValue(
-					worstCaseTokenAmount.abs(),
+					worstCaseTokenAmount,
 					oraclePriceData,
 					spotMarketAccount,
 					marginCategory,
 					liquidationBuffer,
 					strict,
 					now
-				);
+				).abs();
 
 				totalLiabilityValue = totalLiabilityValue.add(baseLiabilityValue);
 			}
@@ -738,7 +770,7 @@ export class User {
 	): BN {
 		let liabilityValue = null;
 
-		if (strict && spotMarketAccount.marketIndex != QUOTE_SPOT_MARKET_INDEX) {
+		if (strict) {
 			const estOracleTwap = calculateLiveOracleTwap(
 				spotMarketAccount.historicalOracleData,
 				oraclePriceData,
@@ -809,7 +841,7 @@ export class User {
 		now?: BN
 	): BN {
 		let assetValue = null;
-		if (strict && spotMarketAccount.marketIndex != QUOTE_SPOT_MARKET_INDEX) {
+		if (strict) {
 			const estOracleTwap = calculateLiveOracleTwap(
 				spotMarketAccount.historicalOracleData,
 				oraclePriceData,
@@ -886,10 +918,16 @@ export class User {
 	 * calculates TotalCollateral: collateral + unrealized pnl
 	 * @returns : Precision QUOTE_PRECISION
 	 */
-	public getTotalCollateral(marginCategory: MarginCategory = 'Initial'): BN {
-		return this.getSpotMarketAssetValue(undefined, marginCategory, true).add(
-			this.getUnrealizedPNL(true, undefined, marginCategory)
-		);
+	public getTotalCollateral(
+		marginCategory: MarginCategory = 'Initial',
+		strict = false
+	): BN {
+		return this.getSpotMarketAssetValue(
+			undefined,
+			marginCategory,
+			true,
+			strict
+		).add(this.getUnrealizedPNL(true, undefined, marginCategory, strict));
 	}
 
 	/**
@@ -941,7 +979,8 @@ export class User {
 	getTotalPerpPositionValue(
 		marginCategory?: MarginCategory,
 		liquidationBuffer?: BN,
-		includeOpenOrders?: boolean
+		includeOpenOrders?: boolean,
+		strict = false
 	): BN {
 		return this.getActivePerpPositions().reduce(
 			(totalPerpValue, perpPosition) => {
@@ -1011,7 +1050,27 @@ export class User {
 						marginRatio = ZERO;
 					}
 
+					const quoteSpotMarket = this.driftClient.getSpotMarketAccount(
+						market.quoteSpotMarketIndex
+					);
+					const quoteOraclePriceData =
+						this.driftClient.getOraclePriceDataAndSlot(
+							quoteSpotMarket.oracle
+						).data;
+
+					let quotePrice;
+					if (strict) {
+						quotePrice = BN.max(
+							quoteOraclePriceData.price,
+							quoteSpotMarket.historicalOracleData.lastOraclePriceTwap5Min
+						);
+					} else {
+						quotePrice = quoteOraclePriceData.price;
+					}
+
 					baseAssetValue = baseAssetValue
+						.mul(quotePrice)
+						.div(PRICE_PRECISION)
 						.mul(marginRatio)
 						.div(MARGIN_PRECISION);
 

package/tests/dlob/helpers.ts

@@ -172,6 +172,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteSettledInsurance: new BN(0),
 			quoteMaxInsurance: new BN(0),
 		},
+		quoteSpotMarketIndex: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -208,6 +209,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteSettledInsurance: new BN(0),
 			quoteMaxInsurance: new BN(0),
 		},
+		quoteSpotMarketIndex: 0,
 	},
 	{
 		status: MarketStatus.INITIALIZED,
@@ -244,6 +246,7 @@ export const mockPerpMarkets: Array<PerpMarketAccount> = [
 			quoteSettledInsurance: new BN(0),
 			quoteMaxInsurance: new BN(0),
 		},
+		quoteSpotMarketIndex: 0,
 	},
 ];