@drift-labs/sdk-browser 2.136.0-beta.7 → 2.137.0-beta.1

package/VERSION

@@ -1 +1 @@
-2.136.0-beta.7
+2.137.0-beta.1

package/lib/browser/accounts/webSocketAccountSubscriberV2.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { DataAndSlot, AccountSubscriber, ResubOpts, BufferAndSlot } from './types';
 import { Program } from '@coral-xyz/anchor';
-import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, type Commitment } from 'gill';
+import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, Commitment } from 'gill';
 import { PublicKey } from '@solana/web3.js';
 /**
  * WebSocketAccountSubscriberV2

package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.d.ts

@@ -3,7 +3,7 @@
 import { BufferAndSlot, ProgramAccountSubscriber, ResubOpts } from './types';
 import { Program } from '@coral-xyz/anchor';
 import { Commitment, Context, MemcmpFilter, PublicKey } from '@solana/web3.js';
-import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, type Address } from 'gill';
+import { AccountInfoBase, AccountInfoWithBase58EncodedData, AccountInfoWithBase64EncodedData, Address } from 'gill';
 /**
  * WebSocketProgramAccountsSubscriberV2
  *

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.135.0",
+    "version": "2.136.0",
     "name": "drift",
     "instructions": [
         {
@@ -1389,96 +1389,6 @@
                 }
             ]
         },
-        {
-            "name": "addPerpLpShares",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "authority",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "nShares",
-                    "type": "u64"
-                },
-                {
-                    "name": "marketIndex",
-                    "type": "u16"
-                }
-            ]
-        },
-        {
-            "name": "removePerpLpShares",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "authority",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "sharesToBurn",
-                    "type": "u64"
-                },
-                {
-                    "name": "marketIndex",
-                    "type": "u16"
-                }
-            ]
-        },
-        {
-            "name": "removePerpLpSharesInExpiringMarket",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                },
-                {
-                    "name": "signer",
-                    "isMut": false,
-                    "isSigner": true
-                }
-            ],
-            "args": [
-                {
-                    "name": "sharesToBurn",
-                    "type": "u64"
-                },
-                {
-                    "name": "marketIndex",
-                    "type": "u16"
-                }
-            ]
-        },
         {
             "name": "updateUserName",
             "accounts": [
@@ -2291,27 +2201,6 @@
             ],
             "args": []
         },
-        {
-            "name": "settleLp",
-            "accounts": [
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "user",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "marketIndex",
-                    "type": "u16"
-                }
-            ]
-        },
         {
             "name": "settleExpiredMarket",
             "accounts": [
@@ -6003,58 +5892,6 @@
                 }
             ]
         },
-        {
-            "name": "updatePerpMarketTargetBaseAssetAmountPerLp",
-            "accounts": [
-                {
-                    "name": "admin",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpMarket",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "targetBaseAssetAmountPerLp",
-                    "type": "i32"
-                }
-            ]
-        },
-        {
-            "name": "updatePerpMarketPerLpBase",
-            "accounts": [
-                {
-                    "name": "admin",
-                    "isMut": false,
-                    "isSigner": true
-                },
-                {
-                    "name": "state",
-                    "isMut": false,
-                    "isSigner": false
-                },
-                {
-                    "name": "perpMarket",
-                    "isMut": true,
-                    "isSigner": false
-                }
-            ],
-            "args": [
-                {
-                    "name": "perLpBase",
-                    "type": "i8"
-                }
-            ]
-        },
         {
             "name": "updateLpCooldownTime",
             "accounts": [
@@ -12713,23 +12550,6 @@
                 ]
             }
         },
-        {
-            "name": "AMMLiquiditySplit",
-            "type": {
-                "kind": "enum",
-                "variants": [
-                    {
-                        "name": "ProtocolOwned"
-                    },
-                    {
-                        "name": "LPOwned"
-                    },
-                    {
-                        "name": "Shared"
-                    }
-                ]
-            }
-        },
         {
             "name": "AMMAvailability",
             "type": {

package/lib/browser/math/bankruptcy.js

@@ -20,8 +20,7 @@ function isUserBankrupt(user) {
     for (const position of userAccount.perpPositions) {
         if (!position.baseAssetAmount.eq(numericConstants_1.ZERO) ||
             position.quoteAssetAmount.gt(numericConstants_1.ZERO) ||
-            (0, position_1.hasOpenOrders)(position) ||
-            position.lpShares.gt(numericConstants_1.ZERO)) {
+            (0, position_1.hasOpenOrders)(position)) {
             return false;
         }
         if (position.quoteAssetAmount.lt(numericConstants_1.ZERO)) {

package/lib/browser/user.d.ts

@@ -41,6 +41,7 @@ export declare class User {
      * @returns userPerpPosition
      */
     getPerpPosition(marketIndex: number): PerpPosition | undefined;
+    getPerpPositionOrEmpty(marketIndex: number): PerpPosition;
     getPerpPositionAndSlot(marketIndex: number): DataAndSlot<PerpPosition | undefined>;
     getSpotPositionForUserAccount(userAccount: UserAccount, marketIndex: number): SpotPosition | undefined;
     /**
@@ -85,20 +86,6 @@ export declare class User {
      * @returns : open asks
      */
     getPerpBidAsks(marketIndex: number): [BN, BN];
-    /**
-     * calculates the open bids and asks for an lp
-     * optionally pass in lpShares to see what bid/asks a user *would* take on
-     * @returns : lp open bids
-     * @returns : lp open asks
-     */
-    getLPBidAsks(marketIndex: number, lpShares?: BN): [BN, BN];
-    /**
-     * calculates the market position if the lp position was settled
-     * @returns : the settled userPosition
-     * @returns : the dust base asset amount (ie, < stepsize)
-     * @returns : pnl from settle
-     */
-    getPerpPositionWithLPSettle(marketIndex: number, originalPosition?: PerpPosition, burnLpShares?: boolean, includeRemainderInBaseAmount?: boolean): [PerpPosition, BN, BN];
     /**
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION

package/lib/browser/user.js

@@ -17,7 +17,6 @@ const types_2 = require("./types");
 const orders_1 = require("./math/orders");
 const websocketProgramUserAccountSubscriber_1 = require("./accounts/websocketProgramUserAccountSubscriber");
 const spotBalance_2 = require("./math/spotBalance");
-const amm_1 = require("./math/amm");
 const margin_2 = require("./math/margin");
 const pollingUserAccountSubscriber_1 = require("./accounts/pollingUserAccountSubscriber");
 const webSocketUserAccountSubscriber_1 = require("./accounts/webSocketUserAccountSubscriber");
@@ -105,6 +104,11 @@ class User {
         const userAccount = this.getUserAccount();
         return this.getPerpPositionForUserAccount(userAccount, marketIndex);
     }
+    getPerpPositionOrEmpty(marketIndex) {
+        var _a;
+        const userAccount = this.getUserAccount();
+        return ((_a = this.getPerpPositionForUserAccount(userAccount, marketIndex)) !== null && _a !== void 0 ? _a : this.getEmptyPosition(marketIndex));
+    }
     getPerpPositionAndSlot(marketIndex) {
         const userAccount = this.getUserAccountAndSlot();
         const perpPosition = this.getPerpPositionForUserAccount(userAccount.data, marketIndex);
@@ -248,193 +252,16 @@ class User {
      */
     getPerpBidAsks(marketIndex) {
         const position = this.getPerpPosition(marketIndex);
-        const [lpOpenBids, lpOpenAsks] = this.getLPBidAsks(marketIndex);
-        const totalOpenBids = lpOpenBids.add(position.openBids);
-        const totalOpenAsks = lpOpenAsks.add(position.openAsks);
+        const totalOpenBids = position.openBids;
+        const totalOpenAsks = position.openAsks;
         return [totalOpenBids, totalOpenAsks];
     }
-    /**
-     * calculates the open bids and asks for an lp
-     * optionally pass in lpShares to see what bid/asks a user *would* take on
-     * @returns : lp open bids
-     * @returns : lp open asks
-     */
-    getLPBidAsks(marketIndex, lpShares) {
-        const position = this.getPerpPosition(marketIndex);
-        const lpSharesToCalc = lpShares !== null && lpShares !== void 0 ? lpShares : position === null || position === void 0 ? void 0 : position.lpShares;
-        if (!lpSharesToCalc || lpSharesToCalc.eq(numericConstants_1.ZERO)) {
-            return [numericConstants_1.ZERO, numericConstants_1.ZERO];
-        }
-        const market = this.driftClient.getPerpMarketAccount(marketIndex);
-        const [marketOpenBids, marketOpenAsks] = (0, amm_1.calculateMarketOpenBidAsk)(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
-        const lpOpenBids = marketOpenBids.mul(lpSharesToCalc).div(market.amm.sqrtK);
-        const lpOpenAsks = marketOpenAsks.mul(lpSharesToCalc).div(market.amm.sqrtK);
-        return [lpOpenBids, lpOpenAsks];
-    }
-    /**
-     * calculates the market position if the lp position was settled
-     * @returns : the settled userPosition
-     * @returns : the dust base asset amount (ie, < stepsize)
-     * @returns : pnl from settle
-     */
-    getPerpPositionWithLPSettle(marketIndex, originalPosition, burnLpShares = false, includeRemainderInBaseAmount = false) {
-        var _a;
-        originalPosition =
-            (_a = originalPosition !== null && originalPosition !== void 0 ? originalPosition : this.getPerpPosition(marketIndex)) !== null && _a !== void 0 ? _a : this.getEmptyPosition(marketIndex);
-        if (originalPosition.lpShares.eq(numericConstants_1.ZERO)) {
-            return [originalPosition, numericConstants_1.ZERO, numericConstants_1.ZERO];
-        }
-        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 anchor_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, position_1.calculateUnsettledFundingPnl)(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 anchor_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 anchor_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(baseUnit);
-        const deltaQaa = market.amm.quoteAssetAmountPerLp
-            .sub(position.lastQuoteAssetAmountPerLp)
-            .mul(nShares)
-            .div(baseUnit);
-        function sign(v) {
-            return v.isNeg() ? new anchor_1.BN(-1) : new anchor_1.BN(1);
-        }
-        function standardize(amount, stepSize) {
-            const remainder = amount.abs().mod(stepSize).mul(sign(amount));
-            const standardizedAmount = amount.sub(remainder);
-            return [standardizedAmount, remainder];
-        }
-        const [standardizedBaa, remainderBaa] = standardize(deltaBaa, market.amm.orderStepSize);
-        position.remainderBaseAssetAmount += remainderBaa.toNumber();
-        if (Math.abs(position.remainderBaseAssetAmount) >
-            market.amm.orderStepSize.toNumber()) {
-            const [newStandardizedBaa, newRemainderBaa] = standardize(new anchor_1.BN(position.remainderBaseAssetAmount), market.amm.orderStepSize);
-            position.baseAssetAmount =
-                position.baseAssetAmount.add(newStandardizedBaa);
-            position.remainderBaseAssetAmount = newRemainderBaa.toNumber();
-        }
-        let dustBaseAssetValue = numericConstants_1.ZERO;
-        if (burnLpShares && position.remainderBaseAssetAmount != 0) {
-            const oraclePriceData = this.driftClient.getOracleDataForPerpMarket(position.marketIndex);
-            dustBaseAssetValue = new anchor_1.BN(Math.abs(position.remainderBaseAssetAmount))
-                .mul(oraclePriceData.price)
-                .div(numericConstants_1.AMM_RESERVE_PRECISION)
-                .add(numericConstants_1.ONE);
-        }
-        let updateType;
-        if (position.baseAssetAmount.eq(numericConstants_1.ZERO)) {
-            updateType = 'open';
-        }
-        else if (sign(position.baseAssetAmount).eq(sign(deltaBaa))) {
-            updateType = 'increase';
-        }
-        else if (position.baseAssetAmount.abs().gt(deltaBaa.abs())) {
-            updateType = 'reduce';
-        }
-        else if (position.baseAssetAmount.abs().eq(deltaBaa.abs())) {
-            updateType = 'close';
-        }
-        else {
-            updateType = 'flip';
-        }
-        let newQuoteEntry;
-        let pnl;
-        if (updateType == 'open' || updateType == 'increase') {
-            newQuoteEntry = position.quoteEntryAmount.add(deltaQaa);
-            pnl = numericConstants_1.ZERO;
-        }
-        else if (updateType == 'reduce' || updateType == 'close') {
-            newQuoteEntry = position.quoteEntryAmount.sub(position.quoteEntryAmount
-                .mul(deltaBaa.abs())
-                .div(position.baseAssetAmount.abs()));
-            pnl = position.quoteEntryAmount.sub(newQuoteEntry).add(deltaQaa);
-        }
-        else {
-            newQuoteEntry = deltaQaa.sub(deltaQaa.mul(position.baseAssetAmount.abs()).div(deltaBaa.abs()));
-            pnl = position.quoteEntryAmount.add(deltaQaa.sub(newQuoteEntry));
-        }
-        position.quoteEntryAmount = newQuoteEntry;
-        position.baseAssetAmount = position.baseAssetAmount.add(standardizedBaa);
-        position.quoteAssetAmount = position.quoteAssetAmount
-            .add(deltaQaa)
-            .add(quoteFundingPnl)
-            .sub(dustBaseAssetValue);
-        position.quoteBreakEvenAmount = position.quoteBreakEvenAmount
-            .add(deltaQaa)
-            .add(quoteFundingPnl)
-            .sub(dustBaseAssetValue);
-        // update open bids/asks
-        const [marketOpenBids, marketOpenAsks] = (0, amm_1.calculateMarketOpenBidAsk)(market.amm.baseAssetReserve, market.amm.minBaseAssetReserve, market.amm.maxBaseAssetReserve, market.amm.orderStepSize);
-        const lpOpenBids = marketOpenBids
-            .mul(position.lpShares)
-            .div(market.amm.sqrtK);
-        const lpOpenAsks = marketOpenAsks
-            .mul(position.lpShares)
-            .div(market.amm.sqrtK);
-        position.openBids = lpOpenBids.add(position.openBids);
-        position.openAsks = lpOpenAsks.add(position.openAsks);
-        // eliminate counting funding on settled position
-        if (position.baseAssetAmount.gt(numericConstants_1.ZERO)) {
-            position.lastCumulativeFundingRate = market.amm.cumulativeFundingRateLong;
-        }
-        else if (position.baseAssetAmount.lt(numericConstants_1.ZERO)) {
-            position.lastCumulativeFundingRate =
-                market.amm.cumulativeFundingRateShort;
-        }
-        else {
-            position.lastCumulativeFundingRate = numericConstants_1.ZERO;
-        }
-        const remainderBeforeRemoval = new anchor_1.BN(position.remainderBaseAssetAmount);
-        if (includeRemainderInBaseAmount) {
-            position.baseAssetAmount = position.baseAssetAmount.add(remainderBeforeRemoval);
-            position.remainderBaseAssetAmount = 0;
-        }
-        return [position, remainderBeforeRemoval, pnl];
-    }
     /**
      * calculates Buying Power = free collateral / initial margin ratio
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpBuyingPower(marketIndex, collateralBuffer = numericConstants_1.ZERO, enterHighLeverageMode = undefined) {
-        const perpPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0];
+        const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
         const perpMarket = this.driftClient.getPerpMarketAccount(marketIndex);
         const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
         const worstCaseBaseAssetAmount = perpPosition
@@ -480,8 +307,7 @@ class User {
     getActivePerpPositionsForUserAccount(userAccount) {
         return userAccount.perpPositions.filter((pos) => !pos.baseAssetAmount.eq(numericConstants_1.ZERO) ||
             !pos.quoteAssetAmount.eq(numericConstants_1.ZERO) ||
-            !(pos.openOrders == 0) ||
-            !pos.lpShares.eq(numericConstants_1.ZERO));
+            !(pos.openOrders == 0));
     }
     getActivePerpPositions() {
         const userAccount = this.getUserAccount();
@@ -522,9 +348,6 @@ class User {
             const oraclePriceData = this.getMMOracleDataForPerpMarket(market.marketIndex);
             const quoteSpotMarket = this.driftClient.getSpotMarketAccount(market.quoteSpotMarketIndex);
             const quoteOraclePriceData = this.getOracleDataForSpotMarket(market.quoteSpotMarketIndex);
-            if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                perpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, undefined, !!withWeightMarginCategory)[0];
-            }
             let positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(market, perpPosition, withFunding, oraclePriceData);
             let quotePrice;
             if (strict && positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
@@ -758,10 +581,6 @@ class User {
     }
     calculateWeightedPerpPositionLiability(perpPosition, marginCategory, liquidationBuffer, includeOpenOrders, strict = false, enteringHighLeverage = undefined) {
         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;
@@ -805,13 +624,6 @@ class User {
                 .div(numericConstants_1.MARGIN_PRECISION);
             if (includeOpenOrders) {
                 liabilityValue = liabilityValue.add(new anchor_1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
-                if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-                    liabilityValue = liabilityValue.add(anchor_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 liabilityValue;
@@ -839,7 +651,7 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
-        const userPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, false, true)[0] || this.getEmptyPosition(marketIndex);
+        const userPosition = this.getPerpPositionOrEmpty(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
         return (0, margin_2.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData, includeOpenOrders);
     }
@@ -848,7 +660,7 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpLiabilityValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
-        const userPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, false, true)[0] || this.getEmptyPosition(marketIndex);
+        const userPosition = this.getPerpPositionOrEmpty(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
         if (includeOpenOrders) {
             return (0, margin_1.calculateWorstCasePerpLiabilityValue)(userPosition, market, oraclePriceData.price).worstCaseLiabilityValue;
@@ -1143,7 +955,7 @@ class User {
             .find((market) => market.amm.oracle.equals(oracle));
         const oraclePrice = this.driftClient.getOracleDataForSpotMarket(marketIndex).price;
         if (perpMarketWithSameOracle) {
-            const perpPosition = this.getPerpPositionWithLPSettle(perpMarketWithSameOracle.marketIndex, undefined, true)[0];
+            const perpPosition = this.getPerpPositionOrEmpty(perpMarketWithSameOracle.marketIndex);
             if (perpPosition) {
                 let freeCollateralDeltaForPerp = this.calculateFreeCollateralDeltaForPerp(perpMarketWithSameOracle, perpPosition, numericConstants_1.ZERO, oraclePrice);
                 if (freeCollateralDeltaForPerp) {
@@ -1184,8 +996,7 @@ class User {
         const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
-        const currentPerpPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0] ||
-            this.getEmptyPosition(marketIndex);
+        const currentPerpPosition = this.getPerpPositionOrEmpty(marketIndex);
         positionBaseSizeChange = (0, orders_1.standardizeBaseAssetAmount)(positionBaseSizeChange, market.amm.orderStepSize);
         const freeCollateralChangeFromNewPosition = this.calculateEntriesEffectOnFreeCollateral(market, oraclePrice, currentPerpPosition, positionBaseSizeChange, estimatedEntryPrice, includeOpenOrders, enteringHighLeverage);
         freeCollateral = freeCollateral.add(freeCollateralChangeFromNewPosition);
@@ -1344,7 +1155,7 @@ class User {
      * @returns : Precision PRICE_PRECISION
      */
     liquidationPriceAfterClose(positionMarketIndex, closeQuoteAmount, estimatedEntryPrice = numericConstants_1.ZERO) {
-        const currentPosition = this.getPerpPositionWithLPSettle(positionMarketIndex, undefined, true)[0] || this.getEmptyPosition(positionMarketIndex);
+        const currentPosition = this.getPerpPositionOrEmpty(positionMarketIndex);
         const closeBaseAmount = currentPosition.baseAssetAmount
             .mul(closeQuoteAmount)
             .div(currentPosition.quoteAssetAmount.abs())
@@ -1373,8 +1184,7 @@ class User {
     getMaxTradeSizeUSDCForPerp(targetMarketIndex, tradeSide, isLp = false, enterHighLeverageMode = undefined) {
         let tradeSize = numericConstants_1.ZERO;
         let oppositeSideTradeSize = numericConstants_1.ZERO;
-        const currentPosition = this.getPerpPositionWithLPSettle(targetMarketIndex, undefined, true)[0] ||
-            this.getEmptyPosition(targetMarketIndex);
+        const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
         const targetSide = (0, types_1.isVariant)(tradeSide, 'short') ? 'short' : 'long';
         const currentPositionSide = (currentPosition === null || currentPosition === void 0 ? void 0 : currentPosition.baseAssetAmount.isNeg())
             ? 'short'
@@ -1752,8 +1562,7 @@ class User {
                 .div(netAssetValueAfterTrade);
             return newLeverage;
         }
-        const currentPosition = this.getPerpPositionWithLPSettle(targetMarketIndex)[0] ||
-            this.getEmptyPosition(targetMarketIndex);
+        const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
         const perpMarket = this.driftClient.getPerpMarketAccount(targetMarketIndex);
         const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
         let { 
@@ -2016,12 +1825,11 @@ class User {
         };
     }
     getPerpPositionHealth({ marginCategory, perpPosition, oraclePriceData, quoteOraclePriceData, }) {
-        const settledLpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
         const perpMarket = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
         const _oraclePriceData = oraclePriceData ||
             this.driftClient.getOracleDataForPerpMarket(perpMarket.marketIndex);
         const oraclePrice = _oraclePriceData.price;
-        const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, margin_1.calculateWorstCasePerpLiabilityValue)(settledLpPosition, perpMarket, oraclePrice);
+        const { worstCaseBaseAssetAmount: worstCaseBaseAmount, worstCaseLiabilityValue, } = (0, margin_1.calculateWorstCasePerpLiabilityValue)(perpPosition, perpMarket, oraclePrice);
         const marginRatio = new anchor_1.BN((0, market_1.calculateMarketMarginRatio)(perpMarket, worstCaseBaseAmount.abs(), marginCategory, this.getUserAccount().maxMarginRatio, this.isHighLeverageMode(marginCategory)));
         const _quoteOraclePriceData = quoteOraclePriceData ||
             this.driftClient.getOracleDataForSpotMarket(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
@@ -2031,13 +1839,6 @@ class User {
             .mul(marginRatio)
             .div(numericConstants_1.MARGIN_PRECISION);
         marginRequirement = marginRequirement.add(new anchor_1.BN(perpPosition.openOrders).mul(numericConstants_1.OPEN_ORDER_MARGIN_REQUIREMENT));
-        if (perpPosition.lpShares.gt(numericConstants_1.ZERO)) {
-            marginRequirement = marginRequirement.add(anchor_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)));
-        }
         return {
             marketIndex: perpMarket.marketIndex,
             size: worstCaseBaseAmount,
@@ -2064,8 +1865,7 @@ class User {
                 quoteOraclePriceData,
             }));
             const quoteSpotMarket = this.driftClient.getSpotMarketAccount(perpMarket.quoteSpotMarketIndex);
-            const settledPerpPosition = this.getPerpPositionWithLPSettle(perpPosition.marketIndex, perpPosition)[0];
-            const positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(perpMarket, settledPerpPosition, true, oraclePriceData);
+            const positionUnrealizedPnl = (0, position_2.calculatePositionPNL)(perpMarket, perpPosition, true, oraclePriceData);
             let pnlWeight;
             if (positionUnrealizedPnl.gt(numericConstants_1.ZERO)) {
                 pnlWeight = (0, market_1.calculateUnrealizedAssetWeight)(perpMarket, quoteSpotMarket, positionUnrealizedPnl, marginCategory, oraclePriceData);
@@ -2152,7 +1952,7 @@ class User {
      * @returns positionValue : Precision QUOTE_PRECISION
      */
     getTotalPerpPositionValueExcludingMarket(marketToIgnore, marginCategory, liquidationBuffer, includeOpenOrders) {
-        const currentPerpPosition = this.getPerpPositionWithLPSettle(marketToIgnore, undefined, !!marginCategory)[0] || this.getEmptyPosition(marketToIgnore);
+        const currentPerpPosition = this.getPerpPositionOrEmpty(marketToIgnore);
         const oracleData = this.getOracleDataForPerpMarket(marketToIgnore);
         let currentPerpPositionValueUSDC = numericConstants_1.ZERO;
         if (currentPerpPosition) {

package/lib/node/accounts/webSocketAccountSubscriberV2.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 import { DataAndSlot, AccountSubscriber, ResubOpts, BufferAndSlot } from './types';
 import { Program } from '@coral-xyz/anchor';
-import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, type Commitment } from 'gill';
+import { AccountInfoBase, AccountInfoWithBase64EncodedData, AccountInfoWithBase58EncodedData, Rpc, RpcSubscriptions, SolanaRpcSubscriptionsApi, Commitment } from 'gill';
 import { PublicKey } from '@solana/web3.js';
 /**
  * WebSocketAccountSubscriberV2

package/lib/node/accounts/webSocketAccountSubscriberV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webSocketAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketAccountSubscriberV2.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAkB,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EACN,eAAe,EACf,gCAAgC,EAChC,gCAAgC,EAGhC,GAAG,EACH,gBAAgB,EAChB,yBAAyB,EAEzB,KAAK,UAAU,EACf,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,qBAAa,4BAA4B,CAAC,CAAC,CAAE,YAAW,iBAAiB,CAAC,CAAC,CAAC;IAC3E,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,SAAS,CAAC;IAErB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,UAAS;IAExB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1C,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAEjD,aAAa,EAAE,OAAO,CAAC;IAGvB,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,gBAAgB,CAEF;IACtB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAE1C;;;;;;;;;;;;OAYG;gBAEF,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU,EACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GAAG,MAAM,EACvE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;YAyDD,sBAAsB;IAsB9B,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D3D,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYrC,SAAS,CAAC,UAAU,IAAI,IAAI;IAuD5B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAuDpB,OAAO,CAAC,WAAW;IAOnB;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B,iBAAiB,CAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EACzB,WAAW,CAAC,EAAE,eAAe,GAC5B,CAAC,gCAAgC,GAAG,gCAAgC,CAAC,GACpE,IAAI;IA0DP,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC;IAW/B,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA2B3C"}
+{"version":3,"file":"webSocketAccountSubscriberV2.d.ts","sourceRoot":"","sources":["../../../src/accounts/webSocketAccountSubscriberV2.ts"],"names":[],"mappings":";;AAAA,OAAO,EACN,WAAW,EACX,iBAAiB,EACjB,SAAS,EACT,aAAa,EACb,MAAM,SAAS,CAAC;AACjB,OAAO,EAAkB,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5D,OAAO,EACN,eAAe,EACf,gCAAgC,EAChC,gCAAgC,EAGhC,GAAG,EACH,gBAAgB,EAChB,yBAAyB,EAEzB,UAAU,EACV,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+CG;AACH,qBAAa,4BAA4B,CAAC,CAAC,CAAE,YAAW,iBAAiB,CAAC,CAAC,CAAC;IAC3E,WAAW,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;IAC7B,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,SAAS,CAAC;IAC5B,cAAc,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,SAAS,EAAE,SAAS,CAAC;IAErB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,eAAe,UAAS;IAExB,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC1C,gBAAgB,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAEjD,aAAa,EAAE,OAAO,CAAC;IAGvB,OAAO,CAAC,GAAG,CAA+C;IAC1D,OAAO,CAAC,gBAAgB,CAEF;IACtB,OAAO,CAAC,eAAe,CAAC,CAAkB;IAE1C;;;;;;;;;;;;OAYG;gBAEF,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,SAAS,EAC3B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,CAAC,EACpC,SAAS,CAAC,EAAE,SAAS,EACrB,UAAU,CAAC,EAAE,UAAU,EACvB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,GAAG,MAAM,EACvE,GAAG,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC;YAyDD,sBAAsB;IAsB9B,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA0D3D,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAYrC,SAAS,CAAC,UAAU,IAAI,IAAI;IAuD5B;;;;OAIG;IACH,OAAO,CAAC,YAAY;IAuDpB,OAAO,CAAC,WAAW;IAOnB;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB5B,iBAAiB,CAChB,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EACzB,WAAW,CAAC,EAAE,eAAe,GAC5B,CAAC,gCAAgC,GAAG,gCAAgC,CAAC,GACpE,IAAI;IA0DP,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC;IAW/B,WAAW,CAAC,OAAO,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;CA2B3C"}