Merge pull request #126 from drift-labs/evan/add-fees-and-funding-to-…

…position-type common-ts: add fees and funding pnl to common position type
drift-labs · Oct 22, 2024 · a2f2cc5 · a2f2cc5
2 parents f634508 + a57f02f
commit a2f2cc5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/common-ts/src/common-ui-utils/user.ts b/common-ts/src/common-ui-utils/user.ts
@@ -14,6 +14,7 @@ import {
 	calculateClaimablePnl,
 	calculateCostBasis,
 	calculateEntryPrice,
+	calculateFeesAndFundingPnl,
 	calculatePositionFundingPNL,
 	calculatePositionPNL,
 	isOracleValid,
@@ -151,6 +152,11 @@ const getOpenPositionData = (
 					perpMarket,
 					perpPositionWithLpSettle
 				),
+				// Includes both settled and unsettled funding as well as fees
+				feesAndFundingPnl: calculateFeesAndFundingPnl(
+					perpMarket,
+					perpPositionWithLpSettle
+				),
 				totalUnrealizedPnl: calculatePositionPNL(
 					perpMarket,
 					perpPositionWithLpSettle,

diff --git a/common-ts/src/types/index.ts b/common-ts/src/types/index.ts
@@ -226,6 +226,7 @@ export type OpenPosition = {
 	quoteEntryAmount: BN;
 	quoteBreakEvenAmount: BN;
 	unrealizedFundingPnl: BN;
+	feesAndFundingPnl: BN;
 	lastCumulativeFundingRate: BN;
 	openOrders: number;
 	unsettledPnl: BN;