@gainsnetwork/sdk 1.3.0-rc4 → 1.3.0-rc7

package/lib/contracts/utils/pairs.js

@@ -1,26 +1,17 @@
 "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;
 /* 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 = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchPairs = async (contracts, pairIxs) => {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
-        const pairs = yield Promise.all(pairIxs.map(pairIndex => multiCollatContract.pairs(pairIndex)));
+        const pairs = await Promise.all(pairIxs.map(pairIndex => multiCollatContract.pairs(pairIndex)));
         return pairs.map((pair, index) => {
             return {
                 name: pair.from + "/" + pair.to,
@@ -38,9 +29,9 @@ const fetchPairs = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, fun
         console.error(`Unexpected error while fetching pairs!`);
         throw error;
     }
-});
+};
 exports.fetchPairs = fetchPairs;
-const fetchPairDepthBands = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchPairDepthBands = async (contracts, pairIxs) => {
     if (!contracts || pairIxs.length === 0) {
         return [];
     }
@@ -48,16 +39,16 @@ const fetchPairDepthBands = (contracts, pairIxs) => __awaiter(void 0, void 0, vo
     try {
         // Returns array of PairDepthBands structs (encoded slots)
         // Using quoted signature for overloaded function
-        const depthBands = yield multiCollatContract["getPairDepthBands(uint256[])"](pairIxs);
+        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 = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchPairDepthBandsDecoded = async (contracts, pairIxs) => {
     if (!contracts || pairIxs.length === 0) {
         return {
             totalDepthAboveUsd: [],
@@ -70,7 +61,7 @@ const fetchPairDepthBandsDecoded = (contracts, pairIxs) => __awaiter(void 0, voi
     try {
         // Returns decoded values
         // Using quoted signature for overloaded function
-        const [totalDepthAboveUsd, totalDepthBelowUsd, bandsAbove, bandsBelow] = yield multiCollatContract["getPairDepthBandsDecoded(uint256[])"](pairIxs);
+        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())),
@@ -82,16 +73,16 @@ const fetchPairDepthBandsDecoded = (contracts, pairIxs) => __awaiter(void 0, voi
         console.error(`Unexpected error while fetching decoded pair depth bands!`);
         throw error;
     }
-});
+};
 exports.fetchPairDepthBandsDecoded = fetchPairDepthBandsDecoded;
-const fetchDepthBandsMapping = (contracts) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchDepthBandsMapping = async (contracts) => {
     if (!contracts) {
         return { slot1: "0", slot2: "0" };
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
         // Returns two uint256 slots
-        const [slot1, slot2] = yield multiCollatContract.getDepthBandsMapping();
+        const [slot1, slot2] = await multiCollatContract.getDepthBandsMapping();
         return {
             slot1: slot1.toString(),
             slot2: slot2.toString(),
@@ -101,31 +92,31 @@ const fetchDepthBandsMapping = (contracts) => __awaiter(void 0, void 0, void 0,
         console.error(`Unexpected error while fetching depth bands mapping!`);
         throw error;
     }
-});
+};
 exports.fetchDepthBandsMapping = fetchDepthBandsMapping;
-const fetchDepthBandsMappingDecoded = (contracts) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchDepthBandsMappingDecoded = async (contracts) => {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
         // Returns array of 30 uint16 values
-        const bands = yield multiCollatContract.getDepthBandsMappingDecoded();
+        const bands = await multiCollatContract.getDepthBandsMappingDecoded();
         return bands.map((b) => parseInt(b.toString()));
     }
     catch (error) {
         console.error(`Unexpected error while fetching decoded depth bands mapping!`);
         throw error;
     }
-});
+};
 exports.fetchDepthBandsMappingDecoded = fetchDepthBandsMappingDecoded;
-const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchFees = async (contracts, feeIxs) => {
     if (!contracts) {
         return [];
     }
     const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
     try {
-        const fees = yield Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
+        const fees = await Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
         return fees.map(fee => {
             return {
                 totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP.toString()) / 1e12,
@@ -139,13 +130,13 @@ const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, funct
         console.error(`Unexpected error while fetching pairs!`);
         throw error;
     }
-});
+};
 exports.fetchFees = fetchFees;
-const fetchOpenInterest = (contracts, collateralIndex, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchOpenInterest = async (contracts, collateralIndex, pairIxs) => {
     if (pairIxs.length === 0) {
         return [];
     }
-    const openInterests = (yield contracts.gnsMultiCollatDiamond.getAllBorrowingPairs(collateralIndex))[1];
+    const openInterests = (await contracts.gnsMultiCollatDiamond.getAllBorrowingPairs(collateralIndex))[1];
     return pairIxs.map(pairIndex => {
         const openInterest = openInterests[pairIndex];
         if (!openInterest) {
@@ -157,7 +148,7 @@ const fetchOpenInterest = (contracts, collateralIndex, pairIxs) => __awaiter(voi
             max: parseFloat(openInterest[2].toString()) / 1e10,
         };
     });
-});
+};
 exports.fetchOpenInterest = fetchOpenInterest;
 const getPairDescription = (pairIndex) => {
     return PAIR_INDEX_TO_DESCRIPTION[pairIndex] || "";
@@ -578,4 +569,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/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 === null || pair === void 0 ? void 0 : pair.groupIndex;
+    const groupIndex = 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 === null || pairMaxLeverages === void 0 ? void 0 : pairMaxLeverages[pairIndex],
-        counterTradeSettings: counterTradeSettings === null || counterTradeSettings === void 0 ? void 0 : counterTradeSettings[pairIndex],
+        pairMaxLeverage: pairMaxLeverages?.[pairIndex],
+        counterTradeSettings: counterTradeSettings?.[pairIndex],
     };
 };
 exports.buildMarketLeverageRestrictionsContext = buildMarketLeverageRestrictionsContext;

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

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

package/lib/markets/price/index.js

@@ -20,3 +20,4 @@ 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,3 +21,30 @@ 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/pricing/depthBands.d.ts

@@ -32,7 +32,7 @@ export declare function encodeDepthBandsMapping(bands: number[]): {
 };
 /**
  * Decode depth bands mapping from two uint256 slots
- * @param slot1 First slot containing bands 0-13
+ * @param slot1 First slot containing bands 0-13 (starting at bit 32, first 32 bits unused)
  * @param slot2 Second slot containing bands 14-29
  * @returns Array of band offset values in ppm
  */

package/lib/pricing/depthBands.js

@@ -56,10 +56,11 @@ exports.decodeDepthBands = decodeDepthBands;
  * @returns Two slots as bigints
  */
 function encodeDepthBandsMapping(bands) {
-    // Pack slot1: bands 0-13 (14 * 16 bits)
+    // Pack slot1: bands 0-13 (starting at bit 32, first 32 bits unused)
     let slot1 = BigInt(0);
     for (let i = 0; i < DEPTH_BANDS_PER_SLOT1; i++) {
-        slot1 |= BigInt(bands[i]) << BigInt(i * 16);
+        const shift = 32 + i * 16; // Start at bit 32 to match contract
+        slot1 |= BigInt(bands[i]) << BigInt(shift);
     }
     // Pack slot2: bands 14-29 (16 * 16 bits)
     let slot2 = BigInt(0);
@@ -72,15 +73,16 @@ function encodeDepthBandsMapping(bands) {
 exports.encodeDepthBandsMapping = encodeDepthBandsMapping;
 /**
  * Decode depth bands mapping from two uint256 slots
- * @param slot1 First slot containing bands 0-13
+ * @param slot1 First slot containing bands 0-13 (starting at bit 32, first 32 bits unused)
  * @param slot2 Second slot containing bands 14-29
  * @returns Array of band offset values in ppm
  */
 function decodeDepthBandsMapping(slot1, slot2) {
     const bands = [];
-    // Extract bands 0-13 from slot1
+    // Extract bands 0-13 from slot1 (skip first 32 bits which are unused for mappings)
     for (let i = 0; i < DEPTH_BANDS_PER_SLOT1; i++) {
-        bands.push(Number((slot1 >> BigInt(i * 16)) & BigInt(0xffff)));
+        const shift = 32 + i * 16; // Start at bit 32, not bit 0
+        bands.push(Number((slot1 >> BigInt(shift)) & BigInt(0xffff)));
     }
     // Extract bands 14-29 from slot2
     for (let i = DEPTH_BANDS_PER_SLOT1; i < DEPTH_BANDS_COUNT; i++) {

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

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

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

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

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

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

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

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

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

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

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

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchBorrowingV2DataForPairs = exports.createBorrowingV2ContextFromArrays = exports.createBorrowingV2ContextFromContract = exports.fetchAllBorrowingV2Data = exports.fetchPairPendingAccBorrowingFeesV2 = exports.fetchTradeBorrowingFeesCollateralV2 = exports.fetchPairBorrowingFeeDataV2 = exports.fetchBorrowingFeeParamsV2 = void 0;
 const converter_1 = require("./converter");
@@ -18,19 +9,19 @@ const converter_1 = require("./converter");
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to array of borrowing fee parameters
  */
-const fetchBorrowingFeeParamsV2 = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchBorrowingFeeParamsV2 = async (contract, collateralIndices, pairIndices) => {
     if (collateralIndices.length !== pairIndices.length) {
         throw new Error("Collateral indices and pair indices arrays must have the same length");
     }
     try {
-        const contractParams = yield contract.getPairBorrowingFeeParams(collateralIndices, pairIndices);
+        const contractParams = await contract.getPairBorrowingFeeParams(collateralIndices, pairIndices);
         return (0, converter_1.convertBorrowingFeeParamsArray)(contractParams);
     }
     catch (error) {
         console.error("Error fetching borrowing fee params v2:", error);
         throw error;
     }
-});
+};
 exports.fetchBorrowingFeeParamsV2 = fetchBorrowingFeeParamsV2;
 /**
  * @dev Fetches pair borrowing fee data v2 for specific pairs
@@ -39,19 +30,19 @@ exports.fetchBorrowingFeeParamsV2 = fetchBorrowingFeeParamsV2;
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to array of pair borrowing fee data
  */
-const fetchPairBorrowingFeeDataV2 = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchPairBorrowingFeeDataV2 = async (contract, collateralIndices, pairIndices) => {
     if (collateralIndices.length !== pairIndices.length) {
         throw new Error("Collateral indices and pair indices arrays must have the same length");
     }
     try {
-        const contractData = yield contract.getPairBorrowingFeeData(collateralIndices, pairIndices);
+        const contractData = await contract.getPairBorrowingFeeData(collateralIndices, pairIndices);
         return (0, converter_1.convertPairBorrowingFeeDataArray)(contractData);
     }
     catch (error) {
         console.error("Error fetching pair borrowing fee data v2:", error);
         throw error;
     }
-});
+};
 exports.fetchPairBorrowingFeeDataV2 = fetchPairBorrowingFeeDataV2;
 /**
  * @dev Fetches borrowing fees in collateral tokens for a specific trade
@@ -61,9 +52,9 @@ exports.fetchPairBorrowingFeeDataV2 = fetchPairBorrowingFeeDataV2;
  * @param currentPairPrice Current price of the trading pair (1e6 precision)
  * @returns Promise resolving to borrowing fees in collateral tokens
  */
-const fetchTradeBorrowingFeesCollateralV2 = (contract, trader, index, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchTradeBorrowingFeesCollateralV2 = async (contract, trader, index, currentPairPrice) => {
     try {
-        const feesCollateral = yield contract.getTradeBorrowingFeesCollateral(trader, index, currentPairPrice);
+        const feesCollateral = await contract.getTradeBorrowingFeesCollateral(trader, index, currentPairPrice);
         // Convert BigNumber to normalized float
         // Note: Collateral precision varies by chain, but contract returns proper precision
         return parseFloat(feesCollateral.toString());
@@ -72,7 +63,7 @@ const fetchTradeBorrowingFeesCollateralV2 = (contract, trader, index, currentPai
         console.error("Error fetching trade borrowing fees collateral v2:", error);
         throw error;
     }
-});
+};
 exports.fetchTradeBorrowingFeesCollateralV2 = fetchTradeBorrowingFeesCollateralV2;
 /**
  * @dev Fetches pending accumulated borrowing fees for a specific pair
@@ -82,9 +73,9 @@ exports.fetchTradeBorrowingFeesCollateralV2 = fetchTradeBorrowingFeesCollateralV
  * @param currentPairPrice Current price of the trading pair (1e6 precision)
  * @returns Promise resolving to pending accumulated borrowing fee
  */
-const fetchPairPendingAccBorrowingFeesV2 = (contract, collateralIndex, pairIndex, currentPairPrice) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchPairPendingAccBorrowingFeesV2 = async (contract, collateralIndex, pairIndex, currentPairPrice) => {
     try {
-        const accBorrowingFeeP = yield contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
+        const accBorrowingFeeP = await contract.getPairPendingAccBorrowingFees(collateralIndex, pairIndex, currentPairPrice);
         // Convert BigNumber to normalized float
         return parseFloat(accBorrowingFeeP.toString()) / 1e20;
     }
@@ -92,7 +83,7 @@ const fetchPairPendingAccBorrowingFeesV2 = (contract, collateralIndex, pairIndex
         console.error("Error fetching pair pending acc borrowing fees v2:", error);
         throw error;
     }
-});
+};
 exports.fetchPairPendingAccBorrowingFeesV2 = fetchPairPendingAccBorrowingFeesV2;
 /**
  * @dev Convenience function to fetch all borrowing v2 data for specific pairs
@@ -101,11 +92,11 @@ exports.fetchPairPendingAccBorrowingFeesV2 = fetchPairPendingAccBorrowingFeesV2;
  * @param pairIndices Array of pair indices
  * @returns Promise resolving to complete borrowing v2 data set
  */
-const fetchAllBorrowingV2Data = (contract, collateralIndex, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchAllBorrowingV2Data = async (contract, collateralIndex, pairIndices) => {
     const collateralIndices = new Array(pairIndices.length).fill(collateralIndex);
     try {
         // Fetch both parameters and data in parallel
-        const [params, data] = yield Promise.all([
+        const [params, data] = await Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -117,7 +108,7 @@ const fetchAllBorrowingV2Data = (contract, collateralIndex, pairIndices) => __aw
         console.error("Error fetching all borrowing v2 data:", error);
         throw error;
     }
-});
+};
 exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
 /**
  * @dev Creates a complete borrowing v2 context from contract data
@@ -127,10 +118,13 @@ exports.fetchAllBorrowingV2Data = fetchAllBorrowingV2Data;
  * @param currentTimestamp Optional current timestamp for calculations
  * @returns Promise resolving to complete borrowing v2 context
  */
-const createBorrowingV2ContextFromContract = (contract, collateralIndex, pairIndices, currentTimestamp) => __awaiter(void 0, void 0, void 0, function* () {
-    const { context } = yield (0, exports.fetchAllBorrowingV2Data)(contract, collateralIndex, pairIndices);
-    return Object.assign(Object.assign({}, context), { currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000) });
-});
+const createBorrowingV2ContextFromContract = async (contract, collateralIndex, pairIndices, currentTimestamp) => {
+    const { context } = await (0, exports.fetchAllBorrowingV2Data)(contract, collateralIndex, pairIndices);
+    return {
+        ...context,
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
+    };
+};
 exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContract;
 /**
  * @dev Helper function to create context from already fetched arrays
@@ -143,7 +137,7 @@ exports.createBorrowingV2ContextFromContract = createBorrowingV2ContextFromContr
  */
 const createBorrowingV2ContextFromArrays = (collateralIndices, pairIndices, params, data, currentTimestamp) => {
     const context = {
-        currentTimestamp: currentTimestamp !== null && currentTimestamp !== void 0 ? currentTimestamp : Math.floor(Date.now() / 1000),
+        currentTimestamp: currentTimestamp ?? Math.floor(Date.now() / 1000),
         borrowingParams: {},
         borrowingData: {},
     };
@@ -164,13 +158,13 @@ exports.createBorrowingV2ContextFromArrays = createBorrowingV2ContextFromArrays;
  * @param pairIndices Array of pair indices (must match collateralIndices length)
  * @returns Promise resolving to complete borrowing v2 context
  */
-const fetchBorrowingV2DataForPairs = (contract, collateralIndices, pairIndices) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchBorrowingV2DataForPairs = async (contract, collateralIndices, pairIndices) => {
     if (collateralIndices.length !== pairIndices.length) {
         throw new Error("Collateral indices and pair indices arrays must have the same length");
     }
     try {
         // Fetch both parameters and data in parallel
-        const [params, data] = yield Promise.all([
+        const [params, data] = await Promise.all([
             (0, exports.fetchBorrowingFeeParamsV2)(contract, collateralIndices, pairIndices),
             (0, exports.fetchPairBorrowingFeeDataV2)(contract, collateralIndices, pairIndices),
         ]);
@@ -181,5 +175,5 @@ const fetchBorrowingV2DataForPairs = (contract, collateralIndices, pairIndices)
         console.error("Error fetching borrowing v2 data for pairs:", error);
         throw error;
     }
-});
+};
 exports.fetchBorrowingV2DataForPairs = fetchBorrowingV2DataForPairs;

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

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