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

package/VERSION

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

package/lib/driftClient.d.ts

@@ -230,6 +230,7 @@ export declare class DriftClient {
     getRemovePerpLpSharesIx(marketIndex: number, sharesToBurn?: BN): Promise<TransactionInstruction>;
     addPerpLpShares(amount: BN, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getAddPerpLpSharesIx(amount: BN, marketIndex: number): Promise<TransactionInstruction>;
+    getQuoteValuePerLpShare(marketIndex: number): BN;
     /**
      * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
      */

package/lib/driftClient.js

@@ -1358,6 +1358,19 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    getQuoteValuePerLpShare(marketIndex) {
+        const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+        const openBids = anchor_1.BN.max(perpMarketAccount.amm.baseAssetReserve.sub(perpMarketAccount.amm.minBaseAssetReserve), numericConstants_1.ZERO);
+        const openAsks = anchor_1.BN.max(perpMarketAccount.amm.maxBaseAssetReserve.sub(perpMarketAccount.amm.baseAssetReserve), numericConstants_1.ZERO);
+        const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
+        const maxOpenBidsAsks = anchor_1.BN.max(openBids, openAsks);
+        const quoteValuePerLpShare = maxOpenBidsAsks
+            .mul(oraclePriceData.price)
+            .mul(numericConstants_1.QUOTE_PRECISION)
+            .div(numericConstants_1.PRICE_PRECISION)
+            .div(perpMarketAccount.amm.sqrtK);
+        return quoteValuePerLpShare;
+    }
     /**
      * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
      */

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.1-beta.4",
+    "version": "2.31.1-beta.5",
     "name": "drift",
     "instructions": [
         {

package/lib/user.js

@@ -180,7 +180,9 @@ class User {
      * @returns : pnl from settle
      */
     getPerpPositionWithLPSettle(marketIndex, originalPosition) {
-        originalPosition = originalPosition !== null && originalPosition !== void 0 ? originalPosition : this.getPerpPosition(marketIndex);
+        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];
         }
@@ -232,7 +234,7 @@ class User {
         let pnl;
         if (updateType == 'open' || updateType == 'increase') {
             newQuoteEntry = position.quoteEntryAmount.add(deltaQaa);
-            pnl = 0;
+            pnl = numericConstants_1.ZERO;
         }
         else if (updateType == 'reduce' || updateType == 'close') {
             newQuoteEntry = position.quoteEntryAmount.sub(position.quoteEntryAmount
@@ -608,7 +610,8 @@ class User {
      * @returns : Precision QUOTE_PRECISION
      */
     getPerpPositionValue(marketIndex, oraclePriceData, includeOpenOrders = false) {
-        const userPosition = this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
+        const userPosition = this.getPerpPositionWithLPSettle(marketIndex)[0] ||
+            this.getEmptyPosition(marketIndex);
         const market = this.driftClient.getPerpMarketAccount(userPosition.marketIndex);
         return (0, margin_1.calculateBaseAssetValueWithOracle)(market, userPosition, oraclePriceData, includeOpenOrders);
     }

package/package.json

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

package/src/config.ts

@@ -131,7 +131,7 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 		(await program.account.spotMarket.all()) as ProgramAccount<SpotMarketAccount>[];
 
 	for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
-		const perpMarket = perpMarketProgramAccount.account;
+		const perpMarket = perpMarketProgramAccount.account as PerpMarketAccount;
 		perpMarketIndexes.push(perpMarket.marketIndex);
 		oracleInfos.set(perpMarket.amm.oracle.toString(), {
 			publicKey: perpMarket.amm.oracle,
@@ -140,7 +140,7 @@ export async function findAllMarketAndOracles(program: Program): Promise<{
 	}
 
 	for (const spotMarketProgramAccount of spotMarketProgramAccounts) {
-		const spotMarket = spotMarketProgramAccount.account;
+		const spotMarket = spotMarketProgramAccount.account as SpotMarketAccount;
 		spotMarketIndexes.push(spotMarket.marketIndex);
 		oracleInfos.set(spotMarket.oracle.toString(), {
 			publicKey: spotMarket.oracle,

package/src/driftClient.ts

@@ -95,6 +95,7 @@ import {
 	PRICE_PRECISION,
 	QUOTE_SPOT_MARKET_INDEX,
 	ZERO,
+	QUOTE_PRECISION,
 } from './constants/numericConstants';
 import { findDirectionToClose, positionIsAvailable } from './math/position';
 import { getSignedTokenAmount, getTokenAmount } from './math/spotBalance';
@@ -2301,6 +2302,35 @@ export class DriftClient {
 		});
 	}
 
+	public getQuoteValuePerLpShare(marketIndex: number): BN {
+		const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+
+		const openBids = BN.max(
+			perpMarketAccount.amm.baseAssetReserve.sub(
+				perpMarketAccount.amm.minBaseAssetReserve
+			),
+			ZERO
+		);
+
+		const openAsks = BN.max(
+			perpMarketAccount.amm.maxBaseAssetReserve.sub(
+				perpMarketAccount.amm.baseAssetReserve
+			),
+			ZERO
+		);
+
+		const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
+
+		const maxOpenBidsAsks = BN.max(openBids, openAsks);
+		const quoteValuePerLpShare = maxOpenBidsAsks
+			.mul(oraclePriceData.price)
+			.mul(QUOTE_PRECISION)
+			.div(PRICE_PRECISION)
+			.div(perpMarketAccount.amm.sqrtK);
+
+		return quoteValuePerLpShare;
+	}
+
 	/**
 	 * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
 	 */

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.1-beta.5",
+  "version": "2.31.1-beta.6",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -304,7 +304,10 @@ export class User {
 		marketIndex: number,
 		originalPosition?: PerpPosition
 	): [PerpPosition, BN, BN] {
-		originalPosition = originalPosition ?? this.getPerpPosition(marketIndex);
+		originalPosition =
+			originalPosition ??
+			this.getPerpPosition(marketIndex) ??
+			this.getEmptyPosition(marketIndex);
 
 		if (originalPosition.lpShares.eq(ZERO)) {
 			return [originalPosition, ZERO, ZERO];
@@ -371,7 +374,7 @@ export class User {
 		let pnl;
 		if (updateType == 'open' || updateType == 'increase') {
 			newQuoteEntry = position.quoteEntryAmount.add(deltaQaa);
-			pnl = 0;
+			pnl = ZERO;
 		} else if (updateType == 'reduce' || updateType == 'close') {
 			newQuoteEntry = position.quoteEntryAmount.sub(
 				position.quoteEntryAmount
@@ -1136,7 +1139,8 @@ export class User {
 		includeOpenOrders = false
 	): BN {
 		const userPosition =
-			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
+			this.getPerpPositionWithLPSettle(marketIndex)[0] ||
+			this.getEmptyPosition(marketIndex);
 		const market = this.driftClient.getPerpMarketAccount(
 			userPosition.marketIndex
 		);