@gainsnetwork/sdk 1.4.0-rc1 → 1.4.2-rc1

package/lib/trade/effectiveLeverage/builder.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildTradeEffectiveLeverageContext = void 0;
+const __1 = require("..");
+/**
+ * @dev Builds a complete context for effective leverage calculations
+ * @dev Uses the closing price impact context builder as a sub-context
+ * @param globalTradingVariables The transformed global trading variables from backend
+ * @param collateralIndex The collateral index (1-based)
+ * @param pairIndex The pair index
+ * @param tradeInfo Trade information including createdBlock
+ * @param additionalParams Additional parameters for price impact calculations
+ * @returns Complete context ready for getTradeNewEffectiveLeverage
+ */
+const buildTradeEffectiveLeverageContext = (globalTradingVariables, collateralIndex, pairIndex, tradeInfo, additionalParams) => {
+    var _a;
+    // Build the closing price impact context which we'll use for PnL calculations
+    const closingPriceImpactContext = (0, __1.buildTradeClosingPriceImpactContext)(globalTradingVariables, collateralIndex, pairIndex, tradeInfo, additionalParams);
+    if (!closingPriceImpactContext) {
+        return undefined;
+    }
+    // Extract base spread from pairs data
+    const pairs = globalTradingVariables.pairs;
+    const baseSpreadP = ((_a = pairs === null || pairs === void 0 ? void 0 : pairs[pairIndex]) === null || _a === void 0 ? void 0 : _a.spreadP) || 0;
+    return {
+        closingPriceImpactContext,
+        baseSpreadP,
+    };
+};
+exports.buildTradeEffectiveLeverageContext = buildTradeEffectiveLeverageContext;

package/lib/trade/fees/borrowing/builder.js

@@ -13,9 +13,8 @@ exports.buildBorrowingV1Context = void 0;
  * @returns Full borrowing context with all pairs and groups or undefined if data not available
  */
 const buildBorrowingV1Context = (globalTradingVariables, collateralIndex, currentBlock) => {
-    var _a;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
-    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairBorrowingFees) || !(collateral === null || collateral === void 0 ? void 0 : collateral.groupBorrowingFees)) {
+    if (!collateral?.pairBorrowingFees || !collateral?.groupBorrowingFees) {
         return undefined;
     }
     const pairs = collateral.pairBorrowingFees;
@@ -27,7 +26,7 @@ const buildBorrowingV1Context = (globalTradingVariables, collateralIndex, curren
         currentBlock,
         pairs,
         groups,
-        collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
+        collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
         pairOis: collateral.pairOis,
     };
 };

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

@@ -14,7 +14,11 @@ const convertPairGroupBorrowingFee = (pairGroup) => ({
     block: pairGroup.block,
 });
 exports.convertPairGroupBorrowingFee = convertPairGroupBorrowingFee;
-const convertPairBorrowingFee = (pair, pairOi, pairGroup, feeCap) => (Object.assign(Object.assign({}, (0, exports.convertGroupBorrowingData)(pair, pairOi)), { groups: pairGroup.map(value => (0, exports.convertPairGroupBorrowingFee)(value)), feePerBlockCap: (0, exports.convertFeePerBlockCap)(feeCap) }));
+const convertPairBorrowingFee = (pair, pairOi, pairGroup, feeCap) => ({
+    ...(0, exports.convertGroupBorrowingData)(pair, pairOi),
+    groups: pairGroup.map(value => (0, exports.convertPairGroupBorrowingFee)(value)),
+    feePerBlockCap: (0, exports.convertFeePerBlockCap)(feeCap),
+});
 exports.convertPairBorrowingFee = convertPairBorrowingFee;
 const convertPairBorrowingFees = ([pairs, pairOi, pairGroups, feeCaps]) => pairs.map((value, ix) => (0, exports.convertPairBorrowingFee)(value, pairOi[ix], pairGroups[ix], feeCaps[ix]));
 exports.convertPairBorrowingFees = convertPairBorrowingFees;

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

@@ -48,7 +48,7 @@ const getBorrowingFee = (posDai, pairIndex, long, initialAccFees, currentPairPri
         return 0;
     }
     const pairGroups = pairs[pairIndex].groups;
-    const firstPairGroup = (pairGroups === null || pairGroups === void 0 ? void 0 : pairGroups.length) > 0 ? pairGroups[0] : undefined;
+    const firstPairGroup = pairGroups?.length > 0 ? pairGroups[0] : undefined;
     let fee = 0;
     if (!firstPairGroup || firstPairGroup.block > initialAccFees.block) {
         const openInterest = (0, __1.getPairTotalOisDynamicCollateral)(pairIndex, {
@@ -215,13 +215,13 @@ collateralPriceUsd) => {
 };
 const getPendingAccFeesDelta = (blockDistance, feePerBlock, netOi, maxOi, feeExponent) => {
     return maxOi > 0 && feeExponent > 0
-        ? feePerBlock * blockDistance * Math.pow((netOi / maxOi), feeExponent)
+        ? feePerBlock * blockDistance * (netOi / maxOi) ** feeExponent
         : 0;
 };
 const getFeePerBlockCaps = (cap) => {
     return {
-        minP: (cap === null || cap === void 0 ? void 0 : cap.minP) || 0,
-        maxP: (cap === null || cap === void 0 ? void 0 : cap.maxP) && cap.maxP > 0 ? cap.maxP : 1,
+        minP: cap?.minP || 0,
+        maxP: cap?.maxP && cap.maxP > 0 ? cap.maxP : 1,
     };
 };
 const getBorrowingDataActiveFeePerBlock = (val) => {
@@ -231,7 +231,7 @@ const getBorrowingDataActiveFeePerBlock = (val) => {
     // If minP > 0 then netOi has to be at least minP * maxOi
     // If maxP > 0 then netOi cannot be more than maxP * maxOi
     const effectiveOi = Math.min(Math.max(Math.abs(long - short), max * minP), max * maxP);
-    return val.feePerBlock * Math.pow((effectiveOi / max), val.feeExponent);
+    return val.feePerBlock * (effectiveOi / max) ** val.feeExponent;
 };
 const getActiveFeePerBlock = (pair, group) => {
     const pairFeePerBlock = getBorrowingDataActiveFeePerBlock(pair);

package/lib/trade/fees/borrowingV2/builder.js

@@ -5,13 +5,12 @@ exports.buildBorrowingV2Context = void 0;
  * @dev Builds borrowing v2 sub-context for a specific pair
  */
 const buildBorrowingV2Context = (globalTradingVariables, collateralIndex, pairIndex, currentTimestamp) => {
-    var _a, _b;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
-    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairBorrowingFeesV2)) {
+    if (!collateral?.pairBorrowingFeesV2) {
         return undefined;
     }
-    const params = (_a = collateral.pairBorrowingFeesV2.params) === null || _a === void 0 ? void 0 : _a[pairIndex];
-    const data = (_b = collateral.pairBorrowingFeesV2.data) === null || _b === void 0 ? void 0 : _b[pairIndex];
+    const params = collateral.pairBorrowingFeesV2.params?.[pairIndex];
+    const data = collateral.pairBorrowingFeesV2.data?.[pairIndex];
     if (!params || !data) {
         return undefined;
     }

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

@@ -116,7 +116,7 @@ exports.aprToBorrowingRate = aprToBorrowingRate;
  */
 const createCollateralScopedBorrowingContext = (collateralBorrowingData, currentTimestamp) => {
     const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
         borrowingParams: {},
         borrowingData: {},
     };

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

@@ -1,13 +1,4 @@
 "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("./converter");
@@ -18,19 +9,19 @@ const converter_1 = require("./converter");
  * @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* () {
+const fetchBorrowingFeeParamsV2 = async (contract, collateralIndices, pairIndices) => {
     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);
+        const contractParams = await 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
@@ -39,19 +30,19 @@ exports.fetchBorrowingFeeParamsV2 = fetchBorrowingFeeParamsV2;
  * @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* () {
+const fetchPairBorrowingFeeDataV2 = async (contract, collateralIndices, pairIndices) => {
     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);
+        const contractData = await 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
@@ -61,9 +52,9 @@ exports.fetchPairBorrowingFeeDataV2 = fetchPairBorrowingFeeDataV2;
  * @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* () {
+const fetchTradeBorrowingFeesCollateralV2 = async (contract, trader, index, currentPairPrice) => {
     try {
-        const feesCollateral = yield contract.getTradeBorrowingFeesCollateral(trader, index, currentPairPrice);
+        const feesCollateral = await 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());
@@ -72,7 +63,7 @@ const fetchTradeBorrowingFeesCollateralV2 = (contract, trader, index, currentPai
         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
@@ -82,9 +73,9 @@ exports.fetchTradeBorrowingFeesCollateralV2 = fetchTradeBorrowingFeesCollateralV
  * @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* () {
+const fetchPairPendingAccBorrowingFeesV2 = async (contract, collateralIndex, pairIndex, currentPairPrice) => {
     try {
-        const accBorrowingFeeP = yield contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
+        const accBorrowingFeeP = await contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
         // Convert BigNumber to normalized float
         return parseFloat(accBorrowingFeeP.toString()) / 1e20;
     }
@@ -92,7 +83,7 @@ const fetchPairPendingAccBorrowingFeesV2 = (contract, collateralIndex, pairIndex
         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
@@ -101,11 +92,11 @@ exports.fetchPairPendingAccBorrowingFeesV2 = fetchPairPendingAccBorrowingFeesV2;
  * @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 fetchAllBorrowingV2Data = async (contract, collateralIndex, pairIndices) => {
     const collateralIndices = new Array(pairIndices.length).fill(collateralIndex);
     try {
         // Fetch both parameters and data in parallel
-        const [params, data] = yield Promise.all([
+        const [params, data] = await Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -117,7 +108,7 @@ const fetchAllBorrowingV2Data = (contract, collateralIndex, pairIndices) => __aw
         console.error("Error fetching all borrowing v2 data:", error);
         throw error;
     }
-});
+};
 exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
 /**
  * @dev Creates a complete borrowing v2 context from contract data
@@ -127,10 +118,13 @@ exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
  * @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) });
-});
+const createBorrowingV2ContextFromContract = async (contract, collateralIndex, pairIndices, currentTimestamp) => {
+    const { context } = await (0, exports.fetchAllBorrowingV2Data)(contract, collateralIndex, pairIndices);
+    return {
+        ...context,
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
+    };
+};
 exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContract;
 /**
  * @dev Helper function to create context from already fetched arrays
@@ -143,7 +137,7 @@ exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContr
  */
 const createBorrowingV2ContextFromArrays = (collateralIndices, pairIndices, params, data, currentTimestamp) => {
     const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
         borrowingParams: {},
         borrowingData: {},
     };
@@ -164,13 +158,13 @@ exports.createBorrowingV2ContextFromArrays = createBorrowingV2ContextFromArrays;
  * @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* () {
+const fetchBorrowingV2DataForPairs = async (contract, collateralIndices, pairIndices) => {
     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([
+        const [params, data] = await Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -181,5 +175,5 @@ const fetchBorrowingV2DataForPairs = (contract, collateralIndices, pairIndices)
         console.error("Error fetching borrowing v2 data for pairs:", error);
         throw error;
     }
-});
+};
 exports.fetchBorrowingV2DataForPairs = fetchBorrowingV2DataForPairs;

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

@@ -48,7 +48,7 @@ exports.BORROWING_V2_PRECISION = {
  * @returns Updated accumulated borrowing fee (1e20 precision)
  */
 const getPairPendingAccBorrowingFees = (params, data, currentPairPrice, currentTimestamp) => {
-    const timestamp = currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000);
+    const timestamp = currentTimestamp ?? Math.floor(Date.now() / 1000);
     // Calculate time elapsed since last update
     const timeElapsed = Math.max(0, timestamp - data.lastBorrowingUpdateTs);
     // If no time elapsed, return current accumulated fee
@@ -74,7 +74,7 @@ const getTradeBorrowingFeesCollateral = (input, context) => {
         return 0;
     }
     // Calculate current accumulated borrowing fees
-    const currentAccBorrowingFeeP = (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : context.currentTimestamp);
+    const currentAccBorrowingFeeP = (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp ?? context.currentTimestamp);
     // Calculate borrowing fees for this trade
     // Formula: (positionSizeCollateral * (currentAccFee - initialAccFee)) / openPrice / 100
     const feeDeltaP = currentAccBorrowingFeeP - initialAccBorrowingFeeP;
@@ -96,7 +96,7 @@ const getPairBorrowingFees = (input, context) => {
     if (!params || !data) {
         return 0;
     }
-    return (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : context.currentTimestamp);
+    return (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp ?? context.currentTimestamp);
 };
 exports.getPairBorrowingFees = getPairBorrowingFees;
 /**

package/lib/trade/fees/converter.js

@@ -16,14 +16,14 @@ const convertTradeFeesData = (data, collateralConfig) => {
     const decimals = collateralConfig.decimals || 18;
     return {
         realizedTradingFeesCollateral: parseFloat(data.realizedTradingFeesCollateral.toString()) /
-            Math.pow(10, decimals),
-        realizedPnlCollateral: parseFloat(data.realizedPnlCollateral.toString()) / Math.pow(10, decimals),
+            10 ** decimals,
+        realizedPnlCollateral: parseFloat(data.realizedPnlCollateral.toString()) / 10 ** decimals,
         manuallyRealizedNegativePnlCollateral: parseFloat(data.manuallyRealizedNegativePnlCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         alreadyTransferredNegativePnlCollateral: parseFloat(data.alreadyTransferredNegativePnlCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         virtualAvailableCollateralInDiamond: parseFloat(data.virtualAvailableCollateralInDiamond.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         initialAccFundingFeeP: parseFloat(data.initialAccFundingFeeP.toString()) /
             converter_1.FUNDING_FEES_PRECISION.ACC_FUNDING_FEE_P,
         initialAccBorrowingFeeP: parseFloat(data.initialAccBorrowingFeeP.toString()) /
@@ -51,16 +51,16 @@ const convertUiRealizedPnlData = (data, collateralConfig) => {
     const decimals = collateralConfig.decimals || 18;
     return {
         realizedTradingFeesCollateral: parseFloat(data.realizedTradingFeesCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         realizedOldBorrowingFeesCollateral: parseFloat(data.realizedOldBorrowingFeesCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         realizedNewBorrowingFeesCollateral: parseFloat(data.realizedNewBorrowingFeesCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         realizedFundingFeesCollateral: parseFloat(data.realizedFundingFeesCollateral.toString()) /
-            Math.pow(10, decimals),
+            10 ** decimals,
         realizedPnlPartialCloseCollateral: parseFloat(data.realizedPnlPartialCloseCollateral.toString()) /
-            Math.pow(10, decimals),
-        pnlWithdrawnCollateral: parseFloat(data.pnlWithdrawnCollateral.toString()) / Math.pow(10, decimals),
+            10 ** decimals,
+        pnlWithdrawnCollateral: parseFloat(data.pnlWithdrawnCollateral.toString()) / 10 ** decimals,
     };
 };
 exports.convertUiRealizedPnlData = convertUiRealizedPnlData;
@@ -83,11 +83,11 @@ exports.convertUiRealizedPnlDataArray = convertUiRealizedPnlDataArray;
 const encodeTradeFeesData = (data, collateralConfig) => {
     const decimals = collateralConfig.decimals || 18;
     return {
-        realizedTradingFeesCollateral: Math.round(data.realizedTradingFeesCollateral * Math.pow(10, decimals)),
-        realizedPnlCollateral: Math.round(data.realizedPnlCollateral * Math.pow(10, decimals)),
-        manuallyRealizedNegativePnlCollateral: Math.round(data.manuallyRealizedNegativePnlCollateral * Math.pow(10, decimals)),
-        alreadyTransferredNegativePnlCollateral: Math.round(data.alreadyTransferredNegativePnlCollateral * Math.pow(10, decimals)),
-        virtualAvailableCollateralInDiamond: Math.round(data.virtualAvailableCollateralInDiamond * Math.pow(10, decimals)),
+        realizedTradingFeesCollateral: Math.round(data.realizedTradingFeesCollateral * 10 ** decimals),
+        realizedPnlCollateral: Math.round(data.realizedPnlCollateral * 10 ** decimals),
+        manuallyRealizedNegativePnlCollateral: Math.round(data.manuallyRealizedNegativePnlCollateral * 10 ** decimals),
+        alreadyTransferredNegativePnlCollateral: Math.round(data.alreadyTransferredNegativePnlCollateral * 10 ** decimals),
+        virtualAvailableCollateralInDiamond: Math.round(data.virtualAvailableCollateralInDiamond * 10 ** decimals),
         __placeholder: 0,
         initialAccFundingFeeP: Math.round(data.initialAccFundingFeeP * converter_1.FUNDING_FEES_PRECISION.ACC_FUNDING_FEE_P),
         initialAccBorrowingFeeP: Math.round(data.initialAccBorrowingFeeP * borrowingV2_1.BORROWING_V2_PRECISION.ACC_FEE),
@@ -103,12 +103,12 @@ exports.encodeTradeFeesData = encodeTradeFeesData;
 const encodeUiRealizedPnlData = (data, collateralConfig) => {
     const decimals = collateralConfig.decimals || 18;
     return {
-        realizedTradingFeesCollateral: Math.round(data.realizedTradingFeesCollateral * Math.pow(10, decimals)),
-        realizedOldBorrowingFeesCollateral: Math.round(data.realizedOldBorrowingFeesCollateral * Math.pow(10, decimals)),
-        realizedNewBorrowingFeesCollateral: Math.round(data.realizedNewBorrowingFeesCollateral * Math.pow(10, decimals)),
-        realizedFundingFeesCollateral: Math.round(data.realizedFundingFeesCollateral * Math.pow(10, decimals)),
-        realizedPnlPartialCloseCollateral: Math.round(data.realizedPnlPartialCloseCollateral * Math.pow(10, decimals)),
-        pnlWithdrawnCollateral: Math.round(data.pnlWithdrawnCollateral * Math.pow(10, decimals)),
+        realizedTradingFeesCollateral: Math.round(data.realizedTradingFeesCollateral * 10 ** decimals),
+        realizedOldBorrowingFeesCollateral: Math.round(data.realizedOldBorrowingFeesCollateral * 10 ** decimals),
+        realizedNewBorrowingFeesCollateral: Math.round(data.realizedNewBorrowingFeesCollateral * 10 ** decimals),
+        realizedFundingFeesCollateral: Math.round(data.realizedFundingFeesCollateral * 10 ** decimals),
+        realizedPnlPartialCloseCollateral: Math.round(data.realizedPnlPartialCloseCollateral * 10 ** decimals),
+        pnlWithdrawnCollateral: Math.round(data.pnlWithdrawnCollateral * 10 ** decimals),
     };
 };
 exports.encodeUiRealizedPnlData = encodeUiRealizedPnlData;

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

@@ -9,14 +9,13 @@ const index_1 = require("../../../markets/oi/index");
  * @dev Builds funding fees sub-context for a specific pair
  */
 const buildFundingContext = (globalTradingVariables, collateralIndex, pairIndex, currentTimestamp) => {
-    var _a, _b, _c, _d, _e;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
-    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairFundingFees)) {
+    if (!collateral?.pairFundingFees) {
         return undefined;
     }
-    const params = (_a = collateral.pairFundingFees.params) === null || _a === void 0 ? void 0 : _a[pairIndex];
-    const data = (_b = collateral.pairFundingFees.data) === null || _b === void 0 ? void 0 : _b[pairIndex];
-    const pairOi = (_c = collateral.pairOis) === null || _c === void 0 ? void 0 : _c[pairIndex];
+    const params = collateral.pairFundingFees.params?.[pairIndex];
+    const data = collateral.pairFundingFees.data?.[pairIndex];
+    const pairOi = collateral.pairOis?.[pairIndex];
     const netExposureToken = (0, index_1.getPairV10OiTokenSkewCollateral)(pairIndex, {
         pairOis: collateral.pairOis,
     });
@@ -28,8 +27,8 @@ const buildFundingContext = (globalTradingVariables, collateralIndex, pairIndex,
         data,
         pairOi: pairOi
             ? {
-                oiLongToken: ((_d = pairOi.token) === null || _d === void 0 ? void 0 : _d.long) || 0,
-                oiShortToken: ((_e = pairOi.token) === null || _e === void 0 ? void 0 : _e.short) || 0,
+                oiLongToken: pairOi.token?.long || 0,
+                oiShortToken: pairOi.token?.short || 0,
             }
             : undefined,
         currentTimestamp,

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

@@ -111,7 +111,7 @@ exports.convertTradeInitialAccFundingFees = convertTradeInitialAccFundingFees;
  */
 const createFundingFeeContext = (collateralIndices, pairIndices, params, data, globalParams, currentTimestamp) => {
     const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
         fundingParams: {},
         fundingData: {},
         globalParams: globalParams ? {} : undefined,

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

@@ -1,13 +1,4 @@
 "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;
 /**
@@ -18,9 +9,9 @@ exports.collateralToContractFormat = exports.priceToContractFormat = exports.fet
  * @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* () {
+const fetchPairPendingAccFundingFees = async (contract, collateralIndex, pairIndex, currentPairPrice) => {
     try {
-        const result = yield contract.getPairPendingAccFundingFees(collateralIndex, pairIndex, currentPairPrice);
+        const result = await contract.getPairPendingAccFundingFees(collateralIndex, pairIndex, currentPairPrice);
         return {
             accFundingFeeLongP: Number(result.accFundingFeeLongP) / 1e20,
             accFundingFeeShortP: Number(result.accFundingFeeShortP) / 1e20,
@@ -31,7 +22,7 @@ const fetchPairPendingAccFundingFees = (contract, collateralIndex, pairIndex, cu
         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
@@ -41,9 +32,9 @@ exports.fetchPairPendingAccFundingFees = fetchPairPendingAccFundingFees;
  * @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* () {
+const fetchTradeFundingFeesCollateral = async (contract, trader, index, currentPairPrice) => {
     try {
-        const fundingFeeCollateral = yield contract.getTradeFundingFeesCollateral(trader, index, currentPairPrice);
+        const fundingFeeCollateral = await contract.getTradeFundingFeesCollateral(trader, index, currentPairPrice);
         // Convert from BigNumber to number (collateral precision already applied)
         return Number(fundingFeeCollateral);
     }
@@ -51,7 +42,7 @@ const fetchTradeFundingFeesCollateral = (contract, trader, index, currentPairPri
         console.error("Error fetching trade funding fees:", error);
         throw error;
     }
-});
+};
 exports.fetchTradeFundingFeesCollateral = fetchTradeFundingFeesCollateral;
 /**
  * @dev Fetches trade fees data for a specific trade
@@ -60,9 +51,9 @@ exports.fetchTradeFundingFeesCollateral = fetchTradeFundingFeesCollateral;
  * @param index Trade index
  * @returns Promise resolving to trade fees data
  */
-const fetchTradeFeesData = (contract, trader, index) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchTradeFeesData = async (contract, trader, index) => {
     try {
-        const feesData = yield contract.getTradeFeesData(trader, index);
+        const feesData = await contract.getTradeFeesData(trader, index);
         return {
             accPerOiLong: Number(feesData.initialAccFundingFeeP) / 1e20,
             accPerOiShort: Number(feesData.initialAccFundingFeeP) / 1e20,
@@ -73,7 +64,7 @@ const fetchTradeFeesData = (contract, trader, index) => __awaiter(void 0, void 0
         console.error("Error fetching trade fees data:", error);
         throw error;
     }
-});
+};
 exports.fetchTradeFeesData = fetchTradeFeesData;
 /**
  * @dev Fetches trade fees data for multiple trades
@@ -82,12 +73,12 @@ exports.fetchTradeFeesData = fetchTradeFeesData;
  * @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* () {
+const fetchTradeFeesDataBatch = async (contract, traders, indices) => {
     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);
+        const feesDatas = await contract.getTradeFeesDataArray(traders, indices);
         return feesDatas.map(feesData => ({
             accPerOiLong: Number(feesData.initialAccFundingFeeP) / 1e20,
             accPerOiShort: Number(feesData.initialAccFundingFeeP) / 1e20,
@@ -98,7 +89,7 @@ const fetchTradeFeesDataBatch = (contract, traders, indices) => __awaiter(void 0
         console.error("Error fetching trade fees data batch:", error);
         throw error;
     }
-});
+};
 exports.fetchTradeFeesDataBatch = fetchTradeFeesDataBatch;
 /**
  * @dev Fetches pending accumulated funding fees for multiple pairs
@@ -108,7 +99,7 @@ exports.fetchTradeFeesDataBatch = fetchTradeFeesDataBatch;
  * @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* () {
+const fetchPairPendingAccFundingFeesBatch = async (contract, collateralIndices, pairIndices, currentPairPrices) => {
     if (collateralIndices.length !== pairIndices.length ||
         pairIndices.length !== currentPairPrices.length) {
         throw new Error("All input arrays must have the same length");
@@ -116,7 +107,7 @@ const fetchPairPendingAccFundingFeesBatch = (contract, collateralIndices, pairIn
     try {
         // Fetch all in parallel
         const promises = collateralIndices.map((collateralIndex, i) => contract.getPairPendingAccFundingFees(collateralIndex, pairIndices[i], currentPairPrices[i]));
-        const results = yield Promise.all(promises);
+        const results = await Promise.all(promises);
         return results.map(result => ({
             accFundingFeeLongP: Number(result.accFundingFeeLongP) / 1e20,
             accFundingFeeShortP: Number(result.accFundingFeeShortP) / 1e20,
@@ -127,7 +118,7 @@ const fetchPairPendingAccFundingFeesBatch = (contract, collateralIndices, pairIn
         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
@@ -145,6 +136,6 @@ exports.priceToContractFormat = priceToContractFormat;
  * @returns Amount in contract format
  */
 const collateralToContractFormat = (amount, decimals) => {
-    return BigInt(Math.round(amount * Math.pow(10, decimals)));
+    return BigInt(Math.round(amount * 10 ** decimals));
 };
 exports.collateralToContractFormat = collateralToContractFormat;

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

@@ -259,10 +259,9 @@ exports.getTradeFundingFeesCollateral = getTradeFundingFeesCollateral;
  * @returns Complete funding fee calculation result
  */
 const getTradeFundingFees = (input, context) => {
-    var _a, _b;
     // Get params and data from context
-    const params = (_a = context.fundingParams[input.collateralIndex]) === null || _a === void 0 ? void 0 : _a[input.pairIndex];
-    const data = (_b = context.fundingData[input.collateralIndex]) === null || _b === void 0 ? void 0 : _b[input.pairIndex];
+    const params = context.fundingParams[input.collateralIndex]?.[input.pairIndex];
+    const data = context.fundingData[input.collateralIndex]?.[input.pairIndex];
     if (!params || !data) {
         throw new Error(`Missing funding fee data for collateral ${input.collateralIndex} pair ${input.pairIndex}`);
     }