@gainsnetwork/sdk 1.3.0-rc3 → 1.3.0-rc6

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}`);
     }

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

@@ -24,9 +24,8 @@ 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 (((_a = feeTiers[i - 1]) === null || _a === void 0 ? void 0 : _a.feeMultiplier) > 0) {
+        if (feeTiers[i - 1]?.feeMultiplier > 0) {
             return i;
         }
     }

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

@@ -35,11 +35,10 @@ 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 && ((_a = context.counterTradeSettings) === null || _a === void 0 ? void 0 : _a[pairIndex])
+    const counterTradeFeeRateMultiplier = isCounterTrade && context.counterTradeSettings?.[pairIndex]
         ? context.counterTradeSettings[pairIndex].feeRateMultiplier
         : 1;
     // Apply counter trade multiplier to position size
@@ -119,7 +118,10 @@ 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, Object.assign(Object.assign({}, context.funding), { currentTimestamp: context.currentTimestamp }));
+        fundingFeeCollateral = (0, fundingFees_1.getTradeFundingFeesCollateral)(trade, tradeInfo, tradeFeesData, currentPairPrice, {
+            ...context.funding,
+            currentTimestamp: context.currentTimestamp,
+        });
     }
     // Calculate borrowing fees v2 (v10+ only)
     let borrowingFeeCollateral = 0;

package/lib/trade/liquidation/builder.js

@@ -17,7 +17,6 @@ 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];
@@ -29,7 +28,7 @@ const buildLiquidationPriceContext = (globalTradingVariables, tradeContainer, ad
         core: {
             currentBlock: additionalParams.currentBlock,
             currentTimestamp: additionalParams.currentTimestamp,
-            collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
+            collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
             contractsVersion: tradeInfo.contractsVersion,
             spreadP: additionalParams.spreadP,
         },

package/lib/trade/liquidation/index.js

@@ -27,7 +27,6 @@ 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
@@ -72,9 +71,9 @@ const getLiquidationPrice = (trade, context) => {
         trade.leverage;
     // 6. Apply closing spread for v9.2+
     if (context.core.contractsVersion >= types_1.ContractsVersion.V9_2 &&
-        ((((_a = context.tradeData.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
+        ((context.tradeData.liquidationParams?.maxLiqSpreadP !== undefined &&
             context.tradeData.liquidationParams.maxLiqSpreadP > 0) ||
-            (((_b = context.liquidationSpecific.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !==
+            (context.liquidationSpecific.userPriceImpact?.fixedSpreadP !==
                 undefined &&
                 context.liquidationSpecific.userPriceImpact.fixedSpreadP > 0))) {
         const closingSpreadP = (0, __1.getSpreadP)(context.core.spreadP, true, context.tradeData.liquidationParams, context.liquidationSpecific.userPriceImpact);
@@ -99,7 +98,6 @@ 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
@@ -167,9 +165,9 @@ const getLiquidationPriceAfterPositionUpdate = (existingTrade, newCollateralAmou
         newLeverage;
     // 9. Apply closing spread for v9.2+
     if (context.core.contractsVersion >= types_1.ContractsVersion.V9_2 &&
-        ((((_a = context.tradeData.liquidationParams) === null || _a === void 0 ? void 0 : _a.maxLiqSpreadP) !== undefined &&
+        ((context.tradeData.liquidationParams?.maxLiqSpreadP !== undefined &&
             context.tradeData.liquidationParams.maxLiqSpreadP > 0) ||
-            (((_b = context.liquidationSpecific.userPriceImpact) === null || _b === void 0 ? void 0 : _b.fixedSpreadP) !==
+            (context.liquidationSpecific.userPriceImpact?.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/oiWindows.js

@@ -7,13 +7,12 @@ const getCurrentOiWindowId = (oiWindowSettings) => {
 };
 exports.getCurrentOiWindowId = getCurrentOiWindowId;
 const getActiveOi = (currentOiWindowId, windowsCount, oiWindows, buy) => {
-    var _a, _b;
     if (oiWindows === undefined || windowsCount === 0)
         return 0;
     let activeOi = 0;
     for (let id = currentOiWindowId - (windowsCount - 1); id <= currentOiWindowId; id++) {
         activeOi +=
-            (buy ? (_a = oiWindows === null || oiWindows === void 0 ? void 0 : oiWindows[id]) === null || _a === void 0 ? void 0 : _a.oiLongUsd : (_b = oiWindows === null || oiWindows === void 0 ? void 0 : oiWindows[id]) === null || _b === void 0 ? void 0 : _b.oiShortUsd) || 0;
+            (buy ? oiWindows?.[id]?.oiLongUsd : oiWindows?.[id]?.oiShortUsd) || 0;
     }
     return activeOi;
 };

package/lib/trade/pnl/builder.js

@@ -14,7 +14,6 @@ const builder_4 = require("../fees/trading/builder");
  * @returns Complete context ready for getComprehensivePnl
  */
 const buildComprehensivePnlContext = (globalTradingVariables, tradeContainer, additionalParams) => {
-    var _a;
     const { trade, tradeInfo } = tradeContainer;
     const collateralIndex = trade.collateralIndex || 1;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
@@ -23,7 +22,7 @@ const buildComprehensivePnlContext = (globalTradingVariables, tradeContainer, ad
         core: {
             currentBlock: additionalParams.currentBlock,
             currentTimestamp: additionalParams.currentTimestamp,
-            collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
+            collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
             contractsVersion: tradeInfo.contractsVersion,
         },
         // Build sub-contexts using dedicated builders

package/lib/trade/pnl/converter.js

@@ -34,7 +34,7 @@ exports.encodePnlPercent = encodePnlPercent;
  */
 const convertCollateralAmount = (amount, collateralDecimals) => {
     const value = typeof amount === "bigint" ? Number(amount) : amount;
-    return value / Math.pow(10, collateralDecimals);
+    return value / 10 ** collateralDecimals;
 };
 exports.convertCollateralAmount = convertCollateralAmount;
 /**

package/lib/trade/pnl/index.js

@@ -81,7 +81,6 @@ exports.getTradeValue = getTradeValue;
  * @returns Detailed PnL breakdown
  */
 const getComprehensivePnl = (trade, marketPrice, executionPrice, tradeInfo, context) => {
-    var _a;
     // Calculate both raw PnL (market price) and impact-adjusted PnL (execution price)
     let rawPnlPercent = (0, exports.getPnlPercent)(trade.openPrice, marketPrice, trade.long, trade.leverage);
     let impactPnlPercent = (0, exports.getPnlPercent)(trade.openPrice, executionPrice, trade.long, trade.leverage);
@@ -115,7 +114,7 @@ const getComprehensivePnl = (trade, marketPrice, executionPrice, tradeInfo, cont
     const totalHoldingFees = borrowingFeeV1 + borrowingFeeV2 + fundingFee;
     const totalFees = totalHoldingFees + closingFee;
     // Check liquidation (using raw PnL for liquidation check)
-    const liquidationThreshold = ((_a = context.tradeData) === null || _a === void 0 ? void 0 : _a.liquidationParams)
+    const liquidationThreshold = context.tradeData?.liquidationParams
         ? (0, liquidation_1.getLiqPnlThresholdP)(context.tradeData.liquidationParams, trade.leverage) *
             -100
         : -90; // Default 90% loss
@@ -192,7 +191,6 @@ exports.getComprehensivePnl = getComprehensivePnl;
  * @returns [pnlCollateral, pnlPercentage] or undefined if no price
  */
 const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, useFees, context) => {
-    var _a;
     if (!price) {
         return;
     }
@@ -224,7 +222,7 @@ const getPnl = (price, trade, _tradeInfo, initialAccFees, liquidationParams, use
         // Calculate closing fee using the same function as opening fees
         const positionSizeCollateral = posCollat * trade.leverage;
         const closingFee = (0, trading_1.getTotalTradeFeesCollateral)(0, // collateralIndex not used
-        trade.user, trade.pairIndex, positionSizeCollateral, (_a = trade.isCounterTrade) !== null && _a !== void 0 ? _a : false, {
+        trade.user, trade.pairIndex, positionSizeCollateral, trade.isCounterTrade ?? false, {
             fee: context.fee,
             globalTradeFeeParams: context.globalTradeFeeParams,
             collateralPriceUsd: context.collateralPriceUsd || 1,
@@ -248,12 +246,11 @@ exports.getPnl = getPnl;
  * @returns The price that would result in the target PnL percentage
  */
 const getPriceForTargetPnlPercentage = (targetPnlPercent, trade, tradeInfo, context, netPnl = false) => {
-    var _a, _b;
     const { leverage, openPrice, long, collateralAmount } = trade;
     const positionSizeCollateral = collateralAmount * leverage;
     // Calculate holding fees - always use getTradePendingHoldingFeesCollateral
     // This mirrors the contract's getTradeValueCollateral which always calls this function
-    const fees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, ((_a = context.tradeData) === null || _a === void 0 ? void 0 : _a.tradeFeesData) || {
+    const fees = (0, trading_1.getTradePendingHoldingFeesCollateral)(trade, tradeInfo, context.tradeData?.tradeFeesData || {
         realizedTradingFeesCollateral: 0,
         realizedPnlCollateral: 0,
         manuallyRealizedNegativePnlCollateral: 0,
@@ -269,7 +266,7 @@ const getPriceForTargetPnlPercentage = (targetPnlPercent, trade, tradeInfo, cont
         borrowingV1: context.borrowingV1,
         borrowingV2: context.borrowingV2,
         funding: context.funding,
-        initialAccFees: (_b = context.tradeData) === null || _b === void 0 ? void 0 : _b.initialAccFees,
+        initialAccFees: context.tradeData?.initialAccFees,
     });
     const totalHoldingFees = fees.fundingFeeCollateral +
         fees.borrowingFeeCollateral +

package/lib/trade/priceImpact/close/builder.js

@@ -14,7 +14,6 @@ const builder_2 = require("../skew/builder");
  * @returns Complete context ready for getTradeClosingPriceImpact
  */
 const buildTradeClosingPriceImpactContext = (globalTradingVariables, collateralIndex, pairIndex, tradeInfo, additionalParams) => {
-    var _a;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
     if (!collateral) {
         return undefined;
@@ -36,7 +35,7 @@ const buildTradeClosingPriceImpactContext = (globalTradingVariables, collateralI
     }
     // Return structured context with proper subcontexts
     return {
-        collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
+        collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
         cumulVolContext,
         skewContext,
         tradeInfo,

package/lib/trade/priceImpact/close/index.js

@@ -129,6 +129,9 @@ exports.getTradeClosingPriceImpact = getTradeClosingPriceImpact;
  * @returns Price impact breakdown and trade value
  */
 const getTradeClosingPriceImpactAtOracle = (input, context) => {
-    return (0, exports.getTradeClosingPriceImpact)(Object.assign(Object.assign({}, input), { currentPairPrice: input.oraclePrice }), context);
+    return (0, exports.getTradeClosingPriceImpact)({
+        ...input,
+        currentPairPrice: input.oraclePrice,
+    }, context);
 };
 exports.getTradeClosingPriceImpactAtOracle = getTradeClosingPriceImpactAtOracle;

package/lib/trade/priceImpact/cumulVol/builder.js

@@ -10,15 +10,15 @@ exports.buildCumulVolContext = void 0;
  * @returns Cumulative volume context ready for getTradeCumulVolPriceImpactP
  */
 const buildCumulVolContext = (globalTradingVariables, collateralIndex, pairIndex, additionalParams) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const collateral = globalTradingVariables.collaterals[collateralIndex - 1];
     if (!collateral) {
         return undefined;
     }
     // Get pair-specific data from global variables
-    const pairDepthBands = (_a = globalTradingVariables.pairDepthBands) === null || _a === void 0 ? void 0 : _a[pairIndex];
-    const pairFactor = (_b = globalTradingVariables.pairFactors) === null || _b === void 0 ? void 0 : _b[pairIndex];
-    const oiWindows = (_c = globalTradingVariables.oiWindows) === null || _c === void 0 ? void 0 : _c[pairIndex];
+    const pairDepthBands = globalTradingVariables.pairDepthBands?.[pairIndex];
+    const depthBandsMapping = globalTradingVariables.depthBandsMapping;
+    const pairFactor = globalTradingVariables.pairFactors?.[pairIndex];
+    const oiWindows = globalTradingVariables.oiWindows?.[pairIndex];
     // Get OI windows settings (same for all pairs)
     // OI windows settings from global trading variables are already in SDK format
     const oiWindowsSettings = globalTradingVariables.oiWindowsSettings;
@@ -26,18 +26,28 @@ const buildCumulVolContext = (globalTradingVariables, collateralIndex, pairIndex
     const userPriceImpact = additionalParams.userPriceImpact;
     const protectionCloseFactorWhitelist = additionalParams.protectionCloseFactorWhitelist;
     // Get liquidation params - check both pair and group level
-    const liquidationParams = ((_e = (_d = globalTradingVariables.liquidationParams) === null || _d === void 0 ? void 0 : _d.pairs) === null || _e === void 0 ? void 0 : _e[pairIndex]) ||
-        ((_g = (_f = globalTradingVariables.liquidationParams) === null || _f === void 0 ? void 0 : _f.groups) === null || _g === void 0 ? void 0 : _g[0]); // fallback to first group
-    return Object.assign({ 
+    const liquidationParams = globalTradingVariables.liquidationParams?.pairs?.[pairIndex] ||
+        globalTradingVariables.liquidationParams?.groups?.[0]; // fallback to first group
+    return {
         // Trade state
-        isOpen: additionalParams.isOpen, isPnlPositive: additionalParams.isPnlPositive, createdBlock: additionalParams.createdBlock, 
+        isOpen: additionalParams.isOpen,
+        isPnlPositive: additionalParams.isPnlPositive,
+        createdBlock: additionalParams.createdBlock,
         // Protection factors
-        liquidationParams, currentBlock: additionalParams.currentBlock, contractsVersion: additionalParams.contractsVersion, protectionCloseFactorWhitelist,
+        liquidationParams,
+        currentBlock: additionalParams.currentBlock,
+        contractsVersion: additionalParams.contractsVersion,
+        protectionCloseFactorWhitelist,
         // Price impact data
         pairDepthBands,
+        depthBandsMapping,
         oiWindowsSettings,
         oiWindows,
         // User/collateral specific
-        userPriceImpact, collateralPriceUsd: ((_h = collateral.prices) === null || _h === void 0 ? void 0 : _h.collateralPriceUsd) || 1 }, pairFactor);
+        userPriceImpact,
+        collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
+        // Pair factors (spread across the context)
+        ...pairFactor,
+    };
 };
 exports.buildCumulVolContext = buildCumulVolContext;

package/lib/trade/priceImpact/cumulVol/index.d.ts

@@ -57,7 +57,7 @@ export declare const getLegacyFactor: (context: CumulVolContext | undefined) =>
  * @param context Additional context with depths, OI data, and factors
  * @returns Cumulative volume price impact percentage (not including spread)
  */
-export declare const getTradeCumulVolPriceImpactP: (trader: string, pairIndex: number, long: boolean, tradeOpenInterestUsd: number, isPnlPositive: boolean, open: boolean, lastPosIncreaseBlock: number, context: CumulVolContext) => number;
+export declare const getTradeCumulVolPriceImpactP: (_trader: string, _pairIndex: number, long: boolean, tradeOpenInterestUsd: number, isPnlPositive: boolean, open: boolean, lastPosIncreaseBlock: number, context: CumulVolContext) => number;
 /**
  * @dev Gets the fixed spread percentage with direction
  * @dev Mirrors contract's getFixedSpreadP function
@@ -90,7 +90,7 @@ export declare const getSpreadP: (pairSpreadP: number | undefined, isLiquidation
  * @param context Additional context for the calculation
  * @returns Total spread + cumulative volume price impact percentage
  */
-export declare const getSpreadWithCumulVolPriceImpactP: (pairSpreadP: number, buy: boolean, collateral: number, leverage: number, oiWindowsSettings?: OiWindowsSettings | undefined, oiWindows?: OiWindows | undefined, context?: CumulVolContext | undefined) => number;
+export declare const getSpreadWithCumulVolPriceImpactP: (pairSpreadP: number, buy: boolean, collateral: number, leverage: number, context: CumulVolContext) => number;
 /**
  * @dev Convenience function for calculating cumulative volume price impact
  * @dev Uses collateral and leverage instead of USD position size
@@ -104,6 +104,6 @@ export declare const getSpreadWithCumulVolPriceImpactP: (pairSpreadP: number, bu
 export declare const getCumulVolPriceImpact: (buy: boolean, collateral: number, leverage: number, open: boolean, context: CumulVolContext & {
     collateralPriceUsd: number;
 }) => number;
-export declare const getSpreadWithPriceImpactP: (pairSpreadP: number, buy: boolean, collateral: number, leverage: number, oiWindowsSettings?: OiWindowsSettings | undefined, oiWindows?: OiWindows | undefined, context?: CumulVolContext | undefined) => number;
+export declare const getSpreadWithPriceImpactP: (pairSpreadP: number, buy: boolean, collateral: number, leverage: number, context: CumulVolContext) => number;
 export { convertOiWindowsSettings, convertOiWindow, convertOiWindows, convertOiWindowsSettingsArray, } from "./converter";
 export { buildCumulVolContext } from "./builder";