@gainsnetwork/sdk 1.3.0-rc7 → 1.4.0-rc1

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

@@ -1,4 +1,13 @@
 "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");
@@ -9,19 +18,19 @@ const converter_1 = require("./converter");
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to array of borrowing fee parameters
  */
-const fetchBorrowingFeeParamsV2 = async (contract, collateralIndices, pairIndices) => {
+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 = await contract.getPairBorrowingFeeParams(collateralIndices, pairIndices);
+        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
@@ -30,19 +39,19 @@ exports.fetchBorrowingFeeParamsV2 = fetchBorrowingFeeParamsV2;
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to array of pair borrowing fee data
  */
-const fetchPairBorrowingFeeDataV2 = async (contract, collateralIndices, pairIndices) => {
+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 = await contract.getPairBorrowingFeeData(collateralIndices, pairIndices);
+        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
@@ -52,9 +61,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 = async (contract, trader, index, currentPairPrice) => {
+const fetchTradeBorrowingFeesCollateralV2 = (contract, trader, index, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const feesCollateral = await contract.getTradeBorrowingFeesCollateral(trader, index, currentPairPrice);
+        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());
@@ -63,7 +72,7 @@ const fetchTradeBorrowingFeesCollateralV2 = async (contract, trader, index, curr
         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
@@ -73,9 +82,9 @@ exports.fetchTradeBorrowingFeesCollateralV2 = fetchTradeBorrowingFeesCollateralV
  * @param currentPairPrice Current price of the trading pair (1e6 precision)
  * @returns Promise resolving to pending accumulated borrowing fee
  */
-const fetchPairPendingAccBorrowingFeesV2 = async (contract, collateralIndex, pairIndex, currentPairPrice) => {
+const fetchPairPendingAccBorrowingFeesV2 = (contract, collateralIndex, pairIndex, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const accBorrowingFeeP = await contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
+        const accBorrowingFeeP = yield contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
         // Convert BigNumber to normalized float
         return parseFloat(accBorrowingFeeP.toString()) / 1e20;
     }
@@ -83,7 +92,7 @@ const fetchPairPendingAccBorrowingFeesV2 = async (contract, collateralIndex, pai
         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
@@ -92,11 +101,11 @@ exports.fetchPairPendingAccBorrowingFeesV2 = fetchPairPendingAccBorrowingFeesV2;
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to complete borrowing v2 data set
  */
-const fetchAllBorrowingV2Data = async (contract, collateralIndex, pairIndices) => {
+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] = await Promise.all([
+        const [params, data] = yield Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -108,7 +117,7 @@ const fetchAllBorrowingV2Data = async (contract, collateralIndex, pairIndices) =
         console.error("Error fetching all borrowing v2 data:", error);
         throw error;
     }
-};
+});
 exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
 /**
  * @dev Creates a complete borrowing v2 context from contract data
@@ -118,13 +127,10 @@ exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
  * @param currentTimestamp Optional current timestamp for calculations
  * @returns Promise resolving to complete borrowing v2 context
  */
-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),
-    };
-};
+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
@@ -137,7 +143,7 @@ exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContr
  */
 const createBorrowingV2ContextFromArrays = (collateralIndices, pairIndices, params, data, currentTimestamp) => {
     const context = {
-        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
         borrowingParams: {},
         borrowingData: {},
     };
@@ -158,13 +164,13 @@ exports.createBorrowingV2ContextFromArrays = createBorrowingV2ContextFromArrays;
  * @param pairIndices Array of pair indices (must match collateralIndices length)
  * @returns Promise resolving to complete borrowing v2 context
  */
-const fetchBorrowingV2DataForPairs = async (contract, collateralIndices, pairIndices) => {
+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] = await Promise.all([
+        const [params, data] = yield Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -175,5 +181,5 @@ const fetchBorrowingV2DataForPairs = async (contract, collateralIndices, pairInd
         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 ?? Math.floor(Date.now() / 1000);
+    const timestamp = currentTimestamp !== null && currentTimestamp !== void 0 ? 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 ?? context.currentTimestamp);
+    const currentAccBorrowingFeeP = (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp !== null && currentTimestamp !== void 0 ? 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 ?? context.currentTimestamp);
+    return (0, exports.getPairPendingAccBorrowingFees)(params, data, currentPairPrice, currentTimestamp !== null && currentTimestamp !== void 0 ? 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()) /
-            10 ** decimals,
-        realizedPnlCollateral: parseFloat(data.realizedPnlCollateral.toString()) / 10 ** decimals,
+            Math.pow(10, decimals),
+        realizedPnlCollateral: parseFloat(data.realizedPnlCollateral.toString()) / Math.pow(10, decimals),
         manuallyRealizedNegativePnlCollateral: parseFloat(data.manuallyRealizedNegativePnlCollateral.toString()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         alreadyTransferredNegativePnlCollateral: parseFloat(data.alreadyTransferredNegativePnlCollateral.toString()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         virtualAvailableCollateralInDiamond: parseFloat(data.virtualAvailableCollateralInDiamond.toString()) /
-            10 ** decimals,
+            Math.pow(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()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         realizedOldBorrowingFeesCollateral: parseFloat(data.realizedOldBorrowingFeesCollateral.toString()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         realizedNewBorrowingFeesCollateral: parseFloat(data.realizedNewBorrowingFeesCollateral.toString()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         realizedFundingFeesCollateral: parseFloat(data.realizedFundingFeesCollateral.toString()) /
-            10 ** decimals,
+            Math.pow(10, decimals),
         realizedPnlPartialCloseCollateral: parseFloat(data.realizedPnlPartialCloseCollateral.toString()) /
-            10 ** decimals,
-        pnlWithdrawnCollateral: parseFloat(data.pnlWithdrawnCollateral.toString()) / 10 ** decimals,
+            Math.pow(10, decimals),
+        pnlWithdrawnCollateral: parseFloat(data.pnlWithdrawnCollateral.toString()) / Math.pow(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 * 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),
+        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)),
         __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 * 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),
+        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)),
     };
 };
 exports.encodeUiRealizedPnlData = encodeUiRealizedPnlData;

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

@@ -9,13 +9,14 @@ 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?.pairFundingFees) {
+    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairFundingFees)) {
         return undefined;
     }
-    const params = collateral.pairFundingFees.params?.[pairIndex];
-    const data = collateral.pairFundingFees.data?.[pairIndex];
-    const pairOi = collateral.pairOis?.[pairIndex];
+    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 netExposureToken = (0, index_1.getPairV10OiTokenSkewCollateral)(pairIndex, {
         pairOis: collateral.pairOis,
     });
@@ -27,8 +28,8 @@ const buildFundingContext = (globalTradingVariables, collateralIndex, pairIndex,
         data,
         pairOi: pairOi
             ? {
-                oiLongToken: pairOi.token?.long || 0,
-                oiShortToken: pairOi.token?.short || 0,
+                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,
             }
             : 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 ?? Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
         fundingParams: {},
         fundingData: {},
         globalParams: globalParams ? {} : undefined,

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

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

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

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

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

@@ -24,8 +24,9 @@ exports.MAX_FEE_TIERS = 8;
 const getCurrentDay = () => Math.floor(Date.now() / 1000 / 60 / 60 / 24);
 exports.getCurrentDay = getCurrentDay;
 const getFeeTiersCount = (feeTiers) => {
+    var _a;
     for (let i = exports.MAX_FEE_TIERS; i > 0; --i) {
-        if (feeTiers[i - 1]?.feeMultiplier > 0) {
+        if (((_a = feeTiers[i - 1]) === null || _a === void 0 ? void 0 : _a.feeMultiplier) > 0) {
             return i;
         }
     }

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

@@ -35,10 +35,11 @@ const types_1 = require("../../../contracts/types");
  * @returns Total fee in collateral tokens
  */
 const getTotalTradeFeesCollateral = (collateralIndex, trader, pairIndex, positionSizeCollateral, isCounterTrade, context) => {
+    var _a;
     const { fee, collateralPriceUsd } = context;
     const { totalPositionSizeFeeP, minPositionSizeUsd } = fee;
     // Get counter trade fee rate multiplier (default 1 = 1x)
-    const counterTradeFeeRateMultiplier = isCounterTrade && context.counterTradeSettings?.[pairIndex]
+    const counterTradeFeeRateMultiplier = isCounterTrade && ((_a = context.counterTradeSettings) === null || _a === void 0 ? void 0 : _a[pairIndex])
         ? context.counterTradeSettings[pairIndex].feeRateMultiplier
         : 1;
     // Apply counter trade multiplier to position size
@@ -118,10 +119,7 @@ const getTradePendingHoldingFeesCollateral = (trade, tradeInfo, tradeFeesData, c
     if (context.contractsVersion >= types_1.ContractsVersion.V10 &&
         context.funding &&
         tradeFeesData.initialAccFundingFeeP !== undefined) {
-        fundingFeeCollateral = (0, fundingFees_1.getTradeFundingFeesCollateral)(trade, tradeInfo, tradeFeesData, currentPairPrice, {
-            ...context.funding,
-            currentTimestamp: context.currentTimestamp,
-        });
+        fundingFeeCollateral = (0, fundingFees_1.getTradeFundingFeesCollateral)(trade, tradeInfo, tradeFeesData, currentPairPrice, Object.assign(Object.assign({}, context.funding), { currentTimestamp: context.currentTimestamp }));
     }
     // Calculate borrowing fees v2 (v10+ only)
     let borrowingFeeCollateral = 0;

package/lib/trade/liquidation/builder.js

@@ -17,6 +17,7 @@ const builder_4 = require("../fees/trading/builder");
  * @returns Complete context ready for getLiquidationPrice
  */
 const buildLiquidationPriceContext = (globalTradingVariables, tradeContainer, additionalParams) => {
+    var _a;
     const { trade, tradeInfo } = tradeContainer;
     const collateralIndex = trade.collateralIndex || 1;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
@@ -28,7 +29,7 @@ const buildLiquidationPriceContext = (globalTradingVariables, tradeContainer, ad
         core: {
             currentBlock: additionalParams.currentBlock,
             currentTimestamp: additionalParams.currentTimestamp,
-            collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
+            collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
             contractsVersion: tradeInfo.contractsVersion,
             spreadP: additionalParams.spreadP,
         },

package/lib/trade/liquidation/index.js

@@ -27,6 +27,7 @@ const __1 = require("..");
  * @returns Liquidation price
  */
 const getLiquidationPrice = (trade, context) => {
+    var _a, _b;
     // Extract parameters from structured context
     const { currentPairPrice, additionalFeeCollateral = 0, partialCloseMultiplier = 1, beforeOpened = false, isCounterTrade = false, } = context.liquidationSpecific;
     // 1. Calculate closing fees
@@ -71,9 +72,9 @@ const getLiquidationPrice = (trade, context) => {
         trade.leverage;
     // 6. Apply closing spread for v9.2+
     if (context.core.contractsVersion >= types_1.ContractsVersion.V9_2 &&
-        ((context.tradeData.liquidationParams?.maxLiqSpreadP !== undefined &&
+        ((((_a = context.tradeData.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
             context.tradeData.liquidationParams.maxLiqSpreadP > 0) ||
-            (context.liquidationSpecific.userPriceImpact?.fixedSpreadP !==
+            (((_b = context.liquidationSpecific.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !==
                 undefined &&
                 context.liquidationSpecific.userPriceImpact.fixedSpreadP > 0))) {
         const closingSpreadP = (0, __1.getSpreadP)(context.core.spreadP, true, context.tradeData.liquidationParams, context.liquidationSpecific.userPriceImpact);
@@ -98,6 +99,7 @@ exports.getLiquidationPrice = getLiquidationPrice;
  * @returns New liquidation price after the update
  */
 const getLiquidationPriceAfterPositionUpdate = (existingTrade, newCollateralAmount, newLeverage, isLeverageUpdate, positionSizeCollateralDelta, pnlToRealizeCollateral, context) => {
+    var _a, _b;
     const { currentPairPrice, isCounterTrade = false } = context.liquidationSpecific;
     // 1. Calculate closing fees on the new position size
     const closingFeeCollateral = (0, __1.getTotalTradeFeesCollateral)(existingTrade.collateralIndex, "", // No fee tiers applied for liquidation calculation
@@ -165,9 +167,9 @@ const getLiquidationPriceAfterPositionUpdate = (existingTrade, newCollateralAmou
         newLeverage;
     // 9. Apply closing spread for v9.2+
     if (context.core.contractsVersion >= types_1.ContractsVersion.V9_2 &&
-        ((context.tradeData.liquidationParams?.maxLiqSpreadP !== undefined &&
+        ((((_a = context.tradeData.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
             context.tradeData.liquidationParams.maxLiqSpreadP > 0) ||
-            (context.liquidationSpecific.userPriceImpact?.fixedSpreadP !==
+            (((_b = context.liquidationSpecific.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !==
                 undefined &&
                 context.liquidationSpecific.userPriceImpact.fixedSpreadP > 0))) {
         const closingSpreadP = (0, __1.getSpreadP)(context.core.spreadP, true, context.tradeData.liquidationParams, context.liquidationSpecific.userPriceImpact);

package/lib/trade/liquidation.d.ts

@@ -0,0 +1,12 @@
+import { GetBorrowingFeeContext, BorrowingFee } from "./fees";
+import { Fee, LiquidationParams, Trade, UserPriceImpact } from "./types";
+import { ContractsVersion } from "../contracts/types";
+export type GetLiquidationPriceContext = GetBorrowingFeeContext & {
+    liquidationParams: LiquidationParams | undefined;
+    pairSpreadP: number | undefined;
+    collateralPriceUsd: number | undefined;
+    contractsVersion: ContractsVersion | undefined;
+    userPriceImpact?: UserPriceImpact | undefined;
+};
+export declare const getLiquidationPrice: (trade: Trade, fee: Fee, initialAccFees: BorrowingFee.InitialAccFees, context: GetLiquidationPriceContext) => number;
+export declare const getLiqPnlThresholdP: (liquidationParams: LiquidationParams | undefined, leverage: number | undefined) => number;

package/lib/trade/liquidation.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLiqPnlThresholdP = exports.getLiquidationPrice = void 0;
+const fees_1 = require("./fees");
+const spread_1 = require("./spread");
+const types_1 = require("../contracts/types");
+const getLiquidationPrice = (trade, fee, initialAccFees, context) => {
+    var _a, _b;
+    const closingFee = (0, fees_1.getClosingFee)(trade.collateralAmount, trade.leverage, trade.pairIndex, fee, context.collateralPriceUsd);
+    const borrowingFee = (0, fees_1.getBorrowingFee)(trade.collateralAmount * trade.leverage, trade.pairIndex, trade.long, initialAccFees, context);
+    const liqThresholdP = (0, exports.getLiqPnlThresholdP)(context.liquidationParams, trade.leverage);
+    let liqPriceDistance = (trade.openPrice *
+        (trade.collateralAmount * liqThresholdP - (borrowingFee + closingFee))) /
+        trade.collateralAmount /
+        trade.leverage;
+    if ((context === null || context === void 0 ? void 0 : context.contractsVersion) !== undefined &&
+        context.contractsVersion >= types_1.ContractsVersion.V9_2 &&
+        ((((_a = context === null || context === void 0 ? void 0 : context.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
+            context.liquidationParams.maxLiqSpreadP > 0) ||
+            (((_b = context === null || context === void 0 ? void 0 : context.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !== undefined &&
+                context.userPriceImpact.fixedSpreadP > 0))) {
+        const closingSpreadP = (0, spread_1.getSpreadP)(context.pairSpreadP, true, context.liquidationParams, context.userPriceImpact);
+        liqPriceDistance -= trade.openPrice * closingSpreadP;
+    }
+    return trade.long
+        ? Math.max(trade.openPrice - liqPriceDistance, 0)
+        : Math.max(trade.openPrice + liqPriceDistance, 0);
+};
+exports.getLiquidationPrice = getLiquidationPrice;
+const getLiqPnlThresholdP = (liquidationParams, leverage) => {
+    if (liquidationParams === undefined ||
+        leverage === undefined ||
+        liquidationParams.maxLiqSpreadP === 0 ||
+        liquidationParams.startLiqThresholdP === 0 ||
+        liquidationParams.endLiqThresholdP === 0 ||
+        liquidationParams.startLeverage === 0 ||
+        liquidationParams.endLeverage === 0) {
+        return 0.9;
+    }
+    if (leverage < liquidationParams.startLeverage) {
+        return liquidationParams.startLiqThresholdP;
+    }
+    if (leverage > liquidationParams.endLeverage) {
+        return liquidationParams.endLiqThresholdP;
+    }
+    if (liquidationParams.startLiqThresholdP === liquidationParams.endLiqThresholdP) {
+        return liquidationParams.endLiqThresholdP;
+    }
+    return (liquidationParams.startLiqThresholdP -
+        ((leverage - liquidationParams.startLeverage) *
+            (liquidationParams.startLiqThresholdP -
+                liquidationParams.endLiqThresholdP)) /
+            (liquidationParams.endLeverage - liquidationParams.startLeverage));
+};
+exports.getLiqPnlThresholdP = getLiqPnlThresholdP;