@gainsnetwork/sdk 0.0.0-v10.rc10 → 0.0.0-v10.rc11

package/lib/trade/pnl/index.d.ts

@@ -2,10 +2,21 @@
  * @dev PnL calculation module
  * @dev Provides functions matching v10 contract implementations
  */
-import { Trade, TradeInfo, LiquidationParams, Fee, GlobalTradeFeeParams } from "../types";
+import { Trade, TradeInfo, LiquidationParams, Fee, GlobalTradeFeeParams, TradeFeesData } from "../types";
 import { ComprehensivePnlResult, GetComprehensivePnlContext } from "./types";
 import { BorrowingFee } from "../fees/borrowing";
 import { ContractsVersion } from "../../contracts/types";
+/**
+ * @dev Gets trade realized PnL components from TradeFeesData
+ * @dev Mirrors contract's getTradeRealizedPnlCollateral function
+ * @param tradeFeesData Trade fees data containing realized components
+ * @returns Tuple of [realizedPnlCollateral, realizedTradingFeesCollateral, totalRealizedPnlCollateral]
+ */
+export declare const getTradeRealizedPnlCollateral: (tradeFeesData: TradeFeesData) => {
+    realizedPnlCollateral: number;
+    realizedTradingFeesCollateral: number;
+    totalRealizedPnlCollateral: number;
+};
 /**
  * @dev Calculates PnL percentage for a position
  * @dev Mirrors contract's getPnlPercent function

package/lib/trade/pnl/index.js

@@ -18,10 +18,27 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPriceForTargetPnlPercentage = exports.getPnl = exports.getComprehensivePnl = exports.getTradeValue = exports.getPnlPercent = void 0;
+exports.getPriceForTargetPnlPercentage = exports.getPnl = exports.getComprehensivePnl = exports.getTradeValue = exports.getPnlPercent = exports.getTradeRealizedPnlCollateral = void 0;
 const borrowing_1 = require("../fees/borrowing");
 const trading_1 = require("../fees/trading");
 const liquidation_1 = require("../liquidation");
+/**
+ * @dev Gets trade realized PnL components from TradeFeesData
+ * @dev Mirrors contract's getTradeRealizedPnlCollateral function
+ * @param tradeFeesData Trade fees data containing realized components
+ * @returns Tuple of [realizedPnlCollateral, realizedTradingFeesCollateral, totalRealizedPnlCollateral]
+ */
+const getTradeRealizedPnlCollateral = (tradeFeesData) => {
+    const realizedPnlCollateral = tradeFeesData.realizedPnlCollateral;
+    const realizedTradingFeesCollateral = tradeFeesData.realizedTradingFeesCollateral;
+    const totalRealizedPnlCollateral = realizedPnlCollateral - realizedTradingFeesCollateral;
+    return {
+        realizedPnlCollateral,
+        realizedTradingFeesCollateral,
+        totalRealizedPnlCollateral,
+    };
+};
+exports.getTradeRealizedPnlCollateral = getTradeRealizedPnlCollateral;
 /**
  * @dev Calculates PnL percentage for a position
  * @dev Mirrors contract's getPnlPercent function
@@ -93,7 +110,8 @@ const getComprehensivePnl = (trade, currentPrice, tradeInfo, context) => {
         traderFeeMultiplier: context.trading.traderFeeMultiplier,
     });
     // Total fees
-    const totalFees = borrowingFeeV1 + borrowingFeeV2 + fundingFee + closingFee;
+    const totalHoldingFees = borrowingFeeV1 + borrowingFeeV2 + fundingFee;
+    const totalFees = totalHoldingFees + closingFee;
     // Check liquidation
     const liquidationThreshold = ((_a = context.tradeData) === null || _a === void 0 ? void 0 : _a.liquidationParams)
         ? (0, liquidation_1.getLiqPnlThresholdP)(context.tradeData.liquidationParams, trade.leverage) *
@@ -104,20 +122,19 @@ const getComprehensivePnl = (trade, currentPrice, tradeInfo, context) => {
     if (isLiquidated) {
         pnlPercent = -100;
     }
+    // Get realized PnL components from TradeFeesData
+    const { totalRealizedPnlCollateral } = (0, exports.getTradeRealizedPnlCollateral)(context.tradeData.tradeFeesData);
     // Calculate final trade value
     const tradeValue = (0, exports.getTradeValue)(trade.collateralAmount, pnlPercent, totalFees);
     // Calculate PnL in collateral
     const pnlCollateral = trade.collateralAmount * (pnlPercent / 100);
     // Calculate leveraged position size
     const leveragedPositionSize = trade.collateralAmount * trade.leverage;
-    // Calculate net PnL after fees
-    const netPnlAfterFees = pnlCollateral - totalFees;
     // Calculate unrealized PnL (before closing fee, after holding fees)
-    const totalHoldingFees = borrowingFeeV1 + borrowingFeeV2 + fundingFee;
-    const uPnlCollateral = pnlCollateral - totalHoldingFees;
+    const uPnlCollateral = pnlCollateral - totalHoldingFees + totalRealizedPnlCollateral;
     const uPnlPercent = (uPnlCollateral / trade.collateralAmount) * 100;
     // Realized PnL (after all fees including closing)
-    const realizedPnlCollateral = pnlCollateral - totalFees;
+    const realizedPnlCollateral = pnlCollateral - totalFees + totalRealizedPnlCollateral;
     const realizedPnlPercent = (realizedPnlCollateral / trade.collateralAmount) * 100;
     return {
         // Core PnL values
@@ -143,7 +160,6 @@ const getComprehensivePnl = (trade, currentPrice, tradeInfo, context) => {
         isProfitable: pnlPercent > 0,
         // Additional info
         leveragedPositionSize,
-        netPnlAfterFees,
     };
 };
 exports.getComprehensivePnl = getComprehensivePnl;

package/lib/trade/pnl/types.d.ts

@@ -52,7 +52,6 @@ export type ComprehensivePnlResult = {
     isLiquidated: boolean;
     isProfitable: boolean;
     leveragedPositionSize: number;
-    netPnlAfterFees: number;
 };
 /**
  * @dev Context for comprehensive PnL calculations with nested sub-contexts

package/lib/trade/priceImpact/close/index.js

@@ -12,17 +12,20 @@ const types_1 = require("../../../contracts/types");
 var builder_1 = require("./builder");
 Object.defineProperty(exports, "buildTradeClosingPriceImpactContext", { enumerable: true, get: function () { return builder_1.buildTradeClosingPriceImpactContext; } });
 /**
- * @dev Calculates position size in tokens for partial close
- * @param originalPositionSizeToken Original position size in tokens
+ * @dev Calculates position size in tokens for the portion being closed
+ * @param positionSizeCollateral Position size in collateral units being closed
+ * @param originalPositionSizeToken Original total position size in tokens
  * @param originalCollateral Original collateral amount
- * @param closingCollateral Collateral amount being closed
- * @returns Proportional position size in tokens
+ * @param originalLeverage Original leverage
+ * @returns Position size in tokens for the closing portion
  */
-const calculateClosingPositionSizeToken = (originalPositionSizeToken, originalCollateral, closingCollateral) => {
-    if (originalCollateral === 0)
+const calculateClosingPositionSizeToken = (positionSizeCollateral, originalPositionSizeToken, originalCollateral, originalLeverage) => {
+    const totalPositionSizeCollateral = originalCollateral * originalLeverage;
+    if (totalPositionSizeCollateral === 0)
         return 0;
-    // Proportional calculation: (closingCollateral / originalCollateral) * originalPositionSizeToken
-    return (closingCollateral * originalPositionSizeToken) / originalCollateral;
+    // Match contract logic: (positionSizeCollateral * originalPositionSizeToken) / totalPositionSizeCollateral
+    return ((positionSizeCollateral * originalPositionSizeToken) /
+        totalPositionSizeCollateral);
 };
 /**
  * @dev Calculates all price impacts for trade closing
@@ -46,7 +49,7 @@ const getTradeClosingPriceImpact = (input, context) => {
     }
     // Calculate position size in tokens (proportional to collateral being closed)
     const positionSizeToken = input.trade.positionSizeToken
-        ? calculateClosingPositionSizeToken(input.trade.positionSizeToken, input.trade.collateralAmount, input.positionSizeCollateral)
+        ? calculateClosingPositionSizeToken(input.positionSizeCollateral, input.trade.positionSizeToken, input.trade.collateralAmount, input.trade.leverage)
         : 0;
     // Calculate fixed spread (reversed for closing)
     const fixedSpreadP = (0, cumulVol_1.getFixedSpreadP)(input.pairSpreadP, input.trade.long, false // closing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gainsnetwork/sdk",
-  "version": "0.0.0-v10.rc10",
+  "version": "0.0.0-v10.rc11",
   "description": "Gains Network SDK",
   "main": "./lib/index.js",
   "files": [