@gainsnetwork/sdk 0.0.0-v10.rc3 → 0.0.0-v10.rc5

package/lib/trade/pnl/index.js

@@ -18,13 +18,10 @@ 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.getPnl = exports.getComprehensivePnl = exports.getTradeValue = exports.getPnlPercent = void 0;
-const fees_1 = require("../fees");
-const borrowingV2_1 = require("../fees/borrowingV2");
-const fundingFees_1 = require("../fees/fundingFees");
+exports.getPriceForTargetPnlPercentage = exports.getPnl = exports.getComprehensivePnl = exports.getTradeValue = exports.getPnlPercent = void 0;
+const borrowing_1 = require("../fees/borrowing");
 const trading_1 = require("../fees/trading");
 const liquidation_1 = require("../liquidation");
-const types_1 = require("../../contracts/types");
 /**
  * @dev Calculates PnL percentage for a position
  * @dev Mirrors contract's getPnlPercent function
@@ -66,56 +63,41 @@ exports.getTradeValue = getTradeValue;
  * @returns Detailed PnL breakdown
  */
 const getComprehensivePnl = (trade, currentPrice, tradeInfo, context) => {
+    var _a;
     // Calculate base PnL percentage
     let pnlPercent = (0, exports.getPnlPercent)(trade.openPrice, currentPrice, trade.long, trade.leverage);
+    if (!context.tradeData) {
+        throw new Error("Trade data is undefined");
+    }
     // Calculate position size
     const positionSizeCollateral = trade.collateralAmount * trade.leverage;
-    // Initialize fees
-    let borrowingFeeV1 = 0;
-    let borrowingFeeV2 = 0;
-    let fundingFee = 0;
-    // Calculate holding fees based on version
-    if (context.contractsVersion >= types_1.ContractsVersion.V10 &&
-        context.tradeFeesData) {
-        // V10: Use aggregated holding fees function
-        const holdingFees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, context.tradeFeesData, // Cast to handle partial type
-        currentPrice, context);
-        fundingFee = holdingFees.fundingFeeCollateral;
-        borrowingFeeV2 = holdingFees.borrowingFeeCollateral;
-        borrowingFeeV1 = holdingFees.borrowingFeeCollateral_old;
-    }
-    else {
-        // Pre-v10: Calculate fees individually
-        // V1 borrowing fees (still used by some markets)
-        if (context.initialAccFees) {
-            borrowingFeeV1 = (0, fees_1.getBorrowingFee)(positionSizeCollateral, trade.pairIndex, trade.long, context.initialAccFees, context);
-        }
-        // V2 borrowing fees
-        if (context.tradeFeesData && context.borrowingProviderContext) {
-            borrowingFeeV2 = (0, borrowingV2_1.getTradeBorrowingFeesCollateral)({
-                positionSizeCollateral,
-                openPrice: trade.openPrice,
-                collateralIndex: trade.collateralIndex,
-                pairIndex: trade.pairIndex,
-                currentPairPrice: currentPrice,
-                initialAccBorrowingFeeP: context.tradeFeesData.initialAccBorrowingFeeP,
-                currentTimestamp: context.currentTimestamp,
-            }, context.borrowingProviderContext);
-        }
-        // Funding fees (v10+)
-        if (context.contractsVersion >= types_1.ContractsVersion.V10 &&
-            context.tradeFeesData) {
-            fundingFee = (0, fundingFees_1.getTradeFundingFeesCollateral)(trade, tradeInfo, context.tradeFeesData, // Cast to handle partial type
-            currentPrice, context);
-        }
-    }
+    // Calculate holding fees - always use getTradePendingHoldingFeesCollateral
+    // This mirrors the contract's getTradeValueCollateral which always calls this function
+    const pendingHoldingFees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, context.tradeData.tradeFeesData, currentPrice, {
+        contractsVersion: context.core.contractsVersion,
+        currentTimestamp: context.core.currentTimestamp,
+        collateralPriceUsd: context.core.collateralPriceUsd,
+        borrowingV1: context.borrowingV1,
+        borrowingV2: context.borrowingV2,
+        funding: context.funding,
+        initialAccFees: context.tradeData.initialAccFees,
+    });
+    const borrowingFeeV1 = pendingHoldingFees.borrowingFeeCollateral_old;
+    const borrowingFeeV2 = pendingHoldingFees.borrowingFeeCollateral;
+    const fundingFee = pendingHoldingFees.fundingFeeCollateral;
     // Calculate closing fees
-    const closingFee = (0, trading_1.getTotalTradeFeesCollateral)(trade.collateralIndex, trade.user, trade.pairIndex, positionSizeCollateral, trade.isCounterTrade || false, context);
+    const closingFee = (0, trading_1.getTotalTradeFeesCollateral)(trade.collateralIndex, trade.user, trade.pairIndex, positionSizeCollateral, trade.isCounterTrade || false, {
+        fee: context.trading.fee,
+        globalTradeFeeParams: context.trading.globalTradeFeeParams,
+        collateralPriceUsd: context.core.collateralPriceUsd,
+        traderFeeMultiplier: context.trading.traderFeeMultiplier,
+    });
     // Total fees
     const totalFees = borrowingFeeV1 + borrowingFeeV2 + fundingFee + closingFee;
     // Check liquidation
-    const liquidationThreshold = context.liquidationParams
-        ? (0, liquidation_1.getLiqPnlThresholdP)(context.liquidationParams, trade.leverage) * -100
+    const liquidationThreshold = ((_a = context.tradeData) === null || _a === void 0 ? void 0 : _a.liquidationParams)
+        ? (0, liquidation_1.getLiqPnlThresholdP)(context.tradeData.liquidationParams, trade.leverage) *
+            -100
         : -90; // Default 90% loss
     const isLiquidated = pnlPercent <= liquidationThreshold;
     // If liquidated, set PnL to -100%
@@ -130,11 +112,24 @@ const getComprehensivePnl = (trade, currentPrice, tradeInfo, context) => {
     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 uPnlPercent = (uPnlCollateral / trade.collateralAmount) * 100;
+    // Realized PnL (after all fees including closing)
+    const realizedPnlCollateral = pnlCollateral - totalFees;
+    const realizedPnlPercent = (realizedPnlCollateral / trade.collateralAmount) * 100;
     return {
         // Core PnL values
         pnlPercent,
         pnlCollateral,
         tradeValue,
+        // Unrealized PnL (after holding fees, before closing fee)
+        uPnlCollateral,
+        uPnlPercent,
+        // Realized PnL (after all fees)
+        realizedPnlCollateral,
+        realizedPnlPercent,
         // Fee breakdown
         fees: {
             borrowingV1: borrowingFeeV1,
@@ -174,8 +169,17 @@ const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, use
     let pnlCollat = trade.long
         ? ((price - openPrice) / openPrice) * leverage * posCollat
         : ((openPrice - price) / openPrice) * leverage * posCollat;
-    if (useFees) {
-        pnlCollat -= (0, fees_1.getBorrowingFee)(posCollat * trade.leverage, trade.pairIndex, trade.long, initialAccFees, context);
+    if (useFees &&
+        context.pairs &&
+        context.groups &&
+        context.currentBlock !== undefined &&
+        context.collateralPriceUsd !== undefined) {
+        pnlCollat -= (0, borrowing_1.getBorrowingFee)(posCollat * trade.leverage, trade.pairIndex, trade.long, initialAccFees, {
+            currentBlock: context.currentBlock,
+            groups: context.groups,
+            pairs: context.pairs,
+            collateralPriceUsd: context.collateralPriceUsd,
+        });
     }
     let pnlPercentage = (pnlCollat / posCollat) * 100;
     // Can be liquidated
@@ -187,7 +191,12 @@ const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, use
         // Calculate closing fee using the same function as opening fees
         const positionSizeCollateral = posCollat * trade.leverage;
         const closingFee = (0, trading_1.getTotalTradeFeesCollateral)(0, // collateralIndex not used
-        trade.user, trade.pairIndex, positionSizeCollateral, (_a = trade.isCounterTrade) !== null && _a !== void 0 ? _a : false, context);
+        trade.user, trade.pairIndex, positionSizeCollateral, (_a = trade.isCounterTrade) !== null && _a !== void 0 ? _a : false, {
+            fee: context.fee,
+            globalTradeFeeParams: context.globalTradeFeeParams,
+            collateralPriceUsd: context.collateralPriceUsd || 1,
+            traderFeeMultiplier: context.traderFeeMultiplier,
+        });
         pnlCollat -= closingFee;
         pnlPercentage = (pnlCollat / posCollat) * 100;
     }
@@ -196,6 +205,66 @@ const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, use
     return [pnlCollat, pnlPercentage];
 };
 exports.getPnl = getPnl;
+/**
+ * @dev Calculates the price needed to achieve a target PnL percentage
+ * @param targetPnlPercent The target PnL percentage (e.g., 50 for 50% profit, -25 for 25% loss)
+ * @param trade The trade to calculate for
+ * @param tradeInfo Trade info with timestamps
+ * @param context Context with fee calculation parameters
+ * @param netPnl Whether to include closing fees in the calculation
+ * @returns The price that would result in the target PnL percentage
+ */
+const getPriceForTargetPnlPercentage = (targetPnlPercent, trade, tradeInfo, context, netPnl = false) => {
+    var _a, _b;
+    const { leverage, openPrice, long, collateralAmount } = trade;
+    const positionSizeCollateral = collateralAmount * leverage;
+    // Calculate holding fees - always use getTradePendingHoldingFeesCollateral
+    // This mirrors the contract's getTradeValueCollateral which always calls this function
+    const fees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, ((_a = context.tradeData) === null || _a === void 0 ? void 0 : _a.tradeFeesData) || {
+        realizedTradingFeesCollateral: 0,
+        realizedPnlCollateral: 0,
+        manuallyRealizedNegativePnlCollateral: 0,
+        alreadyTransferredNegativePnlCollateral: 0,
+        virtualAvailableCollateralInDiamond: 0,
+        initialAccFundingFeeP: 0,
+        initialAccBorrowingFeeP: 0,
+    }, openPrice, // Use open price as a baseline
+    {
+        contractsVersion: context.core.contractsVersion,
+        currentTimestamp: context.core.currentTimestamp,
+        collateralPriceUsd: context.core.collateralPriceUsd,
+        borrowingV1: context.borrowingV1,
+        borrowingV2: context.borrowingV2,
+        funding: context.funding,
+        initialAccFees: (_b = context.tradeData) === null || _b === void 0 ? void 0 : _b.initialAccFees,
+    });
+    const totalHoldingFees = fees.fundingFeeCollateral +
+        fees.borrowingFeeCollateral +
+        fees.borrowingFeeCollateral_old;
+    const targetPnlInCollateral = (collateralAmount * targetPnlPercent) / 100;
+    let targetPnlGross = targetPnlInCollateral + totalHoldingFees;
+    if (netPnl) {
+        // Include closing fees
+        const closingFee = (0, trading_1.getTotalTradeFeesCollateral)(trade.collateralIndex, trade.user, trade.pairIndex, positionSizeCollateral, trade.isCounterTrade || false, {
+            fee: context.trading.fee,
+            globalTradeFeeParams: context.trading.globalTradeFeeParams,
+            collateralPriceUsd: context.core.collateralPriceUsd,
+            traderFeeMultiplier: context.trading.traderFeeMultiplier,
+        });
+        targetPnlGross += closingFee;
+    }
+    // Calculate the price
+    let price;
+    if (long) {
+        price = openPrice + (targetPnlGross * openPrice) / positionSizeCollateral;
+    }
+    else {
+        price = openPrice - (targetPnlGross * openPrice) / positionSizeCollateral;
+    }
+    return price;
+};
+exports.getPriceForTargetPnlPercentage = getPriceForTargetPnlPercentage;
 // Re-export types
 __exportStar(require("./types"), exports);
 __exportStar(require("./converter"), exports);
+__exportStar(require("./builder"), exports);

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

@@ -1,21 +1,11 @@
 /**
  * @dev Types for PnL calculations
  */
-import { Trade, TradeInfo, TradeFeesData } from "../types";
-/**
- * @dev Input for trade value calculation with all fees
- * @dev Mirrors contract's TradeValueInput struct
- */
-export type TradeValueInput = {
-    trade: Trade;
-    currentPrice: number;
-    collateralPriceUsd: number;
-    fees: {
-        openingFeeCollateral: number;
-        closingFeeCollateral: number;
-        holdingFeesCollateral: number;
-    };
-};
+import { ContractsVersion } from "src/contracts/types";
+import { BorrowingFee, GetBorrowingFeeContext, TradingFeesSubContext } from "../fees";
+import { GetPairBorrowingFeeV2Context } from "../fees/borrowingV2";
+import { GetPairFundingFeeContext } from "../fees/fundingFees";
+import { TradeFeesData, LiquidationParams } from "../types";
 /**
  * @dev Result of trade value calculation
  */
@@ -53,6 +43,10 @@ export type ComprehensivePnlResult = {
     pnlPercent: number;
     pnlCollateral: number;
     tradeValue: number;
+    uPnlCollateral: number;
+    uPnlPercent: number;
+    realizedPnlCollateral: number;
+    realizedPnlPercent: number;
     fees: FeeBreakdown;
     priceImpact?: PriceImpactBreakdown;
     isLiquidated: boolean;
@@ -61,26 +55,22 @@ export type ComprehensivePnlResult = {
     netPnlAfterFees: number;
 };
 /**
- * @dev Simple PnL result for backward compatibility
- */
-export type SimplePnlResult = [pnlCollateral: number, pnlPercent: number];
-/**
- * @dev Input for PnL calculation with price impact
+ * @dev Context for comprehensive PnL calculations with nested sub-contexts
  */
-export type PnlWithPriceImpactInput = {
-    trade: Trade;
-    tradeInfo: TradeInfo;
-    oraclePrice: number;
-    currentPairPrice: number;
-    usePriceImpact: boolean;
-    includeOpeningFees?: boolean;
-};
-/**
- * @dev Context for v10 PnL calculations
- */
-export type V10PnlContext = {
-    tradeFeesData: TradeFeesData;
-    priceImpactContext?: any;
-    skewContext?: any;
-    cumulVolContext?: any;
+export type GetComprehensivePnlContext = {
+    core: {
+        currentBlock: number;
+        currentTimestamp: number;
+        collateralPriceUsd: number;
+        contractsVersion: ContractsVersion;
+    };
+    borrowingV1?: GetBorrowingFeeContext;
+    borrowingV2?: GetPairBorrowingFeeV2Context;
+    funding?: GetPairFundingFeeContext;
+    trading: TradingFeesSubContext;
+    tradeData?: {
+        tradeFeesData: TradeFeesData;
+        liquidationParams: LiquidationParams;
+        initialAccFees?: BorrowingFee.InitialAccFees;
+    };
 };

package/lib/trade/types.d.ts

@@ -619,5 +619,15 @@ export declare enum PairIndex {
     SYRUPUSD = 373,
     SIGNUSD = 374,
     ZORAUSD = 375,
-    COINUSD = 376
+    COINUSD = 376,
+    HOODUSD = 377,
+    MSTRUSD = 378,
+    NFLXUSD = 379,
+    LAUNCHCOINUSD = 380,
+    NXPCUSD = 381,
+    SOPHUSD = 382,
+    LPTUSD = 383,
+    BVIVUSD = 384,
+    EVIVUSD = 385,
+    CRCLUSD = 386
 }

package/lib/trade/types.js

@@ -406,4 +406,14 @@ var PairIndex;
     PairIndex[PairIndex["SIGNUSD"] = 374] = "SIGNUSD";
     PairIndex[PairIndex["ZORAUSD"] = 375] = "ZORAUSD";
     PairIndex[PairIndex["COINUSD"] = 376] = "COINUSD";
+    PairIndex[PairIndex["HOODUSD"] = 377] = "HOODUSD";
+    PairIndex[PairIndex["MSTRUSD"] = 378] = "MSTRUSD";
+    PairIndex[PairIndex["NFLXUSD"] = 379] = "NFLXUSD";
+    PairIndex[PairIndex["LAUNCHCOINUSD"] = 380] = "LAUNCHCOINUSD";
+    PairIndex[PairIndex["NXPCUSD"] = 381] = "NXPCUSD";
+    PairIndex[PairIndex["SOPHUSD"] = 382] = "SOPHUSD";
+    PairIndex[PairIndex["LPTUSD"] = 383] = "LPTUSD";
+    PairIndex[PairIndex["BVIVUSD"] = 384] = "BVIVUSD";
+    PairIndex[PairIndex["EVIVUSD"] = 385] = "EVIVUSD";
+    PairIndex[PairIndex["CRCLUSD"] = 386] = "CRCLUSD";
 })(PairIndex = exports.PairIndex || (exports.PairIndex = {}));

package/package.json

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

package/lib/contracts/fetch/fees/borrowingFeesV2.d.ts

@@ -1,75 +0,0 @@
-import type { GNSMultiCollatDiamond } from "../../types/generated";
-import { BorrowingFeeV2 } from "../../../trade/fees/borrowingV2";
-/**
- * @dev Fetches borrowing fee parameters v2 for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to array of borrowing fee parameters
- */
-export declare const fetchBorrowingFeeParamsV2: (contract: GNSMultiCollatDiamond, collateralIndices: number[], pairIndices: number[]) => Promise<BorrowingFeeV2.BorrowingFeeParams[]>;
-/**
- * @dev Fetches pair borrowing fee data v2 for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to array of pair borrowing fee data
- */
-export declare const fetchPairBorrowingFeeDataV2: (contract: GNSMultiCollatDiamond, collateralIndices: number[], pairIndices: number[]) => Promise<BorrowingFeeV2.PairBorrowingFeeData[]>;
-/**
- * @dev Fetches borrowing fees in collateral tokens for a specific trade
- * @param contract GNSMultiCollatDiamond contract instance
- * @param trader Address of the trader
- * @param index Trade index
- * @param currentPairPrice Current price of the trading pair (1e6 precision)
- * @returns Promise resolving to borrowing fees in collateral tokens
- */
-export declare const fetchTradeBorrowingFeesCollateralV2: (contract: GNSMultiCollatDiamond, trader: string, index: number, currentPairPrice: number) => Promise<number>;
-/**
- * @dev Fetches pending accumulated borrowing fees for a specific pair
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndex Index of the trading pair
- * @param currentPairPrice Current price of the trading pair (1e6 precision)
- * @returns Promise resolving to pending accumulated borrowing fee
- */
-export declare const fetchPairPendingAccBorrowingFeesV2: (contract: GNSMultiCollatDiamond, collateralIndex: number, pairIndex: number, currentPairPrice: number) => Promise<number>;
-/**
- * @dev Convenience function to fetch all borrowing v2 data for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to complete borrowing v2 data set
- */
-export declare const fetchAllBorrowingV2Data: (contract: GNSMultiCollatDiamond, collateralIndex: number, pairIndices: number[]) => Promise<{
-    params: BorrowingFeeV2.BorrowingFeeParams[];
-    data: BorrowingFeeV2.PairBorrowingFeeData[];
-    context: BorrowingFeeV2.GetBorrowingFeeV2Context;
-}>;
-/**
- * @dev Creates a complete borrowing v2 context from contract data
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndices Array of pair indices
- * @param currentTimestamp Optional current timestamp for calculations
- * @returns Promise resolving to complete borrowing v2 context
- */
-export declare const createBorrowingV2ContextFromContract: (contract: GNSMultiCollatDiamond, collateralIndex: number, pairIndices: number[], currentTimestamp?: number) => Promise<BorrowingFeeV2.GetBorrowingFeeV2Context>;
-/**
- * @dev Helper function to create context from already fetched arrays
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @param params Array of borrowing fee parameters
- * @param data Array of pair borrowing fee data
- * @param currentTimestamp Optional current timestamp
- * @returns Complete borrowing v2 context
- */
-export declare const createBorrowingV2ContextFromArrays: (collateralIndices: number[], pairIndices: number[], params: BorrowingFeeV2.BorrowingFeeParams[], data: BorrowingFeeV2.PairBorrowingFeeData[], currentTimestamp?: number) => BorrowingFeeV2.GetBorrowingFeeV2Context;
-/**
- * @dev Fetches borrowing v2 data for multiple collateral/pair combinations
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices (must match collateralIndices length)
- * @returns Promise resolving to complete borrowing v2 context
- */
-export declare const fetchBorrowingV2DataForPairs: (contract: GNSMultiCollatDiamond, collateralIndices: number[], pairIndices: number[]) => Promise<BorrowingFeeV2.GetBorrowingFeeV2Context>;

package/lib/contracts/fetch/fees/borrowingFeesV2.js

@@ -1,193 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = void 0;
-const converter_1 = require("../../../trade/fees/borrowingV2/converter");
-/**
- * @dev Fetches borrowing fee parameters v2 for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to array of borrowing fee parameters
- */
-const fetchBorrowingFeeParamsV2 = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
-    if (collateralIndices.length !== pairIndices.length) {
-        throw new Error("Collateral indices and pair indices arrays must have the same length");
-    }
-    try {
-        const contractParams = yield contract.getPairBorrowingFeeParams(collateralIndices, pairIndices);
-        return (0, converter_1.convertBorrowingFeeParamsArray)(contractParams);
-    }
-    catch (error) {
-        console.error("Error fetching borrowing fee params v2:", error);
-        throw error;
-    }
-});
-exports.fetchBorrowingFeeParamsV2 = fetchBorrowingFeeParamsV2;
-/**
- * @dev Fetches pair borrowing fee data v2 for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to array of pair borrowing fee data
- */
-const fetchPairBorrowingFeeDataV2 = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
-    if (collateralIndices.length !== pairIndices.length) {
-        throw new Error("Collateral indices and pair indices arrays must have the same length");
-    }
-    try {
-        const contractData = yield contract.getPairBorrowingFeeData(collateralIndices, pairIndices);
-        return (0, converter_1.convertPairBorrowingFeeDataArray)(contractData);
-    }
-    catch (error) {
-        console.error("Error fetching pair borrowing fee data v2:", error);
-        throw error;
-    }
-});
-exports.fetchPairBorrowingFeeDataV2 = fetchPairBorrowingFeeDataV2;
-/**
- * @dev Fetches borrowing fees in collateral tokens for a specific trade
- * @param contract GNSMultiCollatDiamond contract instance
- * @param trader Address of the trader
- * @param index Trade index
- * @param currentPairPrice Current price of the trading pair (1e6 precision)
- * @returns Promise resolving to borrowing fees in collateral tokens
- */
-const fetchTradeBorrowingFeesCollateralV2 = (contract, trader, index, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const feesCollateral = yield contract.getTradeBorrowingFeesCollateral(trader, index, currentPairPrice);
-        // Convert BigNumber to normalized float
-        // Note: Collateral precision varies by chain, but contract returns proper precision
-        return parseFloat(feesCollateral.toString());
-    }
-    catch (error) {
-        console.error("Error fetching trade borrowing fees collateral v2:", error);
-        throw error;
-    }
-});
-exports.fetchTradeBorrowingFeesCollateralV2 = fetchTradeBorrowingFeesCollateralV2;
-/**
- * @dev Fetches pending accumulated borrowing fees for a specific pair
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndex Index of the trading pair
- * @param currentPairPrice Current price of the trading pair (1e6 precision)
- * @returns Promise resolving to pending accumulated borrowing fee
- */
-const fetchPairPendingAccBorrowingFeesV2 = (contract, collateralIndex, pairIndex, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const accBorrowingFeeP = yield contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
-        // Convert BigNumber to normalized float
-        return parseFloat(accBorrowingFeeP.toString()) / 1e20;
-    }
-    catch (error) {
-        console.error("Error fetching pair pending acc borrowing fees v2:", error);
-        throw error;
-    }
-});
-exports.fetchPairPendingAccBorrowingFeesV2 = fetchPairPendingAccBorrowingFeesV2;
-/**
- * @dev Convenience function to fetch all borrowing v2 data for specific pairs
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndices Array of pair indices
- * @returns Promise resolving to complete borrowing v2 data set
- */
-const fetchAllBorrowingV2Data = (contract, collateralIndex, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
-    const collateralIndices = new Array(pairIndices.length).fill(collateralIndex);
-    try {
-        // Fetch both parameters and data in parallel
-        const [params, data] = yield Promise.all([
-            (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
-            (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
-        ]);
-        // Create context from fetched data
-        const context = (0, exports.createBorrowingV2ContextFromArrays)(collateralIndices, pairIndices, params, data);
-        return { params, data, context };
-    }
-    catch (error) {
-        console.error("Error fetching all borrowing v2 data:", error);
-        throw error;
-    }
-});
-exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
-/**
- * @dev Creates a complete borrowing v2 context from contract data
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndex Index of the collateral
- * @param pairIndices Array of pair indices
- * @param currentTimestamp Optional current timestamp for calculations
- * @returns Promise resolving to complete borrowing v2 context
- */
-const createBorrowingV2ContextFromContract = (contract, collateralIndex, pairIndices, currentTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
-    const { context } = yield (0, exports.fetchAllBorrowingV2Data)(contract, collateralIndex, pairIndices);
-    return Object.assign(Object.assign({}, context), { currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000) });
-});
-exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContract;
-/**
- * @dev Helper function to create context from already fetched arrays
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices
- * @param params Array of borrowing fee parameters
- * @param data Array of pair borrowing fee data
- * @param currentTimestamp Optional current timestamp
- * @returns Complete borrowing v2 context
- */
-const createBorrowingV2ContextFromArrays = (collateralIndices, pairIndices, params, data, currentTimestamp) => {
-    const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
-        borrowingParams: {},
-        borrowingData: {},
-    };
-    // Build nested objects indexed by collateralIndex and pairIndex
-    for (let i = 0; i < collateralIndices.length; i++) {
-        const collateralIndex = collateralIndices[i];
-        const pairIndex = pairIndices[i];
-        // Initialize collateral index objects if they don't exist
-        if (!context.borrowingParams[collateralIndex]) {
-            context.borrowingParams[collateralIndex] = {};
-        }
-        if (!context.borrowingData[collateralIndex]) {
-            context.borrowingData[collateralIndex] = {};
-        }
-        // Store data
-        context.borrowingParams[collateralIndex][pairIndex] = params[i];
-        context.borrowingData[collateralIndex][pairIndex] = data[i];
-    }
-    return context;
-};
-exports.createBorrowingV2ContextFromArrays = createBorrowingV2ContextFromArrays;
-/**
- * @dev Fetches borrowing v2 data for multiple collateral/pair combinations
- * @param contract GNSMultiCollatDiamond contract instance
- * @param collateralIndices Array of collateral indices
- * @param pairIndices Array of pair indices (must match collateralIndices length)
- * @returns Promise resolving to complete borrowing v2 context
- */
-const fetchBorrowingV2DataForPairs = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
-    if (collateralIndices.length !== pairIndices.length) {
-        throw new Error("Collateral indices and pair indices arrays must have the same length");
-    }
-    try {
-        // Fetch both parameters and data in parallel
-        const [params, data] = yield Promise.all([
-            (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
-            (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
-        ]);
-        // Create and return context
-        return (0, exports.createBorrowingV2ContextFromArrays)(collateralIndices, pairIndices, params, data);
-    }
-    catch (error) {
-        console.error("Error fetching borrowing v2 data for pairs:", error);
-        throw error;
-    }
-});
-exports.fetchBorrowingV2DataForPairs = fetchBorrowingV2DataForPairs;