@gainsnetwork/sdk 1.3.0-rc4 → 1.3.0-rc7

package/lib/backend/globalTrades/index.js

@@ -25,11 +25,11 @@ const transformGlobalTrades = (rawTrades, pairs, currentAddress, collaterals) =>
                 _allLimitOrders.set(t.trade.user, new Map());
             }
             const traderMap_all = _allLimitOrders.get(t.trade.user);
-            if ((traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.get(t.trade.pairIndex)) === undefined) {
-                traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.set(t.trade.pairIndex, new Map());
+            if (traderMap_all?.get(t.trade.pairIndex) === undefined) {
+                traderMap_all?.set(t.trade.pairIndex, new Map());
             }
-            const traderPairMap_all = traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.get(t.trade.pairIndex);
-            traderPairMap_all === null || traderPairMap_all === void 0 ? void 0 : traderPairMap_all.set(t.trade.index, t);
+            const traderPairMap_all = traderMap_all?.get(t.trade.pairIndex);
+            traderPairMap_all?.set(t.trade.index, t);
             if (t.trade.user.toUpperCase() !== currentAddress.toUpperCase()) {
                 continue;
             }
@@ -37,7 +37,7 @@ const transformGlobalTrades = (rawTrades, pairs, currentAddress, collaterals) =>
                 _limitOrders.set(t.trade.pairIndex, new Map());
             }
             const traderPairMap = _limitOrders.get(t.trade.pairIndex);
-            traderPairMap === null || traderPairMap === void 0 ? void 0 : traderPairMap.set(t.trade.index, t);
+            traderPairMap?.set(t.trade.index, t);
         }
         else {
             const t = r[s];
@@ -45,11 +45,11 @@ const transformGlobalTrades = (rawTrades, pairs, currentAddress, collaterals) =>
                 _allTrades.set(t.trade.user, new Map());
             }
             const traderMap_all = _allTrades.get(t.trade.user);
-            if ((traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.get(t.trade.pairIndex)) === undefined) {
-                traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.set(t.trade.pairIndex, new Map());
+            if (traderMap_all?.get(t.trade.pairIndex) === undefined) {
+                traderMap_all?.set(t.trade.pairIndex, new Map());
             }
-            const traderPairMap_all = traderMap_all === null || traderMap_all === void 0 ? void 0 : traderMap_all.get(t.trade.pairIndex);
-            traderPairMap_all === null || traderPairMap_all === void 0 ? void 0 : traderPairMap_all.set(t.trade.index, t);
+            const traderPairMap_all = traderMap_all?.get(t.trade.pairIndex);
+            traderPairMap_all?.set(t.trade.index, t);
             if (t.trade.user.toUpperCase() !== currentAddress.toUpperCase()) {
                 continue;
             }
@@ -57,7 +57,7 @@ const transformGlobalTrades = (rawTrades, pairs, currentAddress, collaterals) =>
                 _trades.set(t.trade.pairIndex, new Map());
             }
             const traderPairMap = _trades.get(t.trade.pairIndex);
-            traderPairMap === null || traderPairMap === void 0 ? void 0 : traderPairMap.set(t.trade.index, t);
+            traderPairMap?.set(t.trade.index, t);
         }
     }
     returnObject.trades = _trades;

package/lib/backend/tradingVariables/converter.js

@@ -6,38 +6,40 @@ Object.defineProperty(exports, "convertLiquidationParams", { enumerable: true, g
 const converter_1 = require("../../trade/priceImpact/skew/converter");
 const converter_2 = require("../../trade/priceImpact/cumulVol/converter");
 const depthBands_1 = require("../../pricing/depthBands");
-const convertFees = (fees) => fees === null || fees === void 0 ? void 0 : fees.map(fee => convertFee(fee));
+const convertFees = (fees) => fees?.map(fee => convertFee(fee));
 exports.convertFees = convertFees;
-const convertCollateral = (collateral) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-    return ({
-        pairBorrowingFees: ((_a = collateral.borrowingFees) === null || _a === void 0 ? void 0 : _a.v1) !== undefined
-            ? (0, exports.convertPairBorrowingFees)(collateral.borrowingFees.v1)
-            : [],
-        groupBorrowingFees: ((_b = collateral.borrowingFees) === null || _b === void 0 ? void 0 : _b.v1) !== undefined
-            ? (0, exports.convertGroupBorrowingFees)(collateral.borrowingFees.v1)
-            : [],
-        collateral: collateral.collateral,
-        collateralConfig: (0, exports.convertCollateralConfig)(collateral),
-        collateralIndex: collateral.collateralIndex,
-        gToken: collateral.gToken,
-        isActive: true,
-        prices: collateral.prices,
-        symbol: collateral.symbol,
-        pairBorrowingFeesV2: {
-            params: (0, __1.convertBorrowingFeeParamsArrayV2)((_d = (_c = collateral.borrowingFees) === null || _c === void 0 ? void 0 : _c.v2) === null || _d === void 0 ? void 0 : _d.pairParams),
-            data: (0, __1.convertPairBorrowingFeeDataArrayV2)((_f = (_e = collateral.borrowingFees) === null || _e === void 0 ? void 0 : _e.v2) === null || _f === void 0 ? void 0 : _f.pairData),
-        },
-        pairFundingFees: {
-            globalParams: (0, __1.convertPairGlobalParamsArray)((_g = collateral.fundingFees) === null || _g === void 0 ? void 0 : _g.pairGlobalParams),
-            params: (0, __1.convertFundingFeeParamsArray)((_h = collateral.fundingFees) === null || _h === void 0 ? void 0 : _h.pairParams),
-            data: (0, __1.convertPairFundingFeeDataArray)((_j = collateral.fundingFees) === null || _j === void 0 ? void 0 : _j.pairData),
-        },
-        pairOis: (0, __1.convertPairOiArray)(collateral.pairOis, parseInt(collateral.collateralConfig.precision)),
-        pairSkewDepths: (0, exports.convertPairSkewDepths)(collateral.pairSkewDepths),
-    });
-};
-const convertCollaterals = (collaterals) => collaterals === null || collaterals === void 0 ? void 0 : collaterals.map(collateral => convertCollateral(collateral));
+const convertCollateral = (collateral) => ({
+    pairBorrowingFees: collateral.borrowingFees?.v1 !== undefined
+        ? (0, exports.convertPairBorrowingFees)(collateral.borrowingFees.v1)
+        : [],
+    groupBorrowingFees: collateral.borrowingFees?.v1 !== undefined
+        ? (0, exports.convertGroupBorrowingFees)(collateral.borrowingFees.v1)
+        : [],
+    collateral: collateral.collateral,
+    collateralConfig: (0, exports.convertCollateralConfig)(collateral),
+    collateralIndex: collateral.collateralIndex,
+    gToken: collateral.gToken,
+    isActive: true,
+    prices: collateral.prices,
+    symbol: collateral.symbol,
+    pairBorrowingFeesV2: {
+        params: (0, __1.convertBorrowingFeeParamsArrayV2)(collateral.borrowingFees?.v2
+            ?.pairParams),
+        data: (0, __1.convertPairBorrowingFeeDataArrayV2)(collateral.borrowingFees?.v2
+            ?.pairData),
+    },
+    pairFundingFees: {
+        globalParams: (0, __1.convertPairGlobalParamsArray)(collateral.fundingFees
+            ?.pairGlobalParams),
+        params: (0, __1.convertFundingFeeParamsArray)(collateral.fundingFees
+            ?.pairParams),
+        data: (0, __1.convertPairFundingFeeDataArray)(collateral.fundingFees
+            ?.pairData),
+    },
+    pairOis: (0, __1.convertPairOiArray)(collateral.pairOis, parseInt(collateral.collateralConfig.precision)),
+    pairSkewDepths: (0, exports.convertPairSkewDepths)(collateral.pairSkewDepths),
+});
+const convertCollaterals = (collaterals) => collaterals?.map(collateral => convertCollateral(collateral));
 exports.convertCollaterals = convertCollaterals;
 const convertFee = (fee) => ({
     totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP) / 1e12,
@@ -45,18 +47,19 @@ const convertFee = (fee) => ({
     oraclePositionSizeFeeP: parseFloat(fee.oraclePositionSizeFeeP) / 1e12,
     minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd) / 1e3,
 });
-const convertOpenInterests = (interests) => interests === null || interests === void 0 ? void 0 : interests.map(interest => convertOpenInterest(interest));
+const convertOpenInterests = (interests) => interests?.map(interest => convertOpenInterest(interest));
 exports.convertOpenInterests = convertOpenInterests;
 const convertOpenInterest = (interest) => ({
     long: parseFloat(interest.beforeV10.long) / 1e10,
     short: parseFloat(interest.beforeV10.short) / 1e10,
     max: parseFloat(interest.beforeV10.max) / 1e10,
 });
-const convertPairDepthBands = (pairDepthBands) => (pairDepthBands === null || pairDepthBands === void 0 ? void 0 : pairDepthBands.map(bands => (0, converter_2.convertPairDepthBandsFromSlots)(BigInt(bands.aboveSlot1), BigInt(bands.aboveSlot2), BigInt(bands.belowSlot1), BigInt(bands.belowSlot2)))) || [];
+const convertPairDepthBands = (pairDepthBands) => pairDepthBands?.map(bands => (0, converter_2.convertPairDepthBandsFromSlots)(BigInt(bands.aboveSlot1), BigInt(bands.aboveSlot2), BigInt(bands.belowSlot1), BigInt(bands.belowSlot2))) || [];
 exports.convertPairDepthBands = convertPairDepthBands;
 const convertDepthBandsMapping = (mapping) => {
     // First decode the raw slots to get bands in basis points
     const bandsBps = (0, depthBands_1.decodeDepthBandsMapping)(BigInt(mapping.slot1), BigInt(mapping.slot2));
+    console.log("bandsBps", bandsBps);
     // Convert from basis points to 0-1 range
     return {
         bands: bandsBps.map(bps => bps / 10000),
@@ -69,7 +72,7 @@ const convertPairSkewDepths = (pairSkewDepths) => {
     return (0, converter_1.convertPairSkewDepths)(pairSkewDepths);
 };
 exports.convertPairSkewDepths = convertPairSkewDepths;
-const convertPairBorrowingFees = (pairParams) => pairParams === null || pairParams === void 0 ? void 0 : pairParams.pairs.map(pairParam => convertPairBorrowingFee(pairParam));
+const convertPairBorrowingFees = (pairParams) => pairParams?.pairs.map(pairParam => convertPairBorrowingFee(pairParam));
 exports.convertPairBorrowingFees = convertPairBorrowingFees;
 const convertPairGroupBorrowingFee = (pairParam) => ({
     groupIndex: parseInt(pairParam.groupIndex),
@@ -93,9 +96,9 @@ const convertPairBorrowingFee = (pairParams) => ({
         short: parseFloat(pairParams.oi.beforeV10.short) / 1e10 || 0,
     },
     feeExponent: parseInt(pairParams.feeExponent) || 0,
-    feePerBlockCap: (0, exports.convertFeePerBlockCap)(pairParams === null || pairParams === void 0 ? void 0 : pairParams.feePerBlockCap),
+    feePerBlockCap: (0, exports.convertFeePerBlockCap)(pairParams?.feePerBlockCap),
 });
-const convertGroupBorrowingFees = (pairParams) => pairParams === null || pairParams === void 0 ? void 0 : pairParams.groups.map(pairParam => convertGroupBorrowingFee(pairParam));
+const convertGroupBorrowingFees = (pairParams) => pairParams?.groups.map(pairParam => convertGroupBorrowingFee(pairParam));
 exports.convertGroupBorrowingFees = convertGroupBorrowingFees;
 const convertGroupBorrowingFee = (pairParams) => ({
     oi: {
@@ -109,14 +112,16 @@ const convertGroupBorrowingFee = (pairParams) => ({
     accLastUpdatedBlock: parseInt(pairParams.accLastUpdatedBlock),
     feeExponent: parseInt(pairParams.feeExponent) || 0,
 });
-const convertTradingGroups = (groups) => groups === null || groups === void 0 ? void 0 : groups.map(group => convertTradingGroup(group));
+const convertTradingGroups = (groups) => groups?.map(group => convertTradingGroup(group));
 exports.convertTradingGroups = convertTradingGroups;
 const convertTradingGroup = (group) => ({
     maxLeverage: parseFloat(group.maxLeverage) / 1e3,
     minLeverage: parseFloat(group.minLeverage) / 1e3,
     name: group.name,
 });
-const convertTradingPairs = (pairs) => pairs === null || pairs === void 0 ? void 0 : pairs.filter(pair => pair.from !== "").map((pair, index) => convertTradingPair(pair, index));
+const convertTradingPairs = (pairs) => pairs
+    ?.filter(pair => pair.from !== "")
+    .map((pair, index) => convertTradingPair(pair, index));
 exports.convertTradingPairs = convertTradingPairs;
 const convertTradingPair = (pair, index) => ({
     name: (0, exports.convertPairName)(pair),
@@ -128,7 +133,7 @@ const convertTradingPair = (pair, index) => ({
     groupIndex: parseInt(pair.groupIndex),
     spreadP: parseFloat(pair.spreadP) / 1e10,
 });
-const convertTradesAndLimitOrders = (allItems, collaterals) => allItems === null || allItems === void 0 ? void 0 : allItems.map(item => {
+const convertTradesAndLimitOrders = (allItems, collaterals) => allItems?.map(item => {
     return (0, exports.convertTradeContainer)(item, collaterals);
 });
 exports.convertTradesAndLimitOrders = convertTradesAndLimitOrders;
@@ -174,11 +179,10 @@ const convertPairFactor = (pairFactor) => ({
 });
 exports.convertPairFactor = convertPairFactor;
 const convertTrade = (trade, collaterals) => {
-    var _a;
     const { long, user } = trade;
     const collateralIndex = parseInt(trade.collateralIndex);
     const collateral = collaterals[collateralIndex - 1];
-    const decimals = ((_a = collateral === null || collateral === void 0 ? void 0 : collateral.collateralConfig) === null || _a === void 0 ? void 0 : _a.decimals) || 18;
+    const decimals = collateral?.collateralConfig?.decimals || 18;
     return {
         user,
         index: parseInt(trade.index),
@@ -188,7 +192,7 @@ const convertTrade = (trade, collaterals) => {
         isOpen: trade.isOpen,
         collateralIndex,
         tradeType: parseInt(trade.tradeType),
-        collateralAmount: parseFloat(trade.collateralAmount) / Math.pow(10, decimals),
+        collateralAmount: parseFloat(trade.collateralAmount) / 10 ** decimals,
         openPrice: parseFloat(trade.openPrice) / 1e10,
         sl: parseFloat(trade.sl) / 1e10,
         tp: parseFloat(trade.tp) / 1e10,
@@ -272,7 +276,7 @@ const convertPairOi = (collateral) => ({
 });
 exports.convertPairOi = convertPairOi;
 const convertOiWindows = (oiWindows) => {
-    return oiWindows === null || oiWindows === void 0 ? void 0 : oiWindows.map(pairWindows => {
+    return oiWindows?.map(pairWindows => {
         const converted = {};
         for (const [key, oiWindow] of Object.entries(pairWindows)) {
             converted[key] = (0, exports.convertPairOi)(oiWindow);
@@ -295,17 +299,14 @@ const convertCollateralConfig = (collateral) => ({
     decimals: collateral.collateralConfig.decimals,
 });
 exports.convertCollateralConfig = convertCollateralConfig;
-const convertFeeTiers = (feeTiersBackend) => {
-    var _a;
-    return ({
-        tiers: feeTiersBackend === null || feeTiersBackend === void 0 ? void 0 : feeTiersBackend.tiers.map(tier => ({
-            feeMultiplier: Number(tier.feeMultiplier) / 1e3,
-            pointsThreshold: parseFloat(tier.pointsThreshold),
-        })),
-        multipliers: ((_a = feeTiersBackend === null || feeTiersBackend === void 0 ? void 0 : feeTiersBackend.multipliers) === null || _a === void 0 ? void 0 : _a.map(mult => parseFloat(mult) / 1e3)) || [],
-        currentDay: (feeTiersBackend === null || feeTiersBackend === void 0 ? void 0 : feeTiersBackend.currentDay) || 0,
-    });
-};
+const convertFeeTiers = (feeTiersBackend) => ({
+    tiers: feeTiersBackend?.tiers.map(tier => ({
+        feeMultiplier: Number(tier.feeMultiplier) / 1e3,
+        pointsThreshold: parseFloat(tier.pointsThreshold),
+    })),
+    multipliers: feeTiersBackend?.multipliers?.map(mult => parseFloat(mult) / 1e3) || [],
+    currentDay: feeTiersBackend?.currentDay || 0,
+});
 exports.convertFeeTiers = convertFeeTiers;
 const convertTraderFeeTiers = (traderFeeTiers) => ({
     traderEnrollment: {
@@ -330,11 +331,11 @@ const convertGlobalTradeFeeParams = (fee) => ({
     gTokenFeeP: parseFloat(fee.gTokenFeeP) / 1e5,
 });
 exports.convertGlobalTradeFeeParams = convertGlobalTradeFeeParams;
-const convertMaxLeverages = (maxLeverages) => maxLeverages === null || maxLeverages === void 0 ? void 0 : maxLeverages.map(maxLeverage => parseFloat(maxLeverage) / 1e3);
+const convertMaxLeverages = (maxLeverages) => maxLeverages?.map(maxLeverage => parseFloat(maxLeverage) / 1e3);
 exports.convertMaxLeverages = convertMaxLeverages;
 const convertFeePerBlockCap = (feeCap) => ({
-    minP: (feeCap === null || feeCap === void 0 ? void 0 : feeCap.minP) ? parseFloat(feeCap.minP.toString()) / 1e3 / 100 : 0,
-    maxP: (feeCap === null || feeCap === void 0 ? void 0 : feeCap.maxP) ? parseFloat(feeCap.maxP.toString()) / 1e3 / 100 : 1,
+    minP: feeCap?.minP ? parseFloat(feeCap.minP.toString()) / 1e3 / 100 : 0,
+    maxP: feeCap?.maxP ? parseFloat(feeCap.maxP.toString()) / 1e3 / 100 : 1,
 });
 exports.convertFeePerBlockCap = convertFeePerBlockCap;
 const convertPairName = (pair) => {

package/lib/backend/tradingVariables/index.js

@@ -18,7 +18,6 @@ exports.transformGlobalTradingVariables = void 0;
 const converter_1 = require("./converter");
 const trade_1 = require("../../trade");
 const transformGlobalTradingVariables = (rawData) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const globalTradingVariables = {
         collaterals: (0, converter_1.convertCollaterals)(rawData.collaterals),
         pairs: (0, converter_1.convertTradingPairs)(rawData.pairs),
@@ -31,13 +30,13 @@ const transformGlobalTradingVariables = (rawData) => {
         stocksClosed: !rawData.isStocksOpen,
         indicesClosed: !rawData.isIndicesOpen,
         commoditiesClosed: !rawData.isCommoditiesOpen,
-        pairDepthBands: ((_a = rawData.pairInfos) === null || _a === void 0 ? void 0 : _a.pairDepthBands) !== undefined
+        pairDepthBands: rawData.pairInfos?.pairDepthBands !== undefined
             ? (0, converter_1.convertPairDepthBands)(rawData.pairInfos.pairDepthBands)
             : [],
         depthBandsMapping: rawData.depthBandsMapping !== undefined
             ? (0, converter_1.convertDepthBandsMapping)(rawData.depthBandsMapping)
             : { bands: [] },
-        pairMaxLeverages: ((_b = rawData.pairInfos) === null || _b === void 0 ? void 0 : _b.maxLeverages) !== undefined
+        pairMaxLeverages: rawData.pairInfos?.maxLeverages !== undefined
             ? (0, converter_1.convertMaxLeverages)(rawData.pairInfos.maxLeverages)
             : [],
         maxNegativePnlOnOpenP: (rawData.maxNegativePnlOnOpenP && rawData.maxNegativePnlOnOpenP / 1e10) ||
@@ -50,11 +49,11 @@ const transformGlobalTradingVariables = (rawData) => {
             : [],
         feeTiers: (0, converter_1.convertFeeTiers)(rawData.feeTiers),
         liquidationParams: {
-            groups: ((_d = (_c = rawData.liquidationParams) === null || _c === void 0 ? void 0 : _c.groups) === null || _d === void 0 ? void 0 : _d.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams))) || [],
-            pairs: ((_f = (_e = rawData.liquidationParams) === null || _e === void 0 ? void 0 : _e.pairs) === null || _f === void 0 ? void 0 : _f.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams))) || [],
+            groups: rawData.liquidationParams?.groups?.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams)) || [],
+            pairs: rawData.liquidationParams?.pairs?.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams)) || [],
         },
         counterTradeSettings: (0, trade_1.convertCounterTradeSettingsArray)(rawData.counterTradeSettings),
-        pairFactors: ((_h = (_g = rawData.pairInfos) === null || _g === void 0 ? void 0 : _g.pairFactors) === null || _h === void 0 ? void 0 : _h.map(factor => (0, converter_1.convertPairFactor)(factor))) || [],
+        pairFactors: rawData.pairInfos?.pairFactors?.map(factor => (0, converter_1.convertPairFactor)(factor)) || [],
         globalTradeFeeParams: rawData.globalTradeFeeParams
             ? (0, converter_1.convertGlobalTradeFeeParams)(rawData.globalTradeFeeParams)
             : undefined,
@@ -63,7 +62,7 @@ const transformGlobalTradingVariables = (rawData) => {
     const currentBlock = (rawData.currentBlock > -1 && rawData.currentBlock) || undefined;
     const l1BlockNumber = (rawData.currentL1Block > -1 && rawData.currentL1Block) || undefined;
     const pairIndexes = {};
-    for (let i = 0; i < ((_j = rawData.pairs) === null || _j === void 0 ? void 0 : _j.length); i++) {
+    for (let i = 0; i < rawData.pairs?.length; i++) {
         pairIndexes[rawData.pairs[i].from + "/" + rawData.pairs[i].to] = i;
     }
     if (globalTradingVariables.collaterals !== undefined) {

package/lib/constants.d.ts

@@ -413,6 +413,10 @@ export declare const pairs: {
     "BGSC/USD": string;
     "TAG/USD": string;
     "WLFI/USD": string;
+    "ASTER/USD": string;
+    "OKB/USD": string;
+    "CRO/USD": string;
+    "SKY/USD": string;
 };
 export declare const syntheticPairs: Set<string>;
 export declare const parentToSyntheticPairMap: Map<string, string>;

package/lib/constants.js

@@ -421,6 +421,10 @@ exports.pairs = {
     "BGSC/USD": CRYPTO,
     "TAG/USD": CRYPTO,
     "WLFI/USD": CRYPTO,
+    "ASTER/USD": CRYPTO,
+    "OKB/USD": CRYPTO,
+    "CRO/USD": CRYPTO,
+    "SKY/USD": CRYPTO,
 };
 exports.syntheticPairs = new Set([
     "BTCDEGEN/USD",
@@ -474,6 +478,7 @@ exports.delistedPairIxs = new Set([
     160, 163, 170, 179, 182, 183, 188, 189, 190, 208, 209, 225, 229, 230, 231,
     238, 239, 241, 250, 253, 254, 258, 270, 275, 276, 278, 279, 282, 285, 290,
     294, 296, 305, 311, 330, 349, 352, 353, 354, 355, 357, 365, 366, 395, 396,
+    415, 416, 417,
 ]);
 exports.delistedGroupsIxs = new Set([]);
 exports.DEFAULT_PROTECTION_CLOSE_FACTOR = 1;

package/lib/contracts/addresses.js

@@ -15,7 +15,10 @@ const getContractAddressesForChain = (chainId, collateral = types_1.CollateralTy
     if (!_addresses[chainIdMapping][collateral]) {
         throw new Error(`Unknown collateral (${collateral}) for chain id (${chainId}). No known contracts have been deployed for this collateral.`);
     }
-    return Object.assign(Object.assign({}, _addresses[chainIdMapping]["global"]), _addresses[chainIdMapping][collateral]);
+    return {
+        ..._addresses[chainIdMapping]["global"],
+        ..._addresses[chainIdMapping][collateral],
+    };
 };
 exports.getContractAddressesForChain = getContractAddressesForChain;
 const getCollateralByAddressForChain = (chainId, address) => {

package/lib/contracts/index.d.ts

@@ -11,4 +11,4 @@ export declare const COLLATERAL_TO_CHAIN_COLLATERAL_INDEX: Record<ChainId, Parti
 export declare const COLLATERAL_TO_COLLATERAL_INDEX: Record<CollateralTypes, number>;
 export * from "./utils";
 export * from "./addresses";
-export { CollateralTypes } from "./types";
+export { CollateralTypes, ChainId } from "./types";

package/lib/contracts/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CollateralTypes = exports.COLLATERAL_TO_COLLATERAL_INDEX = exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX = exports.getCollateralIndexAndContractsForChainByRequester = exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
+exports.ChainId = exports.CollateralTypes = exports.COLLATERAL_TO_COLLATERAL_INDEX = exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX = exports.getCollateralIndexAndContractsForChainByRequester = exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
 const addresses_1 = require("./addresses");
 const factories_1 = require("./types/generated/factories");
 const types_1 = require("./types");
@@ -34,11 +34,10 @@ const getContractsForChainByRequester = (chainId, requester, signerOrProvider) =
 };
 exports.getContractsForChainByRequester = getContractsForChainByRequester;
 const getCollateralIndexAndContractsForChainByRequester = (chainId, requester, signerOrProvider) => {
-    var _a;
     const collateral = (0, addresses_1.getCollateralByAddressForChain)(chainId, requester);
     return {
         contracts: (0, exports.getContractsForChain)(chainId, signerOrProvider, collateral),
-        collateralIndex: ((_a = exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX[chainId]) === null || _a === void 0 ? void 0 : _a[collateral]) ||
+        collateralIndex: exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX[chainId]?.[collateral] ||
             0,
     };
 };
@@ -83,3 +82,4 @@ __exportStar(require("./utils"), exports);
 __exportStar(require("./addresses"), exports);
 var types_2 = require("./types");
 Object.defineProperty(exports, "CollateralTypes", { enumerable: true, get: function () { return types_2.CollateralTypes; } });
+Object.defineProperty(exports, "ChainId", { enumerable: true, get: function () { return types_2.ChainId; } });

package/lib/contracts/types/generated/factories/GNSMultiCollatDiamond__factory.d.ts

@@ -3,14 +3,6 @@ import type { Provider } from "@ethersproject/providers";
 import type { GNSMultiCollatDiamond, GNSMultiCollatDiamondInterface } from "../GNSMultiCollatDiamond";
 export declare class GNSMultiCollatDiamond__factory {
     static readonly abi: ({
-        inputs: never[];
-        stateMutability: string;
-        type: string;
-        name?: undefined;
-        outputs?: undefined;
-        signature?: undefined;
-        anonymous?: undefined;
-    } | {
         inputs: {
             internalType: string;
             name: string;
@@ -18,8 +10,8 @@ export declare class GNSMultiCollatDiamond__factory {
         }[];
         name: string;
         type: string;
-        stateMutability?: undefined;
         outputs?: undefined;
+        stateMutability?: undefined;
         signature?: undefined;
         anonymous?: undefined;
     } | {
@@ -158,8 +150,8 @@ export declare class GNSMultiCollatDiamond__factory {
         name: string;
         type: string;
         signature: string;
-        stateMutability?: undefined;
         outputs?: undefined;
+        stateMutability?: undefined;
     } | {
         inputs: ({
             components: {

package/lib/contracts/types/generated/factories/GNSMultiCollatDiamond__factory.js

@@ -6,11 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GNSMultiCollatDiamond__factory = void 0;
 const ethers_1 = require("ethers");
 const _abi = [
-    {
-        inputs: [],
-        stateMutability: "nonpayable",
-        type: "constructor",
-    },
     {
         inputs: [],
         name: "AboveMax",

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

package/lib/contracts/utils/openTrades.js

@@ -1,20 +1,11 @@
 "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 = (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 fetchOpenPairTrades = async (contracts, overrides = {}) => {
+    const rawTrades = await (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
+    const collaterals = await contracts.gnsMultiCollatDiamond.getCollaterals();
     const collateralConfigs = collaterals.map(c => ({
         collateral: c.collateral,
         isActive: c.isActive,
@@ -22,10 +13,10 @@ const fetchOpenPairTrades = (contracts, overrides = {}) => __awaiter(void 0, voi
         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 = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
+const fetchOpenPairTradesRaw = async (contracts, overrides = {}) => {
     if (!contracts) {
         return [];
     }
@@ -39,13 +30,13 @@ const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0,
             ]),
         };
         if (useMulticall) {
-            yield multicallCtx.provider.init(multiCollatDiamondContract.provider);
+            await multicallCtx.provider.init(multiCollatDiamondContract.provider);
         }
         let allOpenPairTrades = [];
         let running = true;
         let offset = 0;
         while (running) {
-            const [trades, tradeInfos, tradeLiquidationParams] = yield Promise.all([
+            const [trades, tradeInfos, tradeLiquidationParams] = await Promise.all([
                 multiCollatDiamondContract.getAllTrades(offset, offset + batchSize),
                 multiCollatDiamondContract.getAllTradeInfos(offset, offset + batchSize),
                 multiCollatDiamondContract.getAllTradesLiquidationParams(offset, offset + batchSize),
@@ -85,7 +76,7 @@ const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0,
                     uiRealizedPnlData: undefined,
                 };
             });
-            const [tradeFeesData, uiRealizedPnlData] = yield Promise.all([
+            const [tradeFeesData, uiRealizedPnlData] = await Promise.all([
                 multiCollatDiamondContract.getTradeFeesDataArray(...fundingFeesCallParams),
                 includeUIRealizedPnlData
                     ? multiCollatDiamondContract.getTradeUiRealizedPnlDataArray(...fundingFeesCallParams)
@@ -100,13 +91,13 @@ const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0,
                 .map(({ collateralIndex, user, index }) => (useMulticall
                 ? multicallCtx.diamond
                 : multiCollatDiamondContract).getBorrowingInitialAccFees(collateralIndex, user, index));
-            const initialAccFees = yield (useMulticall
+            const initialAccFees = await (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 === null || uiRealizedPnlData === void 0 ? void 0 : uiRealizedPnlData[ix];
+                openTrades[ix].uiRealizedPnlData = uiRealizedPnlData?.[ix];
             });
             allOpenPairTrades = allOpenPairTrades.concat(openTrades);
             offset += batchSize + 1;
@@ -119,7 +110,7 @@ const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0,
         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;