@gainsnetwork/sdk 1.0.1-rc2 → 1.0.2-rc2

package/lib/markets/oi/converter.js

@@ -96,6 +96,15 @@ const computeOiValues = (pairOi, tokenPriceCollateral) => {
             long: totalDynamicLong,
             short: totalDynamicShort,
         },
+        // v10-only values for funding fee markets
+        v10StaticCollateral: {
+            long: pairOi.collateral.long,
+            short: pairOi.collateral.short,
+        },
+        v10DynamicCollateral: {
+            long: tokenLongCollateral,
+            short: tokenShortCollateral,
+        },
         skewToken,
     };
 };

package/lib/markets/oi/types.d.ts

@@ -65,6 +65,22 @@ export interface ComputedOi {
         long: number;
         short: number;
     };
+    /**
+     * @dev v10-only OI using static collateral values
+     * @dev Used for funding fee markets display
+     */
+    v10StaticCollateral: {
+        long: number;
+        short: number;
+    };
+    /**
+     * @dev v10-only OI using dynamic values: token * price
+     * @dev Used for funding fee markets real-time display
+     */
+    v10DynamicCollateral: {
+        long: number;
+        short: number;
+    };
     /**
      * @dev Net skew in tokens (v10+ only)
      * @dev Positive = more longs, negative = more shorts

package/lib/trade/effectiveLeverage/getTradeNewEffectiveLeverage.d.ts

@@ -2,22 +2,19 @@
  * @dev Trade effective leverage calculations
  * @dev Mirrors contract's TradingCommonUtils.getTradeNewEffectiveLeverage
  */
-import { TradeEffectiveLeverageInput, TradeEffectiveLeverageContext, TradeEffectiveLeverageResult } from "./types";
-export type { TradeEffectiveLeverageInput, TradeEffectiveLeverageContext, TradeEffectiveLeverageResult, };
-export { buildTradeEffectiveLeverageContext } from "./builder";
+import { TradeEffectiveLeverageInput, TradeEffectiveLeverageResult } from "./types";
+export type { TradeEffectiveLeverageInput, TradeEffectiveLeverageResult };
 /**
  * @dev Calculates the effective leverage of a trade accounting for unrealized PnL
  * @dev Effective leverage increases when PnL is negative and decreases when positive
  * @dev Mirrors contract's getTradeNewEffectiveLeverage function
  * @param input Trade parameters including new position values
- * @param context Combined context for calculations
  * @returns Effective leverage and related values
  */
-export declare const getTradeNewEffectiveLeverage: (input: TradeEffectiveLeverageInput, context: TradeEffectiveLeverageContext) => TradeEffectiveLeverageResult;
+export declare const getTradeNewEffectiveLeverage: (input: TradeEffectiveLeverageInput) => TradeEffectiveLeverageResult;
 /**
- * @dev Simplified version for existing positions (no opening fees)
+ * @dev Simplified version for existing positions
  * @param input Trade parameters
- * @param context Combined context
  * @returns Effective leverage and related values
  */
-export declare const getTradeEffectiveLeverage: (input: Omit<TradeEffectiveLeverageInput, "openingFeesCollateral">, context: TradeEffectiveLeverageContext) => TradeEffectiveLeverageResult;
+export declare const getTradeEffectiveLeverage: (input: TradeEffectiveLeverageInput) => TradeEffectiveLeverageResult;

package/lib/trade/effectiveLeverage/getTradeNewEffectiveLeverage.js

@@ -1,64 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTradeEffectiveLeverage = exports.getTradeNewEffectiveLeverage = exports.buildTradeEffectiveLeverageContext = void 0;
-const __1 = require("..");
-var builder_1 = require("./builder");
-Object.defineProperty(exports, "buildTradeEffectiveLeverageContext", { enumerable: true, get: function () { return builder_1.buildTradeEffectiveLeverageContext; } });
+exports.getTradeEffectiveLeverage = exports.getTradeNewEffectiveLeverage = void 0;
 /**
  * @dev Calculates the effective leverage of a trade accounting for unrealized PnL
  * @dev Effective leverage increases when PnL is negative and decreases when positive
  * @dev Mirrors contract's getTradeNewEffectiveLeverage function
  * @param input Trade parameters including new position values
- * @param context Combined context for calculations
  * @returns Effective leverage and related values
  */
-const getTradeNewEffectiveLeverage = (input, context) => {
-    const { trade, newOpenPrice, newCollateralAmount, newLeverage, currentPairPrice, openingFeesCollateral, } = input;
-    const { closingPriceImpactContext } = context;
+const getTradeNewEffectiveLeverage = (input) => {
+    const { newOpenPrice, newCollateralAmount, newLeverage, currentPairPrice, tradeValueCollateral, } = input;
     // Calculate new position size
     const newPositionSize = newCollateralAmount * newLeverage;
-    // Calculate price impact for closing at current price
-    const closingPriceImpact = (0, __1.getTradeClosingPriceImpact)({
-        trade: Object.assign(Object.assign({}, trade), { openPrice: newOpenPrice, collateralAmount: newCollateralAmount, leverage: newLeverage }),
-        oraclePrice: currentPairPrice,
-        positionSizeCollateral: newPositionSize,
-        currentPairPrice: currentPairPrice,
-        useCumulativeVolPriceImpact: true,
-        collateralIndex: trade.collateralIndex,
-        pairIndex: trade.pairIndex,
-        pairSpreadP: context.baseSpreadP,
-        contractsVersion: closingPriceImpactContext.tradeInfo.contractsVersion,
-    }, closingPriceImpactContext);
-    // Calculate unrealized PnL
-    // For longs: (exitPrice - entryPrice) * positionSizeToken
-    // For shorts: (entryPrice - exitPrice) * positionSizeToken
-    const priceDiff = trade.long
-        ? closingPriceImpact.priceAfterImpact - newOpenPrice
-        : newOpenPrice - closingPriceImpact.priceAfterImpact;
-    const unrealizedPnl = priceDiff * closingPriceImpact.positionSizeToken;
-    // Calculate effective collateral (collateral + PnL - fees)
-    // Note: fees are subtracted because they reduce the effective collateral
-    const effectiveCollateral = newCollateralAmount + unrealizedPnl - openingFeesCollateral;
-    // Calculate effective leverage
-    // If effective collateral is <= 0, leverage is effectively infinite
-    const effectiveLeverage = effectiveCollateral > 0
-        ? newPositionSize / effectiveCollateral
+    // Calculate dynamic position size (matching on-chain logic)
+    // This adjusts position size based on current price vs open price
+    const newPosSizeCollateralDynamic = (newPositionSize * currentPairPrice) / newOpenPrice;
+    // Use the provided trade value as margin value
+    // This already includes collateral + PnL with price impact - fees
+    const newMarginValueCollateral = tradeValueCollateral;
+    // Calculate effective leverage (matching on-chain)
+    // If margin value is <= 0, leverage is effectively infinite
+    const effectiveLeverage = newMarginValueCollateral > 0
+        ? newPosSizeCollateralDynamic / newMarginValueCollateral
         : Number.MAX_SAFE_INTEGER;
     return {
         effectiveLeverage,
-        unrealizedPnl,
-        effectiveCollateral,
+        unrealizedPnl: tradeValueCollateral - newCollateralAmount,
+        effectiveCollateral: newMarginValueCollateral,
         positionSize: newPositionSize,
     };
 };
 exports.getTradeNewEffectiveLeverage = getTradeNewEffectiveLeverage;
 /**
- * @dev Simplified version for existing positions (no opening fees)
+ * @dev Simplified version for existing positions
  * @param input Trade parameters
- * @param context Combined context
  * @returns Effective leverage and related values
  */
-const getTradeEffectiveLeverage = (input, context) => {
-    return (0, exports.getTradeNewEffectiveLeverage)(Object.assign(Object.assign({}, input), { openingFeesCollateral: 0 }), context);
+const getTradeEffectiveLeverage = (input) => {
+    return (0, exports.getTradeNewEffectiveLeverage)(input);
 };
 exports.getTradeEffectiveLeverage = getTradeEffectiveLeverage;

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

@@ -1,3 +1,2 @@
 export * from "./types";
-export * from "./builder";
 export { getTradeNewEffectiveLeverage, getTradeEffectiveLeverage, } from "./getTradeNewEffectiveLeverage";

package/lib/trade/effectiveLeverage/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTradeEffectiveLeverage = exports.getTradeNewEffectiveLeverage = void 0;
 __exportStar(require("./types"), exports);
-__exportStar(require("./builder"), exports);
 var getTradeNewEffectiveLeverage_1 = require("./getTradeNewEffectiveLeverage");
 Object.defineProperty(exports, "getTradeNewEffectiveLeverage", { enumerable: true, get: function () { return getTradeNewEffectiveLeverage_1.getTradeNewEffectiveLeverage; } });
 Object.defineProperty(exports, "getTradeEffectiveLeverage", { enumerable: true, get: function () { return getTradeNewEffectiveLeverage_1.getTradeEffectiveLeverage; } });

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

@@ -1,7 +1,7 @@
 /**
  * @dev Types for trade effective leverage calculations
  */
-import { Trade, TradeClosingPriceImpactContext } from "..";
+import { Trade } from "..";
 /**
  * @dev Input parameters for effective leverage calculation
  * @dev Mirrors contract's parameters for getTradeNewEffectiveLeverage
@@ -12,16 +12,13 @@ export type TradeEffectiveLeverageInput = {
     newCollateralAmount: number;
     newLeverage: number;
     currentPairPrice: number;
-    openingFeesCollateral: number;
+    tradeValueCollateral: number;
 };
 /**
  * @dev Context for effective leverage calculation
- * Includes closing price impact context for PnL calculations
+ * Simplified context since price impact is now included in tradeValueCollateral
  */
-export type TradeEffectiveLeverageContext = {
-    closingPriceImpactContext: TradeClosingPriceImpactContext;
-    baseSpreadP: number;
-};
+export type TradeEffectiveLeverageContext = {};
 /**
  * @dev Result of effective leverage calculation
  */

package/lib/trade/pnl/index.js

@@ -141,8 +141,7 @@ const getComprehensivePnl = (trade, marketPrice, executionPrice, tradeInfo, cont
     // This is what the trader would get if closing the position
     const realizedPnlCollateral = impactPnlCollateral - totalFees + totalRealizedPnlCollateral;
     const realizedPnlPercent = (realizedPnlCollateral / trade.collateralAmount) * 100;
-    // Calculate trade value using execution price (what trader would receive)
-    const tradeValue = (0, exports.getTradeValue)(trade.collateralAmount, impactPnlPercent, totalFees);
+    const tradeValue = trade.collateralAmount + realizedPnlCollateral;
     return {
         // Raw PnL values (using market price, no price impact)
         pnlPercent: rawPnlPercent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gainsnetwork/sdk",
-  "version": "1.0.1-rc2",
+  "version": "1.0.2-rc2",
   "description": "Gains Network SDK",
   "main": "./lib/index.js",
   "files": [