@drift-labs/sdk 2.60.0-beta.5 → 2.60.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.60.0-beta.5
+2.60.0-beta.6

package/lib/user.d.ts

@@ -248,7 +248,7 @@ export declare class User {
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN): BN;
+    liquidationPrice(marketIndex: number, positionBaseSizeChange?: BN, estimatedEntryPrice?: BN): BN;
     calculateFreeCollateralDeltaForPerp(market: PerpMarketAccount, perpPosition: PerpPosition, positionBaseSizeChange: BN): BN | undefined;
     calculateFreeCollateralDeltaForSpot(market: SpotMarketAccount, signedTokenAmount: BN): BN;
     /**

package/lib/user.js

@@ -1082,10 +1082,27 @@ class User {
      * @param positionBaseSizeChange // change in position size to calculate liquidation price for : Precision 10^13
      * @returns Precision : PRICE_PRECISION
      */
-    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO) {
+    liquidationPrice(marketIndex, positionBaseSizeChange = numericConstants_1.ZERO, estimatedEntryPrice = numericConstants_1.ZERO) {
         const totalCollateral = this.getTotalCollateral('Maintenance');
         const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
-        const freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
+        let freeCollateral = _1.BN.max(numericConstants_1.ZERO, totalCollateral.sub(maintenanceMarginRequirement));
+        const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
+        const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
+        // update free collateral to accoutn from pnl based on entry price
+        if (!estimatedEntryPrice.eq(numericConstants_1.ZERO) && !positionBaseSizeChange.eq(numericConstants_1.ZERO)) {
+            const costBasis = oraclePrice
+                .mul(positionBaseSizeChange.abs())
+                .div(numericConstants_1.BASE_PRECISION);
+            const newPositionValue = estimatedEntryPrice
+                .mul(positionBaseSizeChange.abs())
+                .div(numericConstants_1.BASE_PRECISION);
+            if (positionBaseSizeChange.gt(numericConstants_1.ZERO)) {
+                freeCollateral = freeCollateral.add(costBasis.sub(newPositionValue));
+            }
+            else {
+                freeCollateral = freeCollateral.add(newPositionValue.sub(costBasis));
+            }
+        }
         const market = this.driftClient.getPerpMarketAccount(marketIndex);
         const currentPerpPosition = this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0] ||
             this.getEmptyPosition(marketIndex);
@@ -1093,7 +1110,6 @@ class User {
         if (!freeCollateralDelta) {
             return new _1.BN(-1);
         }
-        const oracle = this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
         const spotMarketWithSameOracle = this.driftClient
             .getSpotMarketAccounts()
             .find((market) => market.oracle.equals(oracle));
@@ -1108,7 +1124,6 @@ class User {
         if (freeCollateralDelta.eq(numericConstants_1.ZERO)) {
             return new _1.BN(-1);
         }
-        const oraclePrice = this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
         const liqPriceDelta = freeCollateral
             .mul(numericConstants_1.QUOTE_PRECISION)
             .div(freeCollateralDelta);

package/package.json

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

package/src/user.ts

@@ -1973,15 +1973,37 @@ export class User {
 	 */
 	public liquidationPrice(
 		marketIndex: number,
-		positionBaseSizeChange: BN = ZERO
+		positionBaseSizeChange: BN = ZERO,
+		estimatedEntryPrice: BN = ZERO
 	): BN {
 		const totalCollateral = this.getTotalCollateral('Maintenance');
 		const maintenanceMarginRequirement = this.getMaintenanceMarginRequirement();
-		const freeCollateral = BN.max(
+		let freeCollateral = BN.max(
 			ZERO,
 			totalCollateral.sub(maintenanceMarginRequirement)
 		);
 
+		const oracle =
+			this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
+
+		const oraclePrice =
+			this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
+
+		// update free collateral to accoutn from pnl based on entry price
+		if (!estimatedEntryPrice.eq(ZERO) && !positionBaseSizeChange.eq(ZERO)) {
+			const costBasis = oraclePrice
+				.mul(positionBaseSizeChange.abs())
+				.div(BASE_PRECISION);
+			const newPositionValue = estimatedEntryPrice
+				.mul(positionBaseSizeChange.abs())
+				.div(BASE_PRECISION);
+			if (positionBaseSizeChange.gt(ZERO)) {
+				freeCollateral = freeCollateral.add(costBasis.sub(newPositionValue));
+			} else {
+				freeCollateral = freeCollateral.add(newPositionValue.sub(costBasis));
+			}
+		}
+
 		const market = this.driftClient.getPerpMarketAccount(marketIndex);
 		const currentPerpPosition =
 			this.getPerpPositionWithLPSettle(marketIndex, undefined, true)[0] ||
@@ -1997,8 +2019,6 @@ export class User {
 			return new BN(-1);
 		}
 
-		const oracle =
-			this.driftClient.getPerpMarketAccount(marketIndex).amm.oracle;
 		const spotMarketWithSameOracle = this.driftClient
 			.getSpotMarketAccounts()
 			.find((market) => market.oracle.equals(oracle));
@@ -2031,8 +2051,6 @@ export class User {
 			return new BN(-1);
 		}
 
-		const oraclePrice =
-			this.driftClient.getOracleDataForPerpMarket(marketIndex).price;
 		const liqPriceDelta = freeCollateral
 			.mul(QUOTE_PRECISION)
 			.div(freeCollateralDelta);