@gainsnetwork/sdk 1.3.0-rc6 → 1.4.0-rc1

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?.get(t.trade.pairIndex) === undefined) {
-                traderMap_all?.set(t.trade.pairIndex, new Map());
+            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());
             }
-            const traderPairMap_all = traderMap_all?.get(t.trade.pairIndex);
-            traderPairMap_all?.set(t.trade.index, t);
+            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);
             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?.set(t.trade.index, t);
+            traderPairMap === null || traderPairMap === void 0 ? void 0 : 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?.get(t.trade.pairIndex) === undefined) {
-                traderMap_all?.set(t.trade.pairIndex, new Map());
+            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());
             }
-            const traderPairMap_all = traderMap_all?.get(t.trade.pairIndex);
-            traderPairMap_all?.set(t.trade.index, t);
+            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);
             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?.set(t.trade.index, t);
+            traderPairMap === null || traderPairMap === void 0 ? void 0 : traderPairMap.set(t.trade.index, t);
         }
     }
     returnObject.trades = _trades;

package/lib/backend/tradingVariables/backend.types.d.ts

@@ -96,15 +96,9 @@ export interface GroupOpenInterestBackend {
     short: string;
     max: string;
 }
-export interface PairDepthBandsBackend {
-    aboveSlot1: string;
-    aboveSlot2: string;
-    belowSlot1: string;
-    belowSlot2: string;
-}
-export interface DepthBandsMappingBackend {
-    slot1: string;
-    slot2: string;
+export interface PairDepthBackend {
+    onePercentDepthAboveUsd: string;
+    onePercentDepthBelowUsd: string;
 }
 export interface PairBorrowingFeesBackendPairGroup {
     groupIndex: string;
@@ -165,7 +159,6 @@ export interface GlobalTradingVariablesBackend {
     groups: TradingGroupBackend[];
     fees: FeeBackend[];
     pairInfos: PairInfosBackend;
-    depthBandsMapping: DepthBandsMappingBackend;
     collaterals: CollateralBackend[];
     sssTokenBalance: string;
     sssLegacyTokenBalance: string;
@@ -246,7 +239,7 @@ export interface CollateralBackend {
 }
 export interface PairInfosBackend {
     maxLeverages: string[];
-    pairDepthBands: PairDepthBandsBackend[];
+    pairDepths: PairDepthBackend[];
     pairFactors: PairFactorBackend[];
 }
 export type TraderInfoBackend = {

package/lib/backend/tradingVariables/converter.d.ts

@@ -1,15 +1,11 @@
 import { ContestLeaderboardBackendEntry, ContestLeaderboardEntry } from "@gainsnetwork/contests";
-import { BorrowingFee, CollateralConfig, Fee, FeeTiers, GlobalTradeFeeParams, OiWindows, OiWindowsSettings, OpenInterest, Pair, PairOi, Trade, TradeContainer, TradeInfo, TradeInitialAccFees, TraderFeeTiers, TradingGroup, PairFactor, convertLiquidationParams } from "../../";
-import { convertPairDepthBandsFromSlots } from "../../trade/priceImpact/cumulVol/converter";
-import { BorrowingFeePerBlockCapBackend, CollateralBackend, FeeBackend, FeeTiersBackend, GlobalTradeFeeParamsBackend, OiWindowsBackend, OiWindowsSettingsBackend, OpenInterestBackend, PairBackend, PairDepthBandsBackend, DepthBandsMappingBackend, PairFactorBackend, PairOiBackend, PairParamsBorrowingFeesBackend, TradeBackend, TradeContainerBackend, TradeInfoBackend, TradeInitialAccFeesBackend, TraderFeeTiersBackend, TradingGroupBackend } from "./backend.types";
+import { BorrowingFee, CollateralConfig, Fee, FeeTiers, GlobalTradeFeeParams, OiWindows, OiWindowsSettings, OpenInterest, Pair, PairDepth, PairOi, Trade, TradeContainer, TradeInfo, TradeInitialAccFees, TraderFeeTiers, TradingGroup, PairFactor, convertLiquidationParams } from "../../";
+import { BorrowingFeePerBlockCapBackend, CollateralBackend, FeeBackend, FeeTiersBackend, GlobalTradeFeeParamsBackend, OiWindowsBackend, OiWindowsSettingsBackend, OpenInterestBackend, PairBackend, PairDepthBackend, PairFactorBackend, PairOiBackend, PairParamsBorrowingFeesBackend, TradeBackend, TradeContainerBackend, TradeInfoBackend, TradeInitialAccFeesBackend, TraderFeeTiersBackend, TradingGroupBackend } from "./backend.types";
 import { TradingVariablesCollateral } from "./types";
 export declare const convertFees: (fees: FeeBackend[]) => Fee[];
 export declare const convertCollaterals: (collaterals: CollateralBackend[]) => TradingVariablesCollateral[];
 export declare const convertOpenInterests: (interests: OpenInterestBackend[]) => OpenInterest[];
-export declare const convertPairDepthBands: (pairDepthBands: PairDepthBandsBackend[]) => ReturnType<typeof convertPairDepthBandsFromSlots>[];
-export declare const convertDepthBandsMapping: (mapping: DepthBandsMappingBackend) => {
-    bands: number[];
-};
+export declare const convertPairDepths: (pairDepths: PairDepthBackend[]) => PairDepth[];
 export declare const convertPairSkewDepths: (pairSkewDepths: string[] | undefined) => {
     [pairIndex: number]: number;
 };

package/lib/backend/tradingVariables/converter.js

@@ -1,45 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertLiquidationParams = exports.convertPairName = exports.convertFeePerBlockCap = exports.convertMaxLeverages = exports.convertGlobalTradeFeeParams = exports.convertTraderFeeTiers = exports.convertFeeTiers = exports.convertCollateralConfig = exports.convertOiWindowsSettings = exports.convertOiWindows = exports.convertPairOi = exports.convertContestLeaderboardEntry = exports.generateStockPairToActiveStockSplit = exports.convertTradeInitialAccFees = exports.convertTradeInfo = exports.convertTrade = exports.convertPairFactor = exports.convertTradeContainer = exports.convertTradesAndLimitOrders = exports.convertTradingPairs = exports.convertTradingGroups = exports.convertGroupBorrowingFees = exports.convertPairBorrowingFees = exports.convertPairSkewDepths = exports.convertDepthBandsMapping = exports.convertPairDepthBands = exports.convertOpenInterests = exports.convertCollaterals = exports.convertFees = void 0;
+exports.convertLiquidationParams = exports.convertPairName = exports.convertFeePerBlockCap = exports.convertMaxLeverages = exports.convertGlobalTradeFeeParams = exports.convertTraderFeeTiers = exports.convertFeeTiers = exports.convertCollateralConfig = exports.convertOiWindowsSettings = exports.convertOiWindows = exports.convertPairOi = exports.convertContestLeaderboardEntry = exports.generateStockPairToActiveStockSplit = exports.convertTradeInitialAccFees = exports.convertTradeInfo = exports.convertTrade = exports.convertPairFactor = exports.convertTradeContainer = exports.convertTradesAndLimitOrders = exports.convertTradingPairs = exports.convertTradingGroups = exports.convertGroupBorrowingFees = exports.convertPairBorrowingFees = exports.convertPairSkewDepths = exports.convertPairDepths = exports.convertOpenInterests = exports.convertCollaterals = exports.convertFees = void 0;
 const __1 = require("../../");
 Object.defineProperty(exports, "convertLiquidationParams", { enumerable: true, get: function () { return __1.convertLiquidationParams; } });
 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?.map(fee => convertFee(fee));
+const convertFees = (fees) => fees === null || fees === void 0 ? void 0 : fees.map(fee => convertFee(fee));
 exports.convertFees = convertFees;
-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));
+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));
 exports.convertCollaterals = convertCollaterals;
 const convertFee = (fee) => ({
     totalPositionSizeFeeP: parseFloat(fee.totalPositionSizeFeeP) / 1e12,
@@ -47,32 +43,26 @@ const convertFee = (fee) => ({
     oraclePositionSizeFeeP: parseFloat(fee.oraclePositionSizeFeeP) / 1e12,
     minPositionSizeUsd: parseFloat(fee.minPositionSizeUsd) / 1e3,
 });
-const convertOpenInterests = (interests) => interests?.map(interest => convertOpenInterest(interest));
+const convertOpenInterests = (interests) => interests === null || interests === void 0 ? void 0 : 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?.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),
-    };
-};
-exports.convertDepthBandsMapping = convertDepthBandsMapping;
+const convertPairDepths = (pairDepths) => pairDepths === null || pairDepths === void 0 ? void 0 : pairDepths.map(pairDepth => convertPairDepth(pairDepth));
+exports.convertPairDepths = convertPairDepths;
+const convertPairDepth = (pairDepth) => ({
+    onePercentDepthAboveUsd: parseInt(pairDepth.onePercentDepthAboveUsd),
+    onePercentDepthBelowUsd: parseInt(pairDepth.onePercentDepthBelowUsd),
+});
 const convertPairSkewDepths = (pairSkewDepths) => {
     if (!pairSkewDepths)
         return {};
     return (0, converter_1.convertPairSkewDepths)(pairSkewDepths);
 };
 exports.convertPairSkewDepths = convertPairSkewDepths;
-const convertPairBorrowingFees = (pairParams) => pairParams?.pairs.map(pairParam => convertPairBorrowingFee(pairParam));
+const convertPairBorrowingFees = (pairParams) => pairParams === null || pairParams === void 0 ? void 0 : pairParams.pairs.map(pairParam => convertPairBorrowingFee(pairParam));
 exports.convertPairBorrowingFees = convertPairBorrowingFees;
 const convertPairGroupBorrowingFee = (pairParam) => ({
     groupIndex: parseInt(pairParam.groupIndex),
@@ -96,9 +86,9 @@ const convertPairBorrowingFee = (pairParams) => ({
         short: parseFloat(pairParams.oi.beforeV10.short) / 1e10 || 0,
     },
     feeExponent: parseInt(pairParams.feeExponent) || 0,
-    feePerBlockCap: (0, exports.convertFeePerBlockCap)(pairParams?.feePerBlockCap),
+    feePerBlockCap: (0, exports.convertFeePerBlockCap)(pairParams === null || pairParams === void 0 ? void 0 : pairParams.feePerBlockCap),
 });
-const convertGroupBorrowingFees = (pairParams) => pairParams?.groups.map(pairParam => convertGroupBorrowingFee(pairParam));
+const convertGroupBorrowingFees = (pairParams) => pairParams === null || pairParams === void 0 ? void 0 : pairParams.groups.map(pairParam => convertGroupBorrowingFee(pairParam));
 exports.convertGroupBorrowingFees = convertGroupBorrowingFees;
 const convertGroupBorrowingFee = (pairParams) => ({
     oi: {
@@ -112,16 +102,14 @@ const convertGroupBorrowingFee = (pairParams) => ({
     accLastUpdatedBlock: parseInt(pairParams.accLastUpdatedBlock),
     feeExponent: parseInt(pairParams.feeExponent) || 0,
 });
-const convertTradingGroups = (groups) => groups?.map(group => convertTradingGroup(group));
+const convertTradingGroups = (groups) => groups === null || groups === void 0 ? void 0 : 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
-    ?.filter(pair => pair.from !== "")
-    .map((pair, index) => convertTradingPair(pair, index));
+const convertTradingPairs = (pairs) => pairs === null || pairs === void 0 ? void 0 : pairs.filter(pair => pair.from !== "").map((pair, index) => convertTradingPair(pair, index));
 exports.convertTradingPairs = convertTradingPairs;
 const convertTradingPair = (pair, index) => ({
     name: (0, exports.convertPairName)(pair),
@@ -133,7 +121,7 @@ const convertTradingPair = (pair, index) => ({
     groupIndex: parseInt(pair.groupIndex),
     spreadP: parseFloat(pair.spreadP) / 1e10,
 });
-const convertTradesAndLimitOrders = (allItems, collaterals) => allItems?.map(item => {
+const convertTradesAndLimitOrders = (allItems, collaterals) => allItems === null || allItems === void 0 ? void 0 : allItems.map(item => {
     return (0, exports.convertTradeContainer)(item, collaterals);
 });
 exports.convertTradesAndLimitOrders = convertTradesAndLimitOrders;
@@ -179,10 +167,11 @@ 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 = collateral?.collateralConfig?.decimals || 18;
+    const decimals = ((_a = collateral === null || collateral === void 0 ? void 0 : collateral.collateralConfig) === null || _a === void 0 ? void 0 : _a.decimals) || 18;
     return {
         user,
         index: parseInt(trade.index),
@@ -192,7 +181,7 @@ const convertTrade = (trade, collaterals) => {
         isOpen: trade.isOpen,
         collateralIndex,
         tradeType: parseInt(trade.tradeType),
-        collateralAmount: parseFloat(trade.collateralAmount) / 10 ** decimals,
+        collateralAmount: parseFloat(trade.collateralAmount) / Math.pow(10, decimals),
         openPrice: parseFloat(trade.openPrice) / 1e10,
         sl: parseFloat(trade.sl) / 1e10,
         tp: parseFloat(trade.tp) / 1e10,
@@ -276,7 +265,7 @@ const convertPairOi = (collateral) => ({
 });
 exports.convertPairOi = convertPairOi;
 const convertOiWindows = (oiWindows) => {
-    return oiWindows?.map(pairWindows => {
+    return oiWindows === null || oiWindows === void 0 ? void 0 : oiWindows.map(pairWindows => {
         const converted = {};
         for (const [key, oiWindow] of Object.entries(pairWindows)) {
             converted[key] = (0, exports.convertPairOi)(oiWindow);
@@ -299,14 +288,17 @@ const convertCollateralConfig = (collateral) => ({
     decimals: collateral.collateralConfig.decimals,
 });
 exports.convertCollateralConfig = convertCollateralConfig;
-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,
-});
+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,
+    });
+};
 exports.convertFeeTiers = convertFeeTiers;
 const convertTraderFeeTiers = (traderFeeTiers) => ({
     traderEnrollment: {
@@ -331,11 +323,11 @@ const convertGlobalTradeFeeParams = (fee) => ({
     gTokenFeeP: parseFloat(fee.gTokenFeeP) / 1e5,
 });
 exports.convertGlobalTradeFeeParams = convertGlobalTradeFeeParams;
-const convertMaxLeverages = (maxLeverages) => maxLeverages?.map(maxLeverage => parseFloat(maxLeverage) / 1e3);
+const convertMaxLeverages = (maxLeverages) => maxLeverages === null || maxLeverages === void 0 ? void 0 : maxLeverages.map(maxLeverage => parseFloat(maxLeverage) / 1e3);
 exports.convertMaxLeverages = convertMaxLeverages;
 const convertFeePerBlockCap = (feeCap) => ({
-    minP: feeCap?.minP ? parseFloat(feeCap.minP.toString()) / 1e3 / 100 : 0,
-    maxP: feeCap?.maxP ? parseFloat(feeCap.maxP.toString()) / 1e3 / 100 : 1,
+    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,
 });
 exports.convertFeePerBlockCap = convertFeePerBlockCap;
 const convertPairName = (pair) => {

package/lib/backend/tradingVariables/index.js

@@ -18,6 +18,7 @@ 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),
@@ -30,13 +31,10 @@ const transformGlobalTradingVariables = (rawData) => {
         stocksClosed: !rawData.isStocksOpen,
         indicesClosed: !rawData.isIndicesOpen,
         commoditiesClosed: !rawData.isCommoditiesOpen,
-        pairDepthBands: rawData.pairInfos?.pairDepthBands !== undefined
-            ? (0, converter_1.convertPairDepthBands)(rawData.pairInfos.pairDepthBands)
+        pairDepths: ((_a = rawData.pairInfos) === null || _a === void 0 ? void 0 : _a.pairDepths) !== undefined
+            ? (0, converter_1.convertPairDepths)(rawData.pairInfos.pairDepths)
             : [],
-        depthBandsMapping: rawData.depthBandsMapping !== undefined
-            ? (0, converter_1.convertDepthBandsMapping)(rawData.depthBandsMapping)
-            : { bands: [] },
-        pairMaxLeverages: rawData.pairInfos?.maxLeverages !== undefined
+        pairMaxLeverages: ((_b = rawData.pairInfos) === null || _b === void 0 ? void 0 : _b.maxLeverages) !== undefined
             ? (0, converter_1.convertMaxLeverages)(rawData.pairInfos.maxLeverages)
             : [],
         maxNegativePnlOnOpenP: (rawData.maxNegativePnlOnOpenP && rawData.maxNegativePnlOnOpenP / 1e10) ||
@@ -49,11 +47,11 @@ const transformGlobalTradingVariables = (rawData) => {
             : [],
         feeTiers: (0, converter_1.convertFeeTiers)(rawData.feeTiers),
         liquidationParams: {
-            groups: rawData.liquidationParams?.groups?.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams)) || [],
-            pairs: rawData.liquidationParams?.pairs?.map(liqParams => (0, trade_1.convertLiquidationParams)(liqParams)) || [],
+            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))) || [],
         },
         counterTradeSettings: (0, trade_1.convertCounterTradeSettingsArray)(rawData.counterTradeSettings),
-        pairFactors: rawData.pairInfos?.pairFactors?.map(factor => (0, converter_1.convertPairFactor)(factor)) || [],
+        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))) || [],
         globalTradeFeeParams: rawData.globalTradeFeeParams
             ? (0, converter_1.convertGlobalTradeFeeParams)(rawData.globalTradeFeeParams)
             : undefined,
@@ -62,7 +60,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 < rawData.pairs?.length; i++) {
+    for (let i = 0; i < ((_j = rawData.pairs) === null || _j === void 0 ? void 0 : _j.length); i++) {
         pairIndexes[rawData.pairs[i].from + "/" + rawData.pairs[i].to] = i;
     }
     if (globalTradingVariables.collaterals !== undefined) {

package/lib/backend/tradingVariables/types.d.ts

@@ -1,6 +1,5 @@
 import { CollateralConfig } from "src/markets/collateral";
-import { BorrowingFee, BorrowingFeeV2, CounterTradeSettings, Fee, FeeTiers, FundingFees, GlobalTradeFeeParams, LeaderboardTrader, LiquidationParams, OiWindows, OiWindowsSettings, Pair, PairFactor, PairIndexes, TradingGroup } from "../../trade";
-import { PairDepthBands, DepthBandsMapping } from "../../trade/priceImpact/cumulVol/types";
+import { BorrowingFee, BorrowingFeeV2, CounterTradeSettings, Fee, FeeTiers, FundingFees, GlobalTradeFeeParams, LeaderboardTrader, LiquidationParams, OiWindows, OiWindowsSettings, Pair, PairDepth, PairFactor, PairIndexes, TradingGroup } from "../../trade";
 import { UnifiedPairOi } from "src/markets";
 export type TransformedGlobalTradingVariables = {
     globalTradingVariables: GlobalTradingVariablesType;
@@ -64,8 +63,7 @@ export type GlobalTradingVariablesType = {
     commodities?: string[];
     commoditiesClosed?: boolean;
     blockConfirmations?: number;
-    pairDepthBands?: PairDepthBands[];
-    depthBandsMapping?: DepthBandsMapping;
+    pairDepths?: PairDepth[];
     pairMaxLeverages?: number[];
     maxNegativePnlOnOpenP?: number;
     oiWindowsSettings?: OiWindowsSettings;

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",
@@ -473,7 +477,8 @@ exports.delistedPairIxs = new Set([
     99, 101, 106, 111, 113, 114, 116, 118, 120, 122, 123, 125, 127, 130, 147, 152,
     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,
+    294, 296, 305, 311, 330, 349, 352, 353, 354, 355, 357, 365, 366, 395, 396, 414,
+    415, 416, 417,
 ]);
 exports.delistedGroupsIxs = new Set([]);
 exports.DEFAULT_PROTECTION_CLOSE_FACTOR = 1;

package/lib/contracts/addresses.d.ts

@@ -1,3 +1,3 @@
 import { CollateralTypes, ContractAddresses } from "./types";
-export declare const getContractAddressesForChain: (chainId: number, collateral?: CollateralTypes, stable?: boolean) => ContractAddresses;
+export declare const getContractAddressesForChain: (chainId: number, collateral?: CollateralTypes) => ContractAddresses;
 export declare const getCollateralByAddressForChain: (chainId: number, address: string) => CollateralTypes;

package/lib/contracts/addresses.js

@@ -6,19 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCollateralByAddressForChain = exports.getContractAddressesForChain = void 0;
 const types_1 = require("./types");
 const addresses_json_1 = __importDefault(require("./addresses.json"));
-const getContractAddressesForChain = (chainId, collateral = types_1.CollateralTypes.DAI, stable = true) => {
+const getContractAddressesForChain = (chainId, collateral = types_1.CollateralTypes.DAI) => {
     const _addresses = addresses_json_1.default;
-    const chainIdMapping = !stable && chainId === 421614 ? "421614-release" : chainId;
-    if (!_addresses[chainIdMapping]) {
+    if (!_addresses[chainId]) {
         throw new Error(`Unknown chain id (${chainId}). No known contracts have been deployed on this chain.`);
     }
-    if (!_addresses[chainIdMapping][collateral]) {
+    if (!_addresses[chainId][collateral]) {
         throw new Error(`Unknown collateral (${collateral}) for chain id (${chainId}). No known contracts have been deployed for this collateral.`);
     }
-    return {
-        ..._addresses[chainIdMapping]["global"],
-        ..._addresses[chainIdMapping][collateral],
-    };
+    return Object.assign(Object.assign({}, _addresses[chainId]["global"]), _addresses[chainId][collateral]);
 };
 exports.getContractAddressesForChain = getContractAddressesForChain;
 const getCollateralByAddressForChain = (chainId, address) => {

package/lib/contracts/addresses.json

@@ -143,34 +143,5 @@
             "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
             "gToken": "0x0000000000000000000000000000000000000000"
         }
-    },
-    "421614-release": {
-        "global": {
-            "gnsMultiCollatDiamond": "0xB4F1B18b5679B42F2956dCBff3D7823A61F347C9"
-        },
-        "DAI": {
-            "gTokenOpenPnlFeed": "0xFcF76e2620eB6C32786e32620187A0FbF2844d68",
-            "gToken": "0x47CA7Fa22086CD63DBa92Dce23a75aEA9227a9DC"
-        },
-        "ETH": {
-            "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
-            "gToken": "0x0000000000000000000000000000000000000000"
-        },
-        "USDC": {
-            "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
-            "gToken": "0x0000000000000000000000000000000000000000"
-        },
-        "APE": {
-            "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
-            "gToken": "0x0000000000000000000000000000000000000000"
-        },
-        "GNS": {
-            "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
-            "gToken": "0x0000000000000000000000000000000000000000"
-        },
-        "BTCUSD": {
-            "gTokenOpenPnlFeed": "0x0000000000000000000000000000000000000000",
-            "gToken": "0x0000000000000000000000000000000000000000"
-        }
     }
 }

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, ChainId } from "./types";
+export { CollateralTypes } 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.ChainId = exports.CollateralTypes = exports.COLLATERAL_TO_COLLATERAL_INDEX = exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX = exports.getCollateralIndexAndContractsForChainByRequester = exports.getContractsForChainByRequester = exports.getContractsForChain = void 0;
+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,10 +34,11 @@ 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: exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX[chainId]?.[collateral] ||
+        collateralIndex: ((_a = exports.COLLATERAL_TO_CHAIN_COLLATERAL_INDEX[chainId]) === null || _a === void 0 ? void 0 : _a[collateral]) ||
             0,
     };
 };
@@ -82,4 +83,3 @@ __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; } });