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

package/lib/trade/fees/fundingFees/fetcher.js

@@ -0,0 +1,150 @@
+"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.collateralToContractFormat = exports.priceToContractFormat = exports.fetchPairPendingAccFundingFeesBatch = exports.fetchTradeFeesDataBatch = exports.fetchTradeFeesData = exports.fetchTradeFundingFeesCollateral = exports.fetchPairPendingAccFundingFees = void 0;
+/**
+ * @dev Fetches pending accumulated funding fees for a specific pair
+ * @param contract GNSMultiCollatDiamond contract instance
+ * @param collateralIndex Collateral index
+ * @param pairIndex Pair index
+ * @param currentPairPrice Current pair price (1e10)
+ * @returns Promise resolving to accumulated funding fees and current rate
+ */
+const fetchPairPendingAccFundingFees = (contract, collateralIndex, pairIndex, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const result = yield contract.getPairPendingAccFundingFees(collateralIndex, pairIndex, currentPairPrice);
+        return {
+            accFundingFeeLongP: Number(result.accFundingFeeLongP) / 1e20,
+            accFundingFeeShortP: Number(result.accFundingFeeShortP) / 1e20,
+            currentFundingRatePerSecondP: Number(result.currentFundingRatePerSecondP) / 1e18, // FUNDING_RATE_PER_SECOND_P precision
+        };
+    }
+    catch (error) {
+        console.error("Error fetching pair pending acc funding fees:", error);
+        throw error;
+    }
+});
+exports.fetchPairPendingAccFundingFees = fetchPairPendingAccFundingFees;
+/**
+ * @dev Fetches funding fees for a specific trade in collateral tokens
+ * @param contract GNSMultiCollatDiamond contract instance
+ * @param trader Trader address
+ * @param index Trade index
+ * @param currentPairPrice Current pair price (1e10)
+ * @returns Promise resolving to funding fee in collateral tokens
+ */
+const fetchTradeFundingFeesCollateral = (contract, trader, index, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const fundingFeeCollateral = yield contract.getTradeFundingFeesCollateral(trader, index, currentPairPrice);
+        // Convert from BigNumber to number (collateral precision already applied)
+        return Number(fundingFeeCollateral);
+    }
+    catch (error) {
+        console.error("Error fetching trade funding fees:", error);
+        throw error;
+    }
+});
+exports.fetchTradeFundingFeesCollateral = fetchTradeFundingFeesCollateral;
+/**
+ * @dev Fetches trade fees data for a specific trade
+ * @param contract GNSMultiCollatDiamond contract instance
+ * @param trader Trader address
+ * @param index Trade index
+ * @returns Promise resolving to trade fees data
+ */
+const fetchTradeFeesData = (contract, trader, index) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        const feesData = yield contract.getTradeFeesData(trader, index);
+        return {
+            accPerOiLong: Number(feesData.initialAccFundingFeeP) / 1e20,
+            accPerOiShort: Number(feesData.initialAccFundingFeeP) / 1e20,
+            openBlock: 0, // Not available in this struct
+        };
+    }
+    catch (error) {
+        console.error("Error fetching trade fees data:", error);
+        throw error;
+    }
+});
+exports.fetchTradeFeesData = fetchTradeFeesData;
+/**
+ * @dev Fetches trade fees data for multiple trades
+ * @param contract GNSMultiCollatDiamond contract instance
+ * @param traders Array of trader addresses
+ * @param indices Array of trade indices
+ * @returns Promise resolving to array of trade fees data
+ */
+const fetchTradeFeesDataBatch = (contract, traders, indices) => __awaiter(void 0, void 0, void 0, function* () {
+    if (traders.length !== indices.length) {
+        throw new Error("Traders and indices arrays must have the same length");
+    }
+    try {
+        const feesDatas = yield contract.getTradeFeesDataArray(traders, indices);
+        return feesDatas.map(feesData => ({
+            accPerOiLong: Number(feesData.initialAccFundingFeeP) / 1e20,
+            accPerOiShort: Number(feesData.initialAccFundingFeeP) / 1e20,
+            openBlock: 0,
+        }));
+    }
+    catch (error) {
+        console.error("Error fetching trade fees data batch:", error);
+        throw error;
+    }
+});
+exports.fetchTradeFeesDataBatch = fetchTradeFeesDataBatch;
+/**
+ * @dev Fetches pending accumulated funding fees for multiple pairs
+ * @param contract GNSMultiCollatDiamond contract instance
+ * @param collateralIndices Array of collateral indices
+ * @param pairIndices Array of pair indices
+ * @param currentPairPrices Array of current pair prices (1e10)
+ * @returns Promise resolving to array of accumulated funding fees
+ */
+const fetchPairPendingAccFundingFeesBatch = (contract, collateralIndices, pairIndices, currentPairPrices) => __awaiter(void 0, void 0, void 0, function* () {
+    if (collateralIndices.length !== pairIndices.length ||
+        pairIndices.length !== currentPairPrices.length) {
+        throw new Error("All input arrays must have the same length");
+    }
+    try {
+        // Fetch all in parallel
+        const promises = collateralIndices.map((collateralIndex, i) => contract.getPairPendingAccFundingFees(collateralIndex, pairIndices[i], currentPairPrices[i]));
+        const results = yield Promise.all(promises);
+        return results.map(result => ({
+            accFundingFeeLongP: Number(result.accFundingFeeLongP) / 1e20,
+            accFundingFeeShortP: Number(result.accFundingFeeShortP) / 1e20,
+            currentFundingRatePerSecondP: Number(result.currentFundingRatePerSecondP) / 1e18,
+        }));
+    }
+    catch (error) {
+        console.error("Error fetching pair pending acc funding fees batch:", error);
+        throw error;
+    }
+});
+exports.fetchPairPendingAccFundingFeesBatch = fetchPairPendingAccFundingFeesBatch;
+/**
+ * @dev Helper to convert price from number to contract format
+ * @param price Price as number
+ * @returns Price in contract format (1e10)
+ */
+const priceToContractFormat = (price) => {
+    return BigInt(Math.round(price * 1e10));
+};
+exports.priceToContractFormat = priceToContractFormat;
+/**
+ * @dev Helper to convert collateral amount to contract format
+ * @param amount Amount as number
+ * @param decimals Collateral decimals (6 for USDC, 18 for others)
+ * @returns Amount in contract format
+ */
+const collateralToContractFormat = (amount, decimals) => {
+    return BigInt(Math.round(amount * Math.pow(10, decimals)));
+};
+exports.collateralToContractFormat = collateralToContractFormat;

package/lib/trade/fees/fundingFees/index.d.ts

@@ -133,3 +133,4 @@ export declare const getTradeFundingFeesCollateralSimple: (trade: {
 }, initialAccFundingFeeP: number, currentAccFundingFeeP: number) => number;
 export * as FundingFees from "./types";
 export type { FundingFeeParams, PairFundingFeeData, PairGlobalParams, TradeInitialAccFundingFees, PairOiAfterV10, FundingRateCalculation, GetFundingFeeContext, TradeFundingFeeResult, PairPendingAccFundingFeesResult, PairAccumulatedFees, TradeInitialAccFees, } from "./types";
+export * from "./fetcher";

package/lib/trade/fees/fundingFees/index.js

@@ -26,6 +26,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+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.FundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = void 0;
 // Constants from contract
@@ -320,3 +323,4 @@ const getTradeFundingFeesCollateralSimple = (trade, tradeInfo, initialAccFunding
 exports.getTradeFundingFeesCollateralSimple = getTradeFundingFeesCollateralSimple;
 // Export namespace for types
 exports.FundingFees = __importStar(require("./types"));
+__exportStar(require("./fetcher"), exports);

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

@@ -1,8 +1,9 @@
 export * from "./borrowing";
 export * from "./tiers";
 export * from "./trading";
+export { convertTradeFeesData, convertTradeFeesDataArray, convertUiRealizedPnlData, convertUiRealizedPnlDataArray, encodeTradeFeesData, encodeUiRealizedPnlData, } from "./converter";
 export { BorrowingFeeV2, borrowingFeeV2Utils, getPairPendingAccBorrowingFees as getPairPendingAccBorrowingFeesV2, getTradeBorrowingFeesCollateral as getTradeBorrowingFeesCollateralV2, getBorrowingFee as getBorrowingFeeV2, getPairBorrowingFees as getPairBorrowingFeesV2, MAX_BORROWING_RATE_PER_SECOND as MAX_BORROWING_RATE_PER_SECOND_V2, BORROWING_V2_PRECISION, } from "./borrowingV2";
 export { convertBorrowingFeeParams as convertBorrowingFeeParamsV2, convertBorrowingFeeParamsArray as convertBorrowingFeeParamsArrayV2, convertPairBorrowingFeeData as convertPairBorrowingFeeDataV2, convertPairBorrowingFeeDataArray as convertPairBorrowingFeeDataArrayV2, convertTradeInitialAccFees as convertTradeInitialAccFeesV2, convertTradeInitialAccFeesArray as convertTradeInitialAccFeesArrayV2, createBorrowingV2Context, isValidBorrowingRate as isValidBorrowingRateV2, borrowingRateToAPR as borrowingRateToAPRV2, aprToBorrowingRate as aprToBorrowingRateV2, } from "./borrowingV2/converter";
-export { fetchBorrowingFeeParamsV2, fetchPairBorrowingFeeDataV2, fetchTradeBorrowingFeesCollateralV2, fetchPairPendingAccBorrowingFeesV2, fetchAllBorrowingV2Data, createBorrowingV2ContextFromContract, createBorrowingV2ContextFromArrays, fetchBorrowingV2DataForPairs, } from "../../contracts/fetch/fees/borrowingFeesV2";
+export { fetchBorrowingFeeParamsV2, fetchPairBorrowingFeeDataV2, fetchTradeBorrowingFeesCollateralV2, fetchPairPendingAccBorrowingFeesV2, fetchAllBorrowingV2Data, createBorrowingV2ContextFromContract, createBorrowingV2ContextFromArrays, fetchBorrowingV2DataForPairs, } from "./borrowingV2/fetcher";
 export { FundingFees, getCurrentFundingVelocityPerYear, getSecondsToReachZeroRate, getAvgFundingRatePerSecondP, getLongShortAprMultiplier, getPairPendingAccFundingFees, getTradeFundingFeesCollateral, getTradeFundingFeesCollateralSimple, getTradeFundingFees, } from "./fundingFees";
 export { convertFundingFeeParams, convertFundingFeeParamsArray, convertPairFundingFeeData, convertPairFundingFeeDataArray, convertPairGlobalParams, convertPairGlobalParamsArray, convertTradeInitialAccFundingFees, createFundingFeeContext, isValidFundingRate, fundingRateToAPR, aprToFundingRate, calculateVelocityFromSkew, FUNDING_FEES_PRECISION, } from "./fundingFees/converter";

package/lib/trade/fees/index.js

@@ -14,10 +14,19 @@ 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.FUNDING_FEES_PRECISION = exports.calculateVelocityFromSkew = exports.aprToFundingRate = exports.fundingRateToAPR = exports.isValidFundingRate = exports.createFundingFeeContext = exports.convertTradeInitialAccFundingFees = exports.convertPairGlobalParamsArray = exports.convertPairGlobalParams = exports.convertPairFundingFeeDataArray = exports.convertPairFundingFeeData = exports.convertFundingFeeParamsArray = exports.convertFundingFeeParams = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = exports.FundingFees = exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = exports.aprToBorrowingRateV2 = exports.borrowingRateToAPRV2 = exports.isValidBorrowingRateV2 = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArrayV2 = exports.convertTradeInitialAccFeesV2 = exports.convertPairBorrowingFeeDataArrayV2 = exports.convertPairBorrowingFeeDataV2 = exports.convertBorrowingFeeParamsArrayV2 = exports.convertBorrowingFeeParamsV2 = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND_V2 = exports.getPairBorrowingFeesV2 = exports.getBorrowingFeeV2 = exports.getTradeBorrowingFeesCollateralV2 = exports.getPairPendingAccBorrowingFeesV2 = exports.borrowingFeeV2Utils = exports.BorrowingFeeV2 = void 0;
+exports.isValidFundingRate = exports.createFundingFeeContext = exports.convertTradeInitialAccFundingFees = exports.convertPairGlobalParamsArray = exports.convertPairGlobalParams = exports.convertPairFundingFeeDataArray = exports.convertPairFundingFeeData = exports.convertFundingFeeParamsArray = exports.convertFundingFeeParams = exports.getTradeFundingFees = exports.getTradeFundingFeesCollateralSimple = exports.getTradeFundingFeesCollateral = exports.getPairPendingAccFundingFees = exports.getLongShortAprMultiplier = exports.getAvgFundingRatePerSecondP = exports.getSecondsToReachZeroRate = exports.getCurrentFundingVelocityPerYear = exports.FundingFees = exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = exports.aprToBorrowingRateV2 = exports.borrowingRateToAPRV2 = exports.isValidBorrowingRateV2 = exports.createBorrowingV2Context = exports.convertTradeInitialAccFeesArrayV2 = exports.convertTradeInitialAccFeesV2 = exports.convertPairBorrowingFeeDataArrayV2 = exports.convertPairBorrowingFeeDataV2 = exports.convertBorrowingFeeParamsArrayV2 = exports.convertBorrowingFeeParamsV2 = exports.BORROWING_V2_PRECISION = exports.MAX_BORROWING_RATE_PER_SECOND_V2 = exports.getPairBorrowingFeesV2 = exports.getBorrowingFeeV2 = exports.getTradeBorrowingFeesCollateralV2 = exports.getPairPendingAccBorrowingFeesV2 = exports.borrowingFeeV2Utils = exports.BorrowingFeeV2 = exports.encodeUiRealizedPnlData = exports.encodeTradeFeesData = exports.convertUiRealizedPnlDataArray = exports.convertUiRealizedPnlData = exports.convertTradeFeesDataArray = exports.convertTradeFeesData = void 0;
+exports.FUNDING_FEES_PRECISION = exports.calculateVelocityFromSkew = exports.aprToFundingRate = exports.fundingRateToAPR = void 0;
 __exportStar(require("./borrowing"), exports);
 __exportStar(require("./tiers"), exports);
 __exportStar(require("./trading"), exports);
+// TradeFeesData and UiRealizedPnlData converters
+var converter_1 = require("./converter");
+Object.defineProperty(exports, "convertTradeFeesData", { enumerable: true, get: function () { return converter_1.convertTradeFeesData; } });
+Object.defineProperty(exports, "convertTradeFeesDataArray", { enumerable: true, get: function () { return converter_1.convertTradeFeesDataArray; } });
+Object.defineProperty(exports, "convertUiRealizedPnlData", { enumerable: true, get: function () { return converter_1.convertUiRealizedPnlData; } });
+Object.defineProperty(exports, "convertUiRealizedPnlDataArray", { enumerable: true, get: function () { return converter_1.convertUiRealizedPnlDataArray; } });
+Object.defineProperty(exports, "encodeTradeFeesData", { enumerable: true, get: function () { return converter_1.encodeTradeFeesData; } });
+Object.defineProperty(exports, "encodeUiRealizedPnlData", { enumerable: true, get: function () { return converter_1.encodeUiRealizedPnlData; } });
 // Borrowing V2 exports with explicit naming to avoid conflicts
 var borrowingV2_1 = require("./borrowingV2");
 Object.defineProperty(exports, "BorrowingFeeV2", { enumerable: true, get: function () { return borrowingV2_1.BorrowingFeeV2; } });
@@ -28,27 +37,27 @@ Object.defineProperty(exports, "getBorrowingFeeV2", { enumerable: true, get: fun
 Object.defineProperty(exports, "getPairBorrowingFeesV2", { enumerable: true, get: function () { return borrowingV2_1.getPairBorrowingFees; } });
 Object.defineProperty(exports, "MAX_BORROWING_RATE_PER_SECOND_V2", { enumerable: true, get: function () { return borrowingV2_1.MAX_BORROWING_RATE_PER_SECOND; } });
 Object.defineProperty(exports, "BORROWING_V2_PRECISION", { enumerable: true, get: function () { return borrowingV2_1.BORROWING_V2_PRECISION; } });
-var converter_1 = require("./borrowingV2/converter");
-Object.defineProperty(exports, "convertBorrowingFeeParamsV2", { enumerable: true, get: function () { return converter_1.convertBorrowingFeeParams; } });
-Object.defineProperty(exports, "convertBorrowingFeeParamsArrayV2", { enumerable: true, get: function () { return converter_1.convertBorrowingFeeParamsArray; } });
-Object.defineProperty(exports, "convertPairBorrowingFeeDataV2", { enumerable: true, get: function () { return converter_1.convertPairBorrowingFeeData; } });
-Object.defineProperty(exports, "convertPairBorrowingFeeDataArrayV2", { enumerable: true, get: function () { return converter_1.convertPairBorrowingFeeDataArray; } });
-Object.defineProperty(exports, "convertTradeInitialAccFeesV2", { enumerable: true, get: function () { return converter_1.convertTradeInitialAccFees; } });
-Object.defineProperty(exports, "convertTradeInitialAccFeesArrayV2", { enumerable: true, get: function () { return converter_1.convertTradeInitialAccFeesArray; } });
-Object.defineProperty(exports, "createBorrowingV2Context", { enumerable: true, get: function () { return converter_1.createBorrowingV2Context; } });
-Object.defineProperty(exports, "isValidBorrowingRateV2", { enumerable: true, get: function () { return converter_1.isValidBorrowingRate; } });
-Object.defineProperty(exports, "borrowingRateToAPRV2", { enumerable: true, get: function () { return converter_1.borrowingRateToAPR; } });
-Object.defineProperty(exports, "aprToBorrowingRateV2", { enumerable: true, get: function () { return converter_1.aprToBorrowingRate; } });
+var converter_2 = require("./borrowingV2/converter");
+Object.defineProperty(exports, "convertBorrowingFeeParamsV2", { enumerable: true, get: function () { return converter_2.convertBorrowingFeeParams; } });
+Object.defineProperty(exports, "convertBorrowingFeeParamsArrayV2", { enumerable: true, get: function () { return converter_2.convertBorrowingFeeParamsArray; } });
+Object.defineProperty(exports, "convertPairBorrowingFeeDataV2", { enumerable: true, get: function () { return converter_2.convertPairBorrowingFeeData; } });
+Object.defineProperty(exports, "convertPairBorrowingFeeDataArrayV2", { enumerable: true, get: function () { return converter_2.convertPairBorrowingFeeDataArray; } });
+Object.defineProperty(exports, "convertTradeInitialAccFeesV2", { enumerable: true, get: function () { return converter_2.convertTradeInitialAccFees; } });
+Object.defineProperty(exports, "convertTradeInitialAccFeesArrayV2", { enumerable: true, get: function () { return converter_2.convertTradeInitialAccFeesArray; } });
+Object.defineProperty(exports, "createBorrowingV2Context", { enumerable: true, get: function () { return converter_2.createBorrowingV2Context; } });
+Object.defineProperty(exports, "isValidBorrowingRateV2", { enumerable: true, get: function () { return converter_2.isValidBorrowingRate; } });
+Object.defineProperty(exports, "borrowingRateToAPRV2", { enumerable: true, get: function () { return converter_2.borrowingRateToAPR; } });
+Object.defineProperty(exports, "aprToBorrowingRateV2", { enumerable: true, get: function () { return converter_2.aprToBorrowingRate; } });
 // Contract utilities re-exported for convenience
-var borrowingFeesV2_1 = require("../../contracts/fetch/fees/borrowingFeesV2");
-Object.defineProperty(exports, "fetchBorrowingFeeParamsV2", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchBorrowingFeeParamsV2; } });
-Object.defineProperty(exports, "fetchPairBorrowingFeeDataV2", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchPairBorrowingFeeDataV2; } });
-Object.defineProperty(exports, "fetchTradeBorrowingFeesCollateralV2", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchTradeBorrowingFeesCollateralV2; } });
-Object.defineProperty(exports, "fetchPairPendingAccBorrowingFeesV2", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchPairPendingAccBorrowingFeesV2; } });
-Object.defineProperty(exports, "fetchAllBorrowingV2Data", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchAllBorrowingV2Data; } });
-Object.defineProperty(exports, "createBorrowingV2ContextFromContract", { enumerable: true, get: function () { return borrowingFeesV2_1.createBorrowingV2ContextFromContract; } });
-Object.defineProperty(exports, "createBorrowingV2ContextFromArrays", { enumerable: true, get: function () { return borrowingFeesV2_1.createBorrowingV2ContextFromArrays; } });
-Object.defineProperty(exports, "fetchBorrowingV2DataForPairs", { enumerable: true, get: function () { return borrowingFeesV2_1.fetchBorrowingV2DataForPairs; } });
+var fetcher_1 = require("./borrowingV2/fetcher");
+Object.defineProperty(exports, "fetchBorrowingFeeParamsV2", { enumerable: true, get: function () { return fetcher_1.fetchBorrowingFeeParamsV2; } });
+Object.defineProperty(exports, "fetchPairBorrowingFeeDataV2", { enumerable: true, get: function () { return fetcher_1.fetchPairBorrowingFeeDataV2; } });
+Object.defineProperty(exports, "fetchTradeBorrowingFeesCollateralV2", { enumerable: true, get: function () { return fetcher_1.fetchTradeBorrowingFeesCollateralV2; } });
+Object.defineProperty(exports, "fetchPairPendingAccBorrowingFeesV2", { enumerable: true, get: function () { return fetcher_1.fetchPairPendingAccBorrowingFeesV2; } });
+Object.defineProperty(exports, "fetchAllBorrowingV2Data", { enumerable: true, get: function () { return fetcher_1.fetchAllBorrowingV2Data; } });
+Object.defineProperty(exports, "createBorrowingV2ContextFromContract", { enumerable: true, get: function () { return fetcher_1.createBorrowingV2ContextFromContract; } });
+Object.defineProperty(exports, "createBorrowingV2ContextFromArrays", { enumerable: true, get: function () { return fetcher_1.createBorrowingV2ContextFromArrays; } });
+Object.defineProperty(exports, "fetchBorrowingV2DataForPairs", { enumerable: true, get: function () { return fetcher_1.fetchBorrowingV2DataForPairs; } });
 // Funding Fees exports
 var fundingFees_1 = require("./fundingFees");
 Object.defineProperty(exports, "FundingFees", { enumerable: true, get: function () { return fundingFees_1.FundingFees; } });
@@ -60,17 +69,17 @@ Object.defineProperty(exports, "getPairPendingAccFundingFees", { enumerable: tru
 Object.defineProperty(exports, "getTradeFundingFeesCollateral", { enumerable: true, get: function () { return fundingFees_1.getTradeFundingFeesCollateral; } });
 Object.defineProperty(exports, "getTradeFundingFeesCollateralSimple", { enumerable: true, get: function () { return fundingFees_1.getTradeFundingFeesCollateralSimple; } });
 Object.defineProperty(exports, "getTradeFundingFees", { enumerable: true, get: function () { return fundingFees_1.getTradeFundingFees; } });
-var converter_2 = require("./fundingFees/converter");
-Object.defineProperty(exports, "convertFundingFeeParams", { enumerable: true, get: function () { return converter_2.convertFundingFeeParams; } });
-Object.defineProperty(exports, "convertFundingFeeParamsArray", { enumerable: true, get: function () { return converter_2.convertFundingFeeParamsArray; } });
-Object.defineProperty(exports, "convertPairFundingFeeData", { enumerable: true, get: function () { return converter_2.convertPairFundingFeeData; } });
-Object.defineProperty(exports, "convertPairFundingFeeDataArray", { enumerable: true, get: function () { return converter_2.convertPairFundingFeeDataArray; } });
-Object.defineProperty(exports, "convertPairGlobalParams", { enumerable: true, get: function () { return converter_2.convertPairGlobalParams; } });
-Object.defineProperty(exports, "convertPairGlobalParamsArray", { enumerable: true, get: function () { return converter_2.convertPairGlobalParamsArray; } });
-Object.defineProperty(exports, "convertTradeInitialAccFundingFees", { enumerable: true, get: function () { return converter_2.convertTradeInitialAccFundingFees; } });
-Object.defineProperty(exports, "createFundingFeeContext", { enumerable: true, get: function () { return converter_2.createFundingFeeContext; } });
-Object.defineProperty(exports, "isValidFundingRate", { enumerable: true, get: function () { return converter_2.isValidFundingRate; } });
-Object.defineProperty(exports, "fundingRateToAPR", { enumerable: true, get: function () { return converter_2.fundingRateToAPR; } });
-Object.defineProperty(exports, "aprToFundingRate", { enumerable: true, get: function () { return converter_2.aprToFundingRate; } });
-Object.defineProperty(exports, "calculateVelocityFromSkew", { enumerable: true, get: function () { return converter_2.calculateVelocityFromSkew; } });
-Object.defineProperty(exports, "FUNDING_FEES_PRECISION", { enumerable: true, get: function () { return converter_2.FUNDING_FEES_PRECISION; } });
+var converter_3 = require("./fundingFees/converter");
+Object.defineProperty(exports, "convertFundingFeeParams", { enumerable: true, get: function () { return converter_3.convertFundingFeeParams; } });
+Object.defineProperty(exports, "convertFundingFeeParamsArray", { enumerable: true, get: function () { return converter_3.convertFundingFeeParamsArray; } });
+Object.defineProperty(exports, "convertPairFundingFeeData", { enumerable: true, get: function () { return converter_3.convertPairFundingFeeData; } });
+Object.defineProperty(exports, "convertPairFundingFeeDataArray", { enumerable: true, get: function () { return converter_3.convertPairFundingFeeDataArray; } });
+Object.defineProperty(exports, "convertPairGlobalParams", { enumerable: true, get: function () { return converter_3.convertPairGlobalParams; } });
+Object.defineProperty(exports, "convertPairGlobalParamsArray", { enumerable: true, get: function () { return converter_3.convertPairGlobalParamsArray; } });
+Object.defineProperty(exports, "convertTradeInitialAccFundingFees", { enumerable: true, get: function () { return converter_3.convertTradeInitialAccFundingFees; } });
+Object.defineProperty(exports, "createFundingFeeContext", { enumerable: true, get: function () { return converter_3.createFundingFeeContext; } });
+Object.defineProperty(exports, "isValidFundingRate", { enumerable: true, get: function () { return converter_3.isValidFundingRate; } });
+Object.defineProperty(exports, "fundingRateToAPR", { enumerable: true, get: function () { return converter_3.fundingRateToAPR; } });
+Object.defineProperty(exports, "aprToFundingRate", { enumerable: true, get: function () { return converter_3.aprToFundingRate; } });
+Object.defineProperty(exports, "calculateVelocityFromSkew", { enumerable: true, get: function () { return converter_3.calculateVelocityFromSkew; } });
+Object.defineProperty(exports, "FUNDING_FEES_PRECISION", { enumerable: true, get: function () { return converter_3.FUNDING_FEES_PRECISION; } });

package/lib/trade/fees/tiers/converter.d.ts

@@ -0,0 +1,54 @@
+/**
+ * @dev Converters for fee tier data between contract and SDK formats
+ * @dev All BigNumber values are normalized to floats with appropriate precision
+ */
+import { IFeeTiers } from "../../../contracts/types/generated/GNSMultiCollatDiamond";
+import { FeeTier, TraderInfo, TraderEnrollment } from "./types";
+/**
+ * @dev Converts contract fee tier data to SDK format
+ * @param contractData Contract FeeTier struct
+ * @returns Normalized fee tier data
+ */
+export declare const convertFeeTier: (contractData: IFeeTiers.FeeTierStructOutput) => FeeTier;
+/**
+ * @dev Converts array of fee tiers from contract format
+ * @param contractDataArray Array of contract FeeTier structs
+ * @returns Array of normalized fee tiers
+ */
+export declare const convertFeeTierArray: (contractDataArray: IFeeTiers.FeeTierStructOutput[]) => FeeTier[];
+/**
+ * @dev Converts contract trader info to SDK format
+ * @param contractData Contract TraderInfo struct
+ * @returns Normalized trader info
+ */
+export declare const convertTraderInfo: (contractData: IFeeTiers.TraderInfoStructOutput) => TraderInfo;
+/**
+ * @dev Converts contract trader enrollment to SDK format
+ * @param contractData Contract TraderEnrollment struct
+ * @returns Normalized trader enrollment
+ */
+export declare const convertTraderEnrollment: (contractData: IFeeTiers.TraderEnrollmentStructOutput) => TraderEnrollment;
+/**
+ * @dev Converts the complete fee tiers configuration from contract format
+ * @param tiers Array of fee tiers from contract
+ * @param groupVolumeMultipliers Array of group volume multipliers
+ * @param currentDay Current day from contract
+ * @returns Complete fee tiers configuration
+ */
+export declare const convertFeeTiersConfig: (tiers: IFeeTiers.FeeTierStructOutput[], groupVolumeMultipliers: readonly bigint[], currentDay: bigint) => {
+    tiers: FeeTier[];
+    groupVolumeMultipliers: number[];
+    currentDay: number;
+};
+/**
+ * @dev Converts trader's fee tier data from contract format
+ * @param traderInfo Trader info from contract
+ * @param traderDailyInfo Array of daily points info
+ * @param traderEnrollment Enrollment status from contract
+ * @returns Complete trader fee tier data
+ */
+export declare const convertTraderFeeTiersData: (traderInfo: IFeeTiers.TraderInfoStructOutput, traderDailyInfo: readonly bigint[], traderEnrollment: IFeeTiers.TraderEnrollmentStructOutput) => {
+    traderInfo: TraderInfo;
+    dailyPoints: number[];
+    traderEnrollment: TraderEnrollment;
+};

package/lib/trade/fees/tiers/converter.js

@@ -0,0 +1,81 @@
+"use strict";
+/**
+ * @dev Converters for fee tier data between contract and SDK formats
+ * @dev All BigNumber values are normalized to floats with appropriate precision
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertTraderFeeTiersData = exports.convertFeeTiersConfig = exports.convertTraderEnrollment = exports.convertTraderInfo = exports.convertFeeTierArray = exports.convertFeeTier = void 0;
+/**
+ * @dev Converts contract fee tier data to SDK format
+ * @param contractData Contract FeeTier struct
+ * @returns Normalized fee tier data
+ */
+const convertFeeTier = (contractData) => {
+    return {
+        feeMultiplier: Number(contractData.feeMultiplier) / 1e3,
+        pointsThreshold: Number(contractData.pointsThreshold) / 1e18, // Points in 1e18 precision
+    };
+};
+exports.convertFeeTier = convertFeeTier;
+/**
+ * @dev Converts array of fee tiers from contract format
+ * @param contractDataArray Array of contract FeeTier structs
+ * @returns Array of normalized fee tiers
+ */
+const convertFeeTierArray = (contractDataArray) => {
+    return contractDataArray.map(exports.convertFeeTier);
+};
+exports.convertFeeTierArray = convertFeeTierArray;
+/**
+ * @dev Converts contract trader info to SDK format
+ * @param contractData Contract TraderInfo struct
+ * @returns Normalized trader info
+ */
+const convertTraderInfo = (contractData) => {
+    return {
+        lastDayUpdated: Number(contractData.lastDayUpdated),
+        trailingPoints: Number(contractData.trailingPoints) / 1e18, // Points in 1e18 precision
+    };
+};
+exports.convertTraderInfo = convertTraderInfo;
+/**
+ * @dev Converts contract trader enrollment to SDK format
+ * @param contractData Contract TraderEnrollment struct
+ * @returns Normalized trader enrollment
+ */
+const convertTraderEnrollment = (contractData) => {
+    return {
+        status: Number(contractData.status),
+    };
+};
+exports.convertTraderEnrollment = convertTraderEnrollment;
+/**
+ * @dev Converts the complete fee tiers configuration from contract format
+ * @param tiers Array of fee tiers from contract
+ * @param groupVolumeMultipliers Array of group volume multipliers
+ * @param currentDay Current day from contract
+ * @returns Complete fee tiers configuration
+ */
+const convertFeeTiersConfig = (tiers, groupVolumeMultipliers, currentDay) => {
+    return {
+        tiers: (0, exports.convertFeeTierArray)(tiers),
+        groupVolumeMultipliers: groupVolumeMultipliers.map(m => Number(m) / 1e3),
+        currentDay: Number(currentDay),
+    };
+};
+exports.convertFeeTiersConfig = convertFeeTiersConfig;
+/**
+ * @dev Converts trader's fee tier data from contract format
+ * @param traderInfo Trader info from contract
+ * @param traderDailyInfo Array of daily points info
+ * @param traderEnrollment Enrollment status from contract
+ * @returns Complete trader fee tier data
+ */
+const convertTraderFeeTiersData = (traderInfo, traderDailyInfo, traderEnrollment) => {
+    return {
+        traderInfo: (0, exports.convertTraderInfo)(traderInfo),
+        dailyPoints: traderDailyInfo.map(points => Number(points) / 1e18),
+        traderEnrollment: (0, exports.convertTraderEnrollment)(traderEnrollment),
+    };
+};
+exports.convertTraderFeeTiersData = convertTraderFeeTiersData;

package/lib/trade/fees/tiers/index.d.ts

@@ -1,6 +1,7 @@
 import { FeeTiers, TraderFeeTiers } from "../../types";
 import { FeeTier } from "./types";
 export * from "./types";
+export * from "./converter";
 export declare const TRAILING_PERIOD_DAYS = 30;
 export declare const FEE_MULTIPLIER_SCALE = 1;
 export declare const MAX_FEE_TIERS = 8;

package/lib/trade/fees/tiers/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTraderFeeMultiplier = exports.calculateFeeAmount = exports.computeFeeMultiplier = exports.getFeeMultiplier = exports.getFeeTiersCount = exports.getCurrentDay = exports.MAX_FEE_TIERS = exports.FEE_MULTIPLIER_SCALE = exports.TRAILING_PERIOD_DAYS = void 0;
 const types_1 = require("./types");
 __exportStar(require("./types"), exports);
+__exportStar(require("./converter"), exports);
 exports.TRAILING_PERIOD_DAYS = 30;
 exports.FEE_MULTIPLIER_SCALE = 1;
 exports.MAX_FEE_TIERS = 8;

package/lib/trade/fees/trading/index.d.ts

@@ -1,8 +1,10 @@
 /**
  * @dev Trading fee calculations for opening and closing positions
  */
-import { Fee, PairIndex } from "../../types";
-import { GetTradeFeesContext, GetLiquidationFeesContext, GetClosingFeeContext, TradeFeesBreakdown } from "./types";
+import { Fee, PairIndex, Trade, TradeInfo, TradeFeesData } from "../../types";
+import { GetTradeFeesContext, GetLiquidationFeesContext, GetClosingFeeContext, TradeFeesBreakdown, TradeHoldingFees } from "./types";
+import { ContractsVersion } from "../../../contracts/types";
+import * as BorrowingFee from "../borrowing/types";
 /**
  * @dev Returns the total fee for a trade in collateral tokens
  * @dev Mirrors the contract's getTotalTradeFeesCollateral function
@@ -30,5 +32,23 @@ export declare const getTotalTradeLiqFeesCollateral: (collateralIndex: number, t
  * @deprecated Use getTotalTradeFeesCollateral instead
  */
 export declare const getClosingFee: (collateralAmount: number, leverage: number, pairIndex: PairIndex, pairFee: Fee | undefined, _collateralPriceUsd?: number | undefined, isCounterTrade?: boolean, trader?: string, context?: GetClosingFeeContext) => number;
+/**
+ * @dev Calculates total holding fees for a trade (funding + borrowing fees)
+ * @param trade The trade to calculate fees for
+ * @param tradeInfo Trade info containing contracts version
+ * @param tradeFeesData Trade fees data containing initial acc fees
+ * @param currentPairPrice Current pair price
+ * @param context Context with fee parameters
+ * @returns Object containing all holding fee components
+ */
+export declare const getTradePendingHoldingFeesCollateral: (trade: Trade, tradeInfo: TradeInfo, tradeFeesData: TradeFeesData, currentPairPrice: number, context: {
+    [key: string]: any;
+    contractsVersion?: ContractsVersion | undefined;
+    currentBlock?: number | undefined;
+    groups?: BorrowingFee.Group[] | undefined;
+    pairs?: BorrowingFee.Pair[] | undefined;
+    collateralPriceUsd?: number | undefined;
+    initialAccFees?: BorrowingFee.InitialAccFees | undefined;
+}) => TradeHoldingFees;
 export * from "./types";
 export * from "./converter";

package/lib/trade/fees/trading/index.js

@@ -17,8 +17,12 @@ 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.getClosingFee = exports.getTotalTradeLiqFeesCollateral = exports.getTradeFeesCollateral = exports.getTotalTradeFeesCollateral = void 0;
+exports.getTradePendingHoldingFeesCollateral = exports.getClosingFee = exports.getTotalTradeLiqFeesCollateral = exports.getTradeFeesCollateral = exports.getTotalTradeFeesCollateral = void 0;
 const tiers_1 = require("../tiers");
+const fundingFees_1 = require("../fundingFees");
+const borrowingV2_1 = require("../borrowingV2");
+const borrowing_1 = require("../borrowing");
+const types_1 = require("../../../contracts/types");
 /**
  * @dev Returns the total fee for a trade in collateral tokens
  * @dev Mirrors the contract's getTotalTradeFeesCollateral function
@@ -99,6 +103,45 @@ isCounterTrade = false, trader, context) => {
     trader || "", pairIndex, positionSizeCollateral, isCounterTrade, context);
 };
 exports.getClosingFee = getClosingFee;
+/**
+ * @dev Calculates total holding fees for a trade (funding + borrowing fees)
+ * @param trade The trade to calculate fees for
+ * @param tradeInfo Trade info containing contracts version
+ * @param tradeFeesData Trade fees data containing initial acc fees
+ * @param currentPairPrice Current pair price
+ * @param context Context with fee parameters
+ * @returns Object containing all holding fee components
+ */
+const getTradePendingHoldingFeesCollateral = (trade, tradeInfo, tradeFeesData, currentPairPrice, context) => {
+    var _a;
+    // Calculate funding fees (v10+ only)
+    const fundingFeeCollateral = ((_a = context.contractsVersion) !== null && _a !== void 0 ? _a : tradeInfo.contractsVersion) >=
+        types_1.ContractsVersion.V10
+        ? (0, fundingFees_1.getTradeFundingFeesCollateral)(trade, tradeInfo, tradeFeesData, currentPairPrice, context)
+        : 0;
+    // Calculate borrowing fees v2
+    const borrowingFeeCollateral = (0, borrowingV2_1.getTradeBorrowingFeesCollateral)({
+        positionSizeCollateral: trade.collateralAmount * trade.leverage,
+        openPrice: trade.openPrice,
+        collateralIndex: trade.collateralIndex,
+        pairIndex: trade.pairIndex,
+        currentPairPrice,
+        initialAccBorrowingFeeP: tradeFeesData.initialAccBorrowingFeeP,
+        currentTimestamp: context.currentTimestamp,
+    }, context);
+    // Calculate v1 borrowing fees (some markets use v1 indefinitely)
+    const borrowingFeeCollateral_old = (0, borrowing_1.getBorrowingFee)(trade.collateralAmount * trade.leverage, trade.pairIndex, trade.long, context.initialAccFees || { accPairFee: 0, accGroupFee: 0, block: 0 }, // Use context initial fees or empty
+    context);
+    return {
+        fundingFeeCollateral,
+        borrowingFeeCollateral,
+        borrowingFeeCollateral_old,
+        totalFeeCollateral: fundingFeeCollateral +
+            borrowingFeeCollateral +
+            borrowingFeeCollateral_old,
+    };
+};
+exports.getTradePendingHoldingFeesCollateral = getTradePendingHoldingFeesCollateral;
 // Export types
 __exportStar(require("./types"), exports);
 __exportStar(require("./converter"), exports);

package/lib/trade/fees/trading/types.d.ts

@@ -36,4 +36,13 @@ export type GetLiquidationFeesContext = {
  * @dev Legacy support
  */
 export type GetClosingFeeContext = GetTradeFeesContext;
+/**
+ * @dev Holding fees breakdown (funding + borrowing)
+ */
+export type TradeHoldingFees = {
+    fundingFeeCollateral: number;
+    borrowingFeeCollateral: number;
+    borrowingFeeCollateral_old: number;
+    totalFeeCollateral: number;
+};
 export type { GlobalTradeFeeParams };

package/lib/trade/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./fees";
-export * from "./pnl";
+export * from "./pnl/index";
 export * from "./spread";
 export * from "./liquidation";
 export * from "./types";

package/lib/trade/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./fees"), exports);
-__exportStar(require("./pnl"), exports);
+__exportStar(require("./pnl/index"), exports);
 __exportStar(require("./spread"), exports);
 __exportStar(require("./liquidation"), exports);
 __exportStar(require("./types"), exports);

package/lib/trade/liquidation/converter.d.ts

@@ -0,0 +1,23 @@
+/**
+ * @dev Converters for liquidation data between contract and SDK formats
+ */
+import { IPairsStorage } from "../../contracts/types/generated/GNSMultiCollatDiamond";
+import { LiquidationParams } from "../types";
+/**
+ * @dev Converts contract liquidation params to SDK format
+ * @param params Group liquidation params from contract
+ * @returns Normalized liquidation params
+ */
+export declare const convertLiquidationParams: (params: IPairsStorage.GroupLiquidationParamsStructOutput) => LiquidationParams;
+/**
+ * @dev Converts array of liquidation params from contract
+ * @param paramsArray Array of group liquidation params
+ * @returns Array of normalized liquidation params
+ */
+export declare const convertLiquidationParamsArray: (paramsArray: IPairsStorage.GroupLiquidationParamsStructOutput[]) => LiquidationParams[];
+/**
+ * @dev Converts liquidation params to contract format (for encoding)
+ * @param params SDK liquidation params
+ * @returns Contract-formatted liquidation params
+ */
+export declare const encodeLiquidationParams: (params: LiquidationParams) => IPairsStorage.GroupLiquidationParamsStruct;