@gainsnetwork/sdk 1.3.0-rc6 → 1.4.0-rc1

package/lib/contracts/utils/borrowingFees.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.fetchAllPairAndGroupBorrowingFees = exports.fetchGroupBorrowingFees = exports.fetchAllPairBorrowingFees = exports.getBorrowingGroupName = void 0;
 const trade_1 = require("../../trade");
@@ -22,22 +31,24 @@ const getBorrowingGroupName = (groupIndex) => {
     return groupNamesByIndex[groupIndex - 1] || "Unknown";
 };
 exports.getBorrowingGroupName = getBorrowingGroupName;
-const fetchAllPairBorrowingFees = async (contract, collateralIndex) => {
-    const [pairs, pairOi, pairGroups] = await contract.getAllBorrowingPairs(collateralIndex);
-    const feeCaps = await contract.getBorrowingPairFeePerBlockCaps(collateralIndex, [...Array(pairs.length).keys()]);
+const fetchAllPairBorrowingFees = (contract, collateralIndex) => __awaiter(void 0, void 0, void 0, function* () {
+    const [pairs, pairOi, pairGroups] = yield contract.getAllBorrowingPairs(collateralIndex);
+    const feeCaps = yield contract.getBorrowingPairFeePerBlockCaps(collateralIndex, [...Array(pairs.length).keys()]);
     return (0, trade_1.convertPairBorrowingFees)([pairs, pairOi, pairGroups, feeCaps]);
-};
+});
 exports.fetchAllPairBorrowingFees = fetchAllPairBorrowingFees;
-const fetchGroupBorrowingFees = async (contract, collateralIndex, groupIxs) => (0, trade_1.convertGroupBorrowingFees)(await contract.getBorrowingGroups(collateralIndex, groupIxs));
+const fetchGroupBorrowingFees = (contract, collateralIndex, groupIxs) => __awaiter(void 0, void 0, void 0, function* () {
+    return (0, trade_1.convertGroupBorrowingFees)(yield contract.getBorrowingGroups(collateralIndex, groupIxs));
+});
 exports.fetchGroupBorrowingFees = fetchGroupBorrowingFees;
-const fetchAllPairAndGroupBorrowingFees = async (contract, collateralIndex) => {
-    const pairs = await (0, exports.fetchAllPairBorrowingFees)(contract, collateralIndex);
+const fetchAllPairAndGroupBorrowingFees = (contract, collateralIndex) => __awaiter(void 0, void 0, void 0, function* () {
+    const pairs = yield (0, exports.fetchAllPairBorrowingFees)(contract, collateralIndex);
     const groupIxs = [
         ...new Set(pairs
             .map(value => value.groups.map(value => value.groupIndex))
             .reduce((acc, value) => acc.concat(value), [])),
     ].sort((a, b) => a - b);
-    const groups = await (0, exports.fetchGroupBorrowingFees)(contract, collateralIndex, groupIxs);
+    const groups = yield (0, exports.fetchGroupBorrowingFees)(contract, collateralIndex, groupIxs);
     return { pairs, groups };
-};
+});
 exports.fetchAllPairAndGroupBorrowingFees = fetchAllPairAndGroupBorrowingFees;

package/lib/contracts/utils/openTrades.js

@@ -1,11 +1,20 @@
 "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.fetchOpenPairTradesRaw = exports.fetchOpenPairTrades = void 0;
 const ethcall_1 = require("ethcall");
 const trade_1 = require("../../trade");
-const fetchOpenPairTrades = async (contracts, overrides = {}) => {
-    const rawTrades = await (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
-    const collaterals = await contracts.gnsMultiCollatDiamond.getCollaterals();
+const fetchOpenPairTrades = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    const rawTrades = yield (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
+    const collaterals = yield contracts.gnsMultiCollatDiamond.getCollaterals();
     const collateralConfigs = collaterals.map(c => ({
         collateral: c.collateral,
         isActive: c.isActive,
@@ -13,10 +22,10 @@ const fetchOpenPairTrades = async (contracts, overrides = {}) => {
         precisionDelta: parseFloat(c.precisionDelta.toString()),
     }));
     return rawTrades.map(rawTrade => _prepareTradeContainer(rawTrade.trade, rawTrade.tradeInfo, rawTrade.liquidationParams, rawTrade.initialAccFees, rawTrade.tradeFeesData, rawTrade.uiRealizedPnlData, collateralConfigs[parseInt(rawTrade.trade.collateralIndex.toString()) - 1]));
-};
+});
 exports.fetchOpenPairTrades = fetchOpenPairTrades;
 // @todo rename
-const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
+const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
     if (!contracts) {
         return [];
     }
@@ -30,13 +39,13 @@ const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
             ]),
         };
         if (useMulticall) {
-            await multicallCtx.provider.init(multiCollatDiamondContract.provider);
+            yield multicallCtx.provider.init(multiCollatDiamondContract.provider);
         }
         let allOpenPairTrades = [];
         let running = true;
         let offset = 0;
         while (running) {
-            const [trades, tradeInfos, tradeLiquidationParams] = await Promise.all([
+            const [trades, tradeInfos, tradeLiquidationParams] = yield Promise.all([
                 multiCollatDiamondContract.getAllTrades(offset, offset + batchSize),
                 multiCollatDiamondContract.getAllTradeInfos(offset, offset + batchSize),
                 multiCollatDiamondContract.getAllTradesLiquidationParams(offset, offset + batchSize),
@@ -76,7 +85,7 @@ const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
                     uiRealizedPnlData: undefined,
                 };
             });
-            const [tradeFeesData, uiRealizedPnlData] = await Promise.all([
+            const [tradeFeesData, uiRealizedPnlData] = yield Promise.all([
                 multiCollatDiamondContract.getTradeFeesDataArray(...fundingFeesCallParams),
                 includeUIRealizedPnlData
                     ? multiCollatDiamondContract.getTradeUiRealizedPnlDataArray(...fundingFeesCallParams)
@@ -91,13 +100,13 @@ const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
                 .map(({ collateralIndex, user, index }) => (useMulticall
                 ? multicallCtx.diamond
                 : multiCollatDiamondContract).getBorrowingInitialAccFees(collateralIndex, user, index));
-            const initialAccFees = await (useMulticall
+            const initialAccFees = yield (useMulticall
                 ? multicallCtx.provider.all(initialAccFeesPromises)
                 : Promise.all(initialAccFeesPromises));
             initialAccFees.forEach((accFees, ix) => {
                 openTrades[ix].initialAccFees = accFees;
                 openTrades[ix].tradeFeesData = tradeFeesData[ix];
-                openTrades[ix].uiRealizedPnlData = uiRealizedPnlData?.[ix];
+                openTrades[ix].uiRealizedPnlData = uiRealizedPnlData === null || uiRealizedPnlData === void 0 ? void 0 : uiRealizedPnlData[ix];
             });
             allOpenPairTrades = allOpenPairTrades.concat(openTrades);
             offset += batchSize + 1;
@@ -110,7 +119,7 @@ const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
         console.error(`Unexpected error while fetching open pair trades!`);
         throw error;
     }
-};
+});
 exports.fetchOpenPairTradesRaw = fetchOpenPairTradesRaw;
 const _prepareTradeContainer = (trade, tradeInfo, tradeLiquidationParams, tradeInitialAccFees, tradeFeesData, uiRealizedPnlData, collateralConfig) => {
     const precision = collateralConfig.precision;

package/lib/contracts/utils/pairs.d.ts

@@ -1,18 +1,7 @@
-import { Pair, Fee, OpenInterest, PairIndex } from "../../trade/types";
+import { Pair, Fee, OpenInterest, PairDepth, PairIndex } from "../../trade/types";
 import { Contracts } from "../../contracts/types";
 export declare const fetchPairs: (contracts: Contracts, pairIxs: PairIndex[]) => Promise<Pair[]>;
-export declare const fetchPairDepthBands: (contracts: Contracts, pairIxs: number[]) => Promise<any[]>;
-export declare const fetchPairDepthBandsDecoded: (contracts: Contracts, pairIxs: number[]) => Promise<{
-    totalDepthAboveUsd: number[];
-    totalDepthBelowUsd: number[];
-    bandsAbove: number[][];
-    bandsBelow: number[][];
-}>;
-export declare const fetchDepthBandsMapping: (contracts: Contracts) => Promise<{
-    slot1: string;
-    slot2: string;
-}>;
-export declare const fetchDepthBandsMappingDecoded: (contracts: Contracts) => Promise<number[]>;
+export declare const fetchPairDepths: (contracts: Contracts, pairIxs: number[]) => Promise<PairDepth[]>;
 export declare const fetchFees: (contracts: Contracts, feeIxs: PairIndex[]) => Promise<Fee[]>;
 export declare const fetchOpenInterest: (contracts: Contracts, collateralIndex: number, pairIxs: number[]) => Promise<OpenInterest[]>;
 export declare const getPairDescription: (pairIndex: PairIndex) => string;

package/lib/contracts/utils/pairs.js

@@ -1,17 +1,26 @@
 "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.getPairDescription = exports.fetchOpenInterest = exports.fetchFees = exports.fetchDepthBandsMappingDecoded = exports.fetchDepthBandsMapping = exports.fetchPairDepthBandsDecoded = exports.fetchPairDepthBands = exports.fetchPairs = void 0;
+exports.getPairDescription = exports.fetchOpenInterest = exports.fetchFees = exports.fetchPairDepths = exports.fetchPairs = void 0;
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 const types_1 = require("../../trade/types");
-const fetchPairs = async (contracts, pairIxs) => {
+const fetchPairs = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
-        const pairs = await Promise.all(pairIxs.map(pairIndex => multiCollatContract.pairs(pairIndex)));
+        const pairs = yield Promise.all(pairIxs.map(pairIndex => multiCollatContract.pairs(pairIndex)));
         return pairs.map((pair, index) => {
             return {
                 name: pair.from + "/" + pair.to,
@@ -29,94 +38,35 @@ const fetchPairs = async (contracts, pairIxs) => {
         console.error(`Unexpected error while fetching pairs!`);
         throw error;
     }
-};
+});
 exports.fetchPairs = fetchPairs;
-const fetchPairDepthBands = async (contracts, pairIxs) => {
-    if (!contracts || pairIxs.length === 0) {
-        return [];
-    }
-    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
-    try {
-        // Returns array of PairDepthBands structs (encoded slots)
-        // Using quoted signature for overloaded function
-        const depthBands = await multiCollatContract["getPairDepthBands(uint256[])"](pairIxs);
-        return depthBands;
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching pair depth bands!`);
-        throw error;
-    }
-};
-exports.fetchPairDepthBands = fetchPairDepthBands;
-const fetchPairDepthBandsDecoded = async (contracts, pairIxs) => {
-    if (!contracts || pairIxs.length === 0) {
-        return {
-            totalDepthAboveUsd: [],
-            totalDepthBelowUsd: [],
-            bandsAbove: [],
-            bandsBelow: [],
-        };
-    }
-    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
-    try {
-        // Returns decoded values
-        // Using quoted signature for overloaded function
-        const [totalDepthAboveUsd, totalDepthBelowUsd, bandsAbove, bandsBelow] = await multiCollatContract["getPairDepthBandsDecoded(uint256[])"](pairIxs);
-        return {
-            totalDepthAboveUsd: totalDepthAboveUsd.map((v) => parseFloat(v.toString())),
-            totalDepthBelowUsd: totalDepthBelowUsd.map((v) => parseFloat(v.toString())),
-            bandsAbove: bandsAbove.map((bands) => bands.map((b) => parseInt(b.toString()))),
-            bandsBelow: bandsBelow.map((bands) => bands.map((b) => parseInt(b.toString()))),
-        };
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching decoded pair depth bands!`);
-        throw error;
-    }
-};
-exports.fetchPairDepthBandsDecoded = fetchPairDepthBandsDecoded;
-const fetchDepthBandsMapping = async (contracts) => {
-    if (!contracts) {
-        return { slot1: "0", slot2: "0" };
-    }
-    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
-    try {
-        // Returns two uint256 slots
-        const [slot1, slot2] = await multiCollatContract.getDepthBandsMapping();
-        return {
-            slot1: slot1.toString(),
-            slot2: slot2.toString(),
-        };
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching depth bands mapping!`);
-        throw error;
-    }
-};
-exports.fetchDepthBandsMapping = fetchDepthBandsMapping;
-const fetchDepthBandsMappingDecoded = async (contracts) => {
+const fetchPairDepths = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
-        // Returns array of 30 uint16 values
-        const bands = await multiCollatContract.getDepthBandsMappingDecoded();
-        return bands.map((b) => parseInt(b.toString()));
+        const pairParams = yield multiCollatContract.getPairDepths(pairIxs);
+        return pairParams.map(pair => {
+            return {
+                onePercentDepthAboveUsd: parseFloat(pair.onePercentDepthAboveUsd.toString()),
+                onePercentDepthBelowUsd: parseFloat(pair.onePercentDepthBelowUsd.toString()),
+            };
+        });
     }
     catch (error) {
-        console.error(`Unexpected error while fetching decoded depth bands mapping!`);
+        console.error(`Unexpected error while fetching pairs!`);
         throw error;
     }
-};
-exports.fetchDepthBandsMappingDecoded = fetchDepthBandsMappingDecoded;
-const fetchFees = async (contracts, feeIxs) => {
+});
+exports.fetchPairDepths = fetchPairDepths;
+const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, function* () {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
-        const fees = await Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
+        const fees = yield Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
         return fees.map(fee => {
             return {
                 totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP.toString()) / 1e12,
@@ -130,13 +80,13 @@ const fetchFees = async (contracts, feeIxs) => {
         console.error(`Unexpected error while fetching pairs!`);
         throw error;
     }
-};
+});
 exports.fetchFees = fetchFees;
-const fetchOpenInterest = async (contracts, collateralIndex, pairIxs) => {
+const fetchOpenInterest = (contracts, collateralIndex, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
     if (pairIxs.length === 0) {
         return [];
     }
-    const openInterests = (await contracts.gnsMultiCollatDiamond.getAllBorrowingPairs(collateralIndex))[1];
+    const openInterests = (yield contracts.gnsMultiCollatDiamond.getAllBorrowingPairs(collateralIndex))[1];
     return pairIxs.map(pairIndex => {
         const openInterest = openInterests[pairIndex];
         if (!openInterest) {
@@ -148,7 +98,7 @@ const fetchOpenInterest = async (contracts, collateralIndex, pairIxs) => {
             max: parseFloat(openInterest[2].toString()) / 1e10,
         };
     });
-};
+});
 exports.fetchOpenInterest = fetchOpenInterest;
 const getPairDescription = (pairIndex) => {
     return PAIR_INDEX_TO_DESCRIPTION[pairIndex] || "";
@@ -569,4 +519,8 @@ const PAIR_INDEX_TO_DESCRIPTION = {
     [types_1.PairIndex.BGSCUSD]: "BugsCoin to US Dollar",
     [types_1.PairIndex.TAGUSD]: "TAGGER to US Dollar",
     [types_1.PairIndex.WLFIUSD]: "World Liberty Financial to US Dollar",
+    [types_1.PairIndex.ASTERUSD]: "Aster to US Dollar",
+    [types_1.PairIndex.OKBUSD]: "OKB to US Dollar",
+    [types_1.PairIndex.CROUSD]: "Cronos to US Dollar",
+    [types_1.PairIndex.SKYUSD]: "SKy to US Dollar",
 };

package/lib/index.d.ts

@@ -5,6 +5,5 @@ export * from "./constants";
 export * from "./utils";
 export * from "./vault";
 export * from "./backend";
-export * from "./pricing";
 export * from "./trade/fees/borrowing/index";
 export { ContractsVersion } from "./contracts/types";

package/lib/index.js

@@ -22,7 +22,6 @@ __exportStar(require("./constants"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./vault"), exports);
 __exportStar(require("./backend"), exports);
-__exportStar(require("./pricing"), exports);
 // Not sure why this is needed, but it is. Barrel imports are not working.
 __exportStar(require("./trade/fees/borrowing/index"), exports);
 // Export ContractsVersion for frontend usage

package/lib/markets/forex.js

@@ -33,7 +33,7 @@ const isForexLowLiquidity = (timestampToCheck, pair) => {
     const hour = now.hour;
     const minute = now.minute;
     const isInDST = now.isInDST;
-    const groupIndex = pair?.groupIndex;
+    const groupIndex = pair === null || pair === void 0 ? void 0 : pair.groupIndex;
     if (groupIndex && extendedLowLiqGroupIds.includes(+groupIndex)) {
         return ((isInDST &&
             ((hour == 14 && minute >= 45) || (hour >= 15 && hour < 21))) ||

package/lib/markets/leverage/builder.js

@@ -18,8 +18,8 @@ const buildMarketLeverageRestrictionsContext = (globalTradingVariables, pairInde
     return {
         groupMinLeverage: group.minLeverage,
         groupMaxLeverage: group.maxLeverage,
-        pairMaxLeverage: pairMaxLeverages?.[pairIndex],
-        counterTradeSettings: counterTradeSettings?.[pairIndex],
+        pairMaxLeverage: pairMaxLeverages === null || pairMaxLeverages === void 0 ? void 0 : pairMaxLeverages[pairIndex],
+        counterTradeSettings: counterTradeSettings === null || counterTradeSettings === void 0 ? void 0 : counterTradeSettings[pairIndex],
     };
 };
 exports.buildMarketLeverageRestrictionsContext = buildMarketLeverageRestrictionsContext;

package/lib/markets/price/index.d.ts

@@ -4,4 +4,3 @@
 export * from "./types";
 export * from "./marketPrice";
 export * from "./builder";
-export * from "./signedPrices";

package/lib/markets/price/index.js

@@ -20,4 +20,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./marketPrice"), exports);
 __exportStar(require("./builder"), exports);
-__exportStar(require("./signedPrices"), exports);

package/lib/markets/price/types.d.ts

@@ -21,30 +21,3 @@ export type MarketPriceContext = {
         oiShortToken: number;
     };
 };
-/**
- * @dev Types for signed prices data structure
- */
-export type SignedPricesResponse = {
-    signedData: SignedPrices;
-    missingPrices: number[];
-};
-export type SignedPrices = {
-    signerId: number;
-    expiryTs: number;
-    fromBlock: number;
-    isLookback: boolean;
-    pairIndices: number[];
-    prices: Price[];
-    signature: string;
-};
-export type Price = {
-    open: string;
-    high: string;
-    low: string;
-    current: string;
-    ts: number;
-};
-export type Oracle = {
-    url: string;
-    key?: string;
-};

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

@@ -13,8 +13,9 @@ 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?.pairBorrowingFees || !collateral?.groupBorrowingFees) {
+    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairBorrowingFees) || !(collateral === null || collateral === void 0 ? void 0 : collateral.groupBorrowingFees)) {
         return undefined;
     }
     const pairs = collateral.pairBorrowingFees;
@@ -26,7 +27,7 @@ const buildBorrowingV1Context = (globalTradingVariables, collateralIndex, curren
         currentBlock,
         pairs,
         groups,
-        collateralPriceUsd: collateral.prices?.collateralPriceUsd || 1,
+        collateralPriceUsd: ((_a = collateral.prices) === null || _a === void 0 ? void 0 : _a.collateralPriceUsd) || 1,
         pairOis: collateral.pairOis,
     };
 };

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

@@ -14,11 +14,7 @@ const convertPairGroupBorrowingFee = (pairGroup) => ({
     block: pairGroup.block,
 });
 exports.convertPairGroupBorrowingFee = convertPairGroupBorrowingFee;
-const convertPairBorrowingFee = (pair, pairOi, pairGroup, feeCap) => ({
-    ...(0, exports.convertGroupBorrowingData)(pair, pairOi),
-    groups: pairGroup.map(value => (0, exports.convertPairGroupBorrowingFee)(value)),
-    feePerBlockCap: (0, exports.convertFeePerBlockCap)(feeCap),
-});
+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) }));
 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?.length > 0 ? pairGroups[0] : undefined;
+    const firstPairGroup = (pairGroups === null || pairGroups === void 0 ? void 0 : 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 * (netOi / maxOi) ** feeExponent
+        ? feePerBlock * blockDistance * Math.pow((netOi / maxOi), feeExponent)
         : 0;
 };
 const getFeePerBlockCaps = (cap) => {
     return {
-        minP: cap?.minP || 0,
-        maxP: cap?.maxP && cap.maxP > 0 ? cap.maxP : 1,
+        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,
     };
 };
 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 * (effectiveOi / max) ** val.feeExponent;
+    return val.feePerBlock * Math.pow((effectiveOi / max), val.feeExponent);
 };
 const getActiveFeePerBlock = (pair, group) => {
     const pairFeePerBlock = getBorrowingDataActiveFeePerBlock(pair);

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

@@ -5,12 +5,13 @@ 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?.pairBorrowingFeesV2) {
+    if (!(collateral === null || collateral === void 0 ? void 0 : collateral.pairBorrowingFeesV2)) {
         return undefined;
     }
-    const params = collateral.pairBorrowingFeesV2.params?.[pairIndex];
-    const data = collateral.pairBorrowingFeesV2.data?.[pairIndex];
+    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];
     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 ?? Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
         borrowingParams: {},
         borrowingData: {},
     };