@gainsnetwork/sdk 0.0.49 → 0.0.51-multi-collat-rc1

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

@@ -1,9 +1,9 @@
-import { TradeContainer, TradeContainerRaw } from "@/trade/types";
-import { Contracts, BlockTag } from "@/contracts/types";
-export type FetchOpenPairTradesOverrides = {
-    pairBatchSize?: number;
-    useMulticall?: boolean;
-    blockTag?: BlockTag;
-};
-export declare const fetchOpenPairTrades: (contracts: Contracts, overrides?: FetchOpenPairTradesOverrides) => Promise<TradeContainer[]>;
-export declare const fetchOpenPairTradesRaw: (contracts: Contracts, overrides?: FetchOpenPairTradesOverrides) => Promise<TradeContainerRaw[]>;
+import { TradeContainer, TradeContainerRaw } from "@/trade/types";
+import { Contracts, BlockTag } from "@/contracts/types";
+export type FetchOpenPairTradesOverrides = {
+    pairBatchSize?: number;
+    useMulticall?: boolean;
+    blockTag?: BlockTag;
+};
+export declare const fetchOpenPairTrades: (contracts: Contracts, overrides?: FetchOpenPairTradesOverrides) => Promise<TradeContainer[]>;
+export declare const fetchOpenPairTradesRaw: (contracts: Contracts, overrides?: FetchOpenPairTradesOverrides) => Promise<TradeContainerRaw[]>;

package/lib/contracts/utils/openTrades.js

@@ -1,172 +1,186 @@
-"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;
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-const ethcall_1 = require("ethcall");
-const fetchOpenPairTrades = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    const rawTrades = yield (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
-    return rawTrades.map(rawTrade => _prepareTradeContainer(rawTrade.trade, rawTrade.tradeInfo, rawTrade.initialAccFees));
-});
-exports.fetchOpenPairTrades = fetchOpenPairTrades;
-const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { pairBatchSize = 10, useMulticall = false, blockTag = "latest", } = overrides;
-    const { gnsPairsStorageV6: pairsStorageContract } = contracts;
-    try {
-        const totalPairIndexes = (yield pairsStorageContract.pairsCount({ blockTag })).toNumber() - 1;
-        let allOpenPairTrades = [];
-        for (let batchStartPairIndex = 0; batchStartPairIndex < totalPairIndexes; batchStartPairIndex += pairBatchSize) {
-            const batchEndPairIndex = Math.min(batchStartPairIndex + pairBatchSize - 1, totalPairIndexes);
-            const openPairTradesBatch = useMulticall
-                ? yield fetchOpenPairTradesBatchMulticall(contracts, batchStartPairIndex, batchEndPairIndex, blockTag)
-                : yield fetchOpenPairTradesBatch(contracts, batchStartPairIndex, batchEndPairIndex);
-            allOpenPairTrades = allOpenPairTrades.concat(openPairTradesBatch);
-        }
-        return allOpenPairTrades;
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching open pair trades!`);
-        throw error;
-    }
-});
-exports.fetchOpenPairTradesRaw = fetchOpenPairTradesRaw;
-const fetchOpenPairTradesBatch = (contracts, startPairIndex, endPairIndex) => __awaiter(void 0, void 0, void 0, function* () {
-    const { gfarmTradingStorageV5: storageContract, gnsBorrowingFees: borrowingFeesContract, } = contracts;
-    const maxTradesPerPair = (yield storageContract.maxTradesPerPair()).toNumber();
-    const pairIndexesToFetch = Array.from({ length: endPairIndex - startPairIndex + 1 }, (_, i) => i + startPairIndex);
-    const rawTrades = yield Promise.all(pairIndexesToFetch.map((pairIndex) => __awaiter(void 0, void 0, void 0, function* () {
-        const pairTraderAddresses = yield storageContract.pairTradersArray(pairIndex);
-        if (pairTraderAddresses.length === 0) {
-            return [];
-        }
-        const openTradesForPairTraders = yield Promise.all(pairTraderAddresses.map((pairTraderAddress) => __awaiter(void 0, void 0, void 0, function* () {
-            const openTradesCalls = new Array(maxTradesPerPair);
-            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
-                openTradesCalls[pairTradeIndex] = storageContract.openTrades(pairTraderAddress, pairIndex, pairTradeIndex);
-            }
-            const openTradesForTraderAddress = yield Promise.all(openTradesCalls);
-            // Filter out any of the trades that aren't *really* open (NOTE: these will have an empty trader address, so just test against that)
-            const actualOpenTradesForTrader = openTradesForTraderAddress.filter(openTrade => openTrade.trader === pairTraderAddress);
-            const [actualOpenTradesTradeInfos, actualOpenTradesInitialAccFees] = yield Promise.all([
-                Promise.all(actualOpenTradesForTrader.map(aot => storageContract.openTradesInfo(aot.trader, aot.pairIndex, aot.index))),
-                Promise.all(actualOpenTradesForTrader.map(aot => borrowingFeesContract.getTradeInitialAccFees(aot.trader, aot.pairIndex, aot.index))),
-            ]);
-            const finalOpenTradesForTrader = new Array(actualOpenTradesForTrader.length);
-            for (let tradeIndex = 0; tradeIndex < actualOpenTradesForTrader.length; tradeIndex++) {
-                const tradeInfo = actualOpenTradesTradeInfos[tradeIndex];
-                if (tradeInfo === undefined) {
-                    continue;
-                }
-                if (actualOpenTradesInitialAccFees[tradeIndex] === undefined) {
-                    continue;
-                }
-                const tradeInitialAccFees = Object.assign(Object.assign({}, actualOpenTradesInitialAccFees[tradeIndex].otherFees), { borrowing: actualOpenTradesInitialAccFees[tradeIndex].borrowingFees });
-                const trade = actualOpenTradesForTrader[tradeIndex];
-                finalOpenTradesForTrader[tradeIndex] = {
-                    trade,
-                    tradeInfo,
-                    initialAccFees: tradeInitialAccFees,
-                };
-            }
-            return finalOpenTradesForTrader;
-        })));
-        return openTradesForPairTraders;
-    })));
-    const perPairTrades = rawTrades.reduce((a, b) => a.concat(b), []);
-    return perPairTrades.reduce((a, b) => a.concat(b), []);
-});
-const fetchOpenPairTradesBatchMulticall = (contracts, startPairIndex, endPairIndex, blockTag) => __awaiter(void 0, void 0, void 0, function* () {
-    const { gfarmTradingStorageV5: storageContract, gnsBorrowingFees: borrowingFeesContract, } = contracts;
-    // Convert to Multicall for efficient RPC usage
-    const multicallProvider = new ethcall_1.Provider();
-    yield multicallProvider.init(storageContract.provider);
-    const storageContractMulticall = new ethcall_1.Contract(storageContract.address, [
-        ...storageContract.interface.fragments,
-    ]);
-    const borrowingFeesContractMulticall = new ethcall_1.Contract(borrowingFeesContract.address, [...borrowingFeesContract.interface.fragments]);
-    const maxTradesPerPair = (yield storageContract.maxTradesPerPair()).toNumber();
-    const pairIndexesToFetch = Array.from({ length: endPairIndex - startPairIndex + 1 }, (_, i) => i + startPairIndex);
-    const mcPairTraderAddresses = yield multicallProvider.all(pairIndexesToFetch.map(pairIndex => storageContractMulticall.pairTradersArray(pairIndex)), blockTag);
-    const mcFlatOpenTrades = yield multicallProvider.all(mcPairTraderAddresses
-        .map((pairTraderAddresses, _ix) => {
-        return pairTraderAddresses
-            .map((pairTraderAddress) => {
-            const openTradesCalls = new Array(maxTradesPerPair);
-            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
-                openTradesCalls[pairTradeIndex] =
-                    storageContractMulticall.openTrades(pairTraderAddress, _ix + startPairIndex, pairTradeIndex);
-            }
-            return openTradesCalls;
-        })
-            .reduce((acc, val) => acc.concat(val), []);
-    })
-        .reduce((acc, val) => acc.concat(val), []), blockTag);
-    const openTrades = mcFlatOpenTrades.filter(openTrade => openTrade[0] !== "0x0000000000000000000000000000000000000000");
-    const [openTradesTradeInfos, openTradesInitialAccFees] = yield Promise.all([
-        multicallProvider.all(openTrades.map(openTrade => storageContractMulticall.openTradesInfo(openTrade.trader, openTrade.pairIndex, openTrade.index)), blockTag),
-        multicallProvider.all(openTrades.map(openTrade => borrowingFeesContractMulticall.getTradeInitialAccFees(openTrade.trader, openTrade.pairIndex, openTrade.index)), blockTag),
-    ]);
-    const finalTrades = new Array(openTrades.length);
-    for (let tradeIndex = 0; tradeIndex < openTradesTradeInfos.length; tradeIndex++) {
-        const tradeInfo = openTradesTradeInfos[tradeIndex];
-        if (tradeInfo === undefined) {
-            console.error("No trade info found for open trade while fetching open trades!", { trade: openTradesTradeInfos[tradeIndex] });
-            continue;
-        }
-        if (openTradesInitialAccFees[tradeIndex] === undefined) {
-            console.error("No initial fees found for open trade while fetching open trades!", { trade: openTrades[tradeIndex] });
-            continue;
-        }
-        const tradeInitialAccFees = Object.assign(Object.assign({}, openTradesInitialAccFees[tradeIndex].otherFees), { borrowing: openTradesInitialAccFees[tradeIndex].borrowingFees });
-        const trade = openTrades[tradeIndex];
-        finalTrades[tradeIndex] = {
-            trade,
-            tradeInfo,
-            initialAccFees: tradeInitialAccFees,
-        };
-    }
-    return finalTrades.filter(trade => trade !== undefined);
-});
-const _prepareTradeContainer = (trade, tradeInfo, tradeInitialAccFees) => ({
-    trade: {
-        trader: trade.trader,
-        pairIndex: parseInt(trade.pairIndex.toString()),
-        index: parseInt(trade.index.toString()),
-        initialPosToken: parseFloat(trade.initialPosToken.toString()) / 1e18,
-        openPrice: parseFloat(trade.openPrice.toString()) / 1e10,
-        buy: trade.buy.toString() === "true",
-        leverage: parseInt(trade.leverage.toString()),
-        tp: parseFloat(trade.tp.toString()) / 1e10,
-        sl: parseFloat(trade.sl.toString()) / 1e10,
-    },
-    tradeInfo: {
-        beingMarketClosed: tradeInfo.beingMarketClosed.toString() === "true",
-        tokenPriceDai: parseFloat(tradeInfo.tokenPriceDai.toString()) / 1e10,
-        openInterestDai: parseFloat(tradeInfo.openInterestDai.toString()) / 1e18,
-        tpLastUpdated: tradeInfo.tpLastUpdated,
-        slLastUpdated: tradeInfo.slLastUpdated,
-    },
-    initialAccFees: {
-        rollover: parseFloat(tradeInitialAccFees.rollover.toString()) / 1e18,
-        funding: parseFloat(tradeInitialAccFees.funding.toString()) / 1e18,
-        openedAfterUpdate: tradeInitialAccFees.openedAfterUpdate.toString() === "true",
-        borrowing: {
-            accPairFee: parseFloat(tradeInitialAccFees.borrowing.accPairFee.toString()) / 1e10,
-            accGroupFee: parseFloat(tradeInitialAccFees.borrowing.accGroupFee.toString()) / 1e10,
-            block: parseFloat(tradeInitialAccFees.borrowing.block.toString()),
-        },
-    },
-});
+"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;
+/* eslint-disable @typescript-eslint/no-unsafe-call */
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+const ethcall_1 = require("ethcall");
+const fetchOpenPairTrades = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    const rawTrades = yield (0, exports.fetchOpenPairTradesRaw)(contracts, overrides);
+    return rawTrades.map(rawTrade => _prepareTradeContainer(rawTrade.trade, rawTrade.tradeInfo, rawTrade.initialAccFees, rawTrade.tradeData));
+});
+exports.fetchOpenPairTrades = fetchOpenPairTrades;
+const fetchOpenPairTradesRaw = (contracts, overrides = {}) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!contracts) {
+        return [];
+    }
+    const { pairBatchSize = 10, useMulticall = false, blockTag = "latest", } = overrides;
+    const { gnsMultiCollatDiamond: multiCollatDiamondContract } = contracts;
+    try {
+        const totalPairIndexes = (yield multiCollatDiamondContract.pairsCount({ blockTag })).toNumber() -
+            1;
+        let allOpenPairTrades = [];
+        for (let batchStartPairIndex = 0; batchStartPairIndex < totalPairIndexes; batchStartPairIndex += pairBatchSize) {
+            const batchEndPairIndex = Math.min(batchStartPairIndex + pairBatchSize - 1, totalPairIndexes);
+            const openPairTradesBatch = useMulticall
+                ? yield fetchOpenPairTradesBatchMulticall(contracts, batchStartPairIndex, batchEndPairIndex, blockTag)
+                : yield fetchOpenPairTradesBatch(contracts, batchStartPairIndex, batchEndPairIndex);
+            allOpenPairTrades = allOpenPairTrades.concat(openPairTradesBatch);
+        }
+        return allOpenPairTrades;
+    }
+    catch (error) {
+        console.error(`Unexpected error while fetching open pair trades!`);
+        throw error;
+    }
+});
+exports.fetchOpenPairTradesRaw = fetchOpenPairTradesRaw;
+const fetchOpenPairTradesBatch = (contracts, startPairIndex, endPairIndex) => __awaiter(void 0, void 0, void 0, function* () {
+    const { gfarmTradingStorageV5: storageContract, gnsBorrowingFees: borrowingFeesContract, gnsTradingCallbacks: callbacksContract, } = contracts;
+    const maxTradesPerPair = (yield storageContract.maxTradesPerPair()).toNumber();
+    const pairIndexesToFetch = Array.from({ length: endPairIndex - startPairIndex + 1 }, (_, i) => i + startPairIndex);
+    const rawTrades = yield Promise.all(pairIndexesToFetch.map((pairIndex) => __awaiter(void 0, void 0, void 0, function* () {
+        const pairTraderAddresses = yield storageContract.pairTradersArray(pairIndex);
+        if (pairTraderAddresses.length === 0) {
+            return [];
+        }
+        const openTradesForPairTraders = yield Promise.all(pairTraderAddresses.map((pairTraderAddress) => __awaiter(void 0, void 0, void 0, function* () {
+            const openTradesCalls = new Array(maxTradesPerPair);
+            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
+                openTradesCalls[pairTradeIndex] = storageContract.openTrades(pairTraderAddress, pairIndex, pairTradeIndex);
+            }
+            const openTradesForTraderAddress = yield Promise.all(openTradesCalls);
+            // Filter out any of the trades that aren't *really* open (NOTE: these will have an empty trader address, so just test against that)
+            const actualOpenTradesForTrader = openTradesForTraderAddress.filter(openTrade => openTrade.trader === pairTraderAddress);
+            const [actualOpenTradesTradeInfos, actualOpenTradesInitialAccFees, actualOpenTradesTradeData,] = yield Promise.all([
+                Promise.all(actualOpenTradesForTrader.map(aot => storageContract.openTradesInfo(aot.trader, aot.pairIndex, aot.index))),
+                Promise.all(actualOpenTradesForTrader.map(aot => borrowingFeesContract.initialAccFees(aot.trader, aot.pairIndex, aot.index))),
+                Promise.all(actualOpenTradesForTrader.map(aot => callbacksContract.tradeData(aot.trader, aot.pairIndex, aot.index, 0))),
+            ]);
+            const finalOpenTradesForTrader = new Array(actualOpenTradesForTrader.length);
+            for (let tradeIndex = 0; tradeIndex < actualOpenTradesForTrader.length; tradeIndex++) {
+                const tradeInfo = actualOpenTradesTradeInfos[tradeIndex];
+                if (tradeInfo === undefined) {
+                    continue;
+                }
+                if (actualOpenTradesInitialAccFees[tradeIndex] === undefined) {
+                    continue;
+                }
+                const trade = actualOpenTradesForTrader[tradeIndex];
+                const tradeData = actualOpenTradesTradeData[tradeIndex];
+                finalOpenTradesForTrader[tradeIndex] = {
+                    trade,
+                    tradeInfo,
+                    initialAccFees: {
+                        borrowing: actualOpenTradesInitialAccFees[tradeIndex],
+                    },
+                    tradeData,
+                };
+            }
+            return finalOpenTradesForTrader;
+        })));
+        return openTradesForPairTraders;
+    })));
+    const perPairTrades = rawTrades.reduce((a, b) => a.concat(b), []);
+    return perPairTrades.reduce((a, b) => a.concat(b), []);
+});
+const fetchOpenPairTradesBatchMulticall = (contracts, startPairIndex, endPairIndex, blockTag) => __awaiter(void 0, void 0, void 0, function* () {
+    const { gfarmTradingStorageV5: storageContract, gnsBorrowingFees: borrowingFeesContract, gnsTradingCallbacks: callbacksContract, } = contracts;
+    // Convert to Multicall for efficient RPC usage
+    const multicallProvider = new ethcall_1.Provider();
+    yield multicallProvider.init(storageContract.provider);
+    const storageContractMulticall = new ethcall_1.Contract(storageContract.address, [
+        ...storageContract.interface.fragments,
+    ]);
+    const borrowingFeesContractMulticall = new ethcall_1.Contract(borrowingFeesContract.address, [...borrowingFeesContract.interface.fragments]);
+    const callbacksContractMulticall = new ethcall_1.Contract(callbacksContract.address, [
+        ...callbacksContract.interface.fragments,
+    ]);
+    const maxTradesPerPair = (yield storageContract.maxTradesPerPair()).toNumber();
+    const pairIndexesToFetch = Array.from({ length: endPairIndex - startPairIndex + 1 }, (_, i) => i + startPairIndex);
+    const mcPairTraderAddresses = yield multicallProvider.all(pairIndexesToFetch.map(pairIndex => storageContractMulticall.pairTradersArray(pairIndex)), blockTag);
+    const mcFlatOpenTrades = yield multicallProvider.all(mcPairTraderAddresses
+        .map((pairTraderAddresses, _ix) => {
+        return pairTraderAddresses
+            .map((pairTraderAddress) => {
+            const openTradesCalls = new Array(maxTradesPerPair);
+            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
+                openTradesCalls[pairTradeIndex] =
+                    storageContractMulticall.openTrades(pairTraderAddress, _ix + startPairIndex, pairTradeIndex);
+            }
+            return openTradesCalls;
+        })
+            .reduce((acc, val) => acc.concat(val), []);
+    })
+        .reduce((acc, val) => acc.concat(val), []), blockTag);
+    const openTrades = mcFlatOpenTrades.filter(openTrade => openTrade[0] !== "0x0000000000000000000000000000000000000000");
+    const [openTradesTradeInfos, openTradesInitialAccFees, openTradesTradeData] = yield Promise.all([
+        multicallProvider.all(openTrades.map(openTrade => storageContractMulticall.openTradesInfo(openTrade.trader, openTrade.pairIndex, openTrade.index)), blockTag),
+        multicallProvider.all(openTrades.map(openTrade => borrowingFeesContractMulticall.initialAccFees(openTrade.trader, openTrade.pairIndex, openTrade.index)), blockTag),
+        multicallProvider.all(openTrades.map(openTrade => callbacksContractMulticall.tradeData(openTrade.trader, openTrade.pairIndex, openTrade.index, 0)), blockTag),
+    ]);
+    const finalTrades = new Array(openTrades.length);
+    for (let tradeIndex = 0; tradeIndex < openTradesTradeInfos.length; tradeIndex++) {
+        const tradeInfo = openTradesTradeInfos[tradeIndex];
+        if (tradeInfo === undefined) {
+            console.error("No trade info found for open trade while fetching open trades!", { trade: openTradesTradeInfos[tradeIndex] });
+            continue;
+        }
+        if (openTradesInitialAccFees[tradeIndex] === undefined) {
+            console.error("No initial fees found for open trade while fetching open trades!", { trade: openTrades[tradeIndex] });
+            continue;
+        }
+        const trade = openTrades[tradeIndex];
+        const tradeData = openTradesTradeData[tradeIndex];
+        finalTrades[tradeIndex] = {
+            trade,
+            tradeInfo,
+            initialAccFees: {
+                borrowing: openTradesInitialAccFees[tradeIndex],
+            },
+            tradeData,
+        };
+    }
+    return finalTrades.filter(trade => trade !== undefined);
+});
+const _prepareTradeContainer = (trade, tradeInfo, tradeInitialAccFees, tradeData) => ({
+    trade: {
+        trader: trade.trader,
+        pairIndex: parseInt(trade.pairIndex.toString()),
+        index: parseInt(trade.index.toString()),
+        initialPosToken: parseFloat(trade.initialPosToken.toString()) / 1e18,
+        openPrice: parseFloat(trade.openPrice.toString()) / 1e10,
+        buy: trade.buy.toString() === "true",
+        leverage: parseInt(trade.leverage.toString()),
+        tp: parseFloat(trade.tp.toString()) / 1e10,
+        sl: parseFloat(trade.sl.toString()) / 1e10,
+    },
+    tradeInfo: {
+        beingMarketClosed: tradeInfo.beingMarketClosed.toString() === "true",
+        tokenPriceDai: parseFloat(tradeInfo.tokenPriceDai.toString()) / 1e10,
+        openInterestDai: parseFloat(tradeInfo.openInterestDai.toString()) / 1e18,
+        tpLastUpdated: tradeInfo.tpLastUpdated,
+        slLastUpdated: tradeInfo.slLastUpdated,
+    },
+    tradeData: {
+        maxSlippageP: parseFloat(tradeData.maxSlippageP.toString()) / 1e10,
+        lastOiUpdateTs: parseFloat(tradeData.lastOiUpdateTs),
+        collateralPriceUsd: parseFloat(tradeData.collateralPriceUsd.toString()) / 1e8,
+    },
+    initialAccFees: {
+        borrowing: {
+            accPairFee: parseFloat(tradeInitialAccFees.borrowing.accPairFee.toString()) / 1e10,
+            accGroupFee: parseFloat(tradeInitialAccFees.borrowing.accGroupFee.toString()) / 1e10,
+            block: parseFloat(tradeInitialAccFees.borrowing.block.toString()),
+        },
+    },
+});

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

@@ -1,7 +1,6 @@
-import { Pair, PairParams, PairRolloverFees, Fee, OpenInterest } from "@/trade/types";
-import { Contracts } from "@/contracts/types";
-export declare const fetchPairs: (contracts: Contracts, pairIxs: number[]) => Promise<Pair[]>;
-export declare const fetchPairsParams: (contracts: Contracts, pairIxs: number[]) => Promise<PairParams[]>;
-export declare const fetchPairsRolloverFees: (contracts: Contracts, pairIxs: number[]) => Promise<PairRolloverFees[]>;
-export declare const fetchFees: (contracts: Contracts, feeIxs: number[]) => Promise<Fee[]>;
-export declare const fetchOpenInterest: (contracts: Contracts, pairIxs: number[]) => Promise<OpenInterest[]>;
+import { Pair, Fee, OpenInterest, PairDepth } from "@/trade/types";
+import { Contracts } from "@/contracts/types";
+export declare const fetchPairs: (contracts: Contracts, pairIxs: number[]) => Promise<Pair[]>;
+export declare const fetchPairDepths: (contracts: Contracts, pairIxs: number[]) => Promise<PairDepth[]>;
+export declare const fetchFees: (contracts: Contracts, feeIxs: number[]) => Promise<Fee[]>;
+export declare const fetchOpenInterest: (contracts: Contracts, pairIxs: number[]) => Promise<OpenInterest[]>;

package/lib/contracts/utils/pairs.js

@@ -1,115 +1,94 @@
-"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.fetchOpenInterest = exports.fetchFees = exports.fetchPairsRolloverFees = exports.fetchPairsParams = exports.fetchPairs = void 0;
-const fetchPairs = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { gnsPairsStorageV6: pairsStorageContract } = contracts;
-    try {
-        const pairs = yield Promise.all(pairIxs.map(pairIndex => pairsStorageContract.pairs(pairIndex)));
-        return pairs.map((pair, index) => {
-            return {
-                name: pair.from + "/" + pair.to,
-                from: pair.from,
-                to: pair.to,
-                feeIndex: parseInt(pair.feeIndex.toString()),
-                groupIndex: parseInt(pair.groupIndex.toString()),
-                pairIndex: pairIxs[index],
-                spreadP: parseFloat(pair.spreadP.toString()) / 1e12,
-            };
-        });
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching pairs!`);
-        throw error;
-    }
-});
-exports.fetchPairs = fetchPairs;
-const fetchPairsParams = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { gnsPairInfosV6_1: pairInfosContract } = contracts;
-    try {
-        const pairParams = yield Promise.all(pairIxs.map(pairIndex => pairInfosContract.pairParams(pairIndex)));
-        return pairParams.map(pair => {
-            return {
-                onePercentDepthAbove: parseFloat(pair.onePercentDepthAbove.toString()),
-                onePercentDepthBelow: parseFloat(pair.onePercentDepthBelow.toString()),
-                rolloverFeePerBlockP: parseFloat(pair.rolloverFeePerBlockP.toString()) / 1e12,
-                fundingFeePerBlockP: parseFloat(pair.fundingFeePerBlockP.toString()) / 1e12,
-            };
-        });
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching pairs!`);
-        throw error;
-    }
-});
-exports.fetchPairsParams = fetchPairsParams;
-const fetchPairsRolloverFees = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { gnsPairInfosV6_1: pairInfosContract } = contracts;
-    try {
-        const pairsRolloverFees = yield Promise.all(pairIxs.map(pairIndex => pairInfosContract.pairRolloverFees(pairIndex)));
-        return pairsRolloverFees.map(pairData => {
-            return {
-                accPerCollateral: parseFloat(pairData.accPerCollateral.toString()) / 1e18,
-                lastUpdateBlock: parseInt(pairData.lastUpdateBlock.toString()),
-            };
-        });
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching pairs!`);
-        throw error;
-    }
-});
-exports.fetchPairsRolloverFees = fetchPairsRolloverFees;
-const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { gnsPairsStorageV6: pairsStorageContract } = contracts;
-    try {
-        const fees = yield Promise.all(feeIxs.map(pairIndex => pairsStorageContract.fees(pairIndex)));
-        return fees.map(fee => {
-            return {
-                closeFeeP: parseFloat(fee.closeFeeP.toString()) / 1e12,
-                minLevPosDai: parseFloat(fee.minLevPosDai.toString()) / 1e12,
-                nftLimitOrderFeeP: parseFloat(fee.nftLimitOrderFeeP.toString()) / 1e12,
-                openFeeP: parseFloat(fee.openFeeP.toString()) / 1e12,
-                referralFeeP: parseFloat(fee.referralFeeP.toString()) / 1e12,
-            };
-        });
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching pairs!`);
-        throw error;
-    }
-});
-exports.fetchFees = fetchFees;
-const fetchOpenInterest = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
-    const openInterests = yield Promise.all(pairIxs.map(pairIndex => Promise.all([
-        contracts.gfarmTradingStorageV5.openInterestDai(pairIndex, 0),
-        contracts.gfarmTradingStorageV5.openInterestDai(pairIndex, 1),
-        contracts.gnsBorrowingFees.getPairMaxOi(pairIndex),
-    ])));
-    return openInterests.map(openInterest => ({
-        long: parseFloat(openInterest[0].toString()) / 1e18,
-        short: parseFloat(openInterest[1].toString()) / 1e18,
-        max: parseFloat(openInterest[2].toString()) / 1e10,
-    }));
-});
-exports.fetchOpenInterest = fetchOpenInterest;
+"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.fetchOpenInterest = exports.fetchFees = exports.fetchPairDepths = exports.fetchPairs = void 0;
+const fetchPairs = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!contracts) {
+        return [];
+    }
+    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
+    try {
+        const pairs = yield Promise.all(pairIxs.map(pairIndex => multiCollatContract.pairs(pairIndex)));
+        return pairs.map((pair, index) => {
+            return {
+                name: pair.from + "/" + pair.to,
+                from: pair.from,
+                to: pair.to,
+                feeIndex: parseInt(pair.feeIndex.toString()),
+                groupIndex: parseInt(pair.groupIndex.toString()),
+                pairIndex: pairIxs[index],
+                spreadP: parseFloat(pair.spreadP.toString()) / 1e12,
+            };
+        });
+    }
+    catch (error) {
+        console.error(`Unexpected error while fetching pairs!`);
+        throw error;
+    }
+});
+exports.fetchPairs = fetchPairs;
+const fetchPairDepths = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!contracts) {
+        return [];
+    }
+    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
+    try {
+        const pairParams = yield multiCollatContract.getPairDepths(pairIxs);
+        return pairParams.map(pair => {
+            return {
+                onePercentDepthAboveUsd: parseFloat(pair.onePercentDepthAboveUsd.toString()),
+                onePercentDepthBelowUsd: parseFloat(pair.onePercentDepthBelowUsd.toString()),
+            };
+        });
+    }
+    catch (error) {
+        console.error(`Unexpected error while fetching pairs!`);
+        throw error;
+    }
+});
+exports.fetchPairDepths = fetchPairDepths;
+const fetchFees = (contracts, feeIxs) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!contracts) {
+        return [];
+    }
+    const { gnsMultiCollatDiamond: multiCollatContract } = contracts;
+    try {
+        const fees = yield Promise.all(feeIxs.map(pairIndex => multiCollatContract.fees(pairIndex)));
+        return fees.map(fee => {
+            return {
+                closeFeeP: parseFloat(fee.closeFeeP.toString()) / 1e12,
+                minLevPosUsd: parseFloat(fee.minLevPosUsd.toString()) / 1e18,
+                nftLimitOrderFeeP: parseFloat(fee.nftLimitOrderFeeP.toString()) / 1e12,
+                openFeeP: parseFloat(fee.openFeeP.toString()) / 1e12,
+            };
+        });
+    }
+    catch (error) {
+        console.error(`Unexpected error while fetching pairs!`);
+        throw error;
+    }
+});
+exports.fetchFees = fetchFees;
+const fetchOpenInterest = (contracts, pairIxs) => __awaiter(void 0, void 0, void 0, function* () {
+    const { precision: collateralPrecision } = yield contracts.gnsBorrowingFees.collateralConfig();
+    const openInterests = yield Promise.all(pairIxs.map(pairIndex => Promise.all([
+        contracts.gfarmTradingStorageV5.openInterestDai(pairIndex, 0),
+        contracts.gfarmTradingStorageV5.openInterestDai(pairIndex, 1),
+        contracts.gnsBorrowingFees.getPairMaxOi(pairIndex),
+    ])));
+    const precision = parseFloat(collateralPrecision.toString());
+    return openInterests.map(openInterest => ({
+        long: parseFloat(openInterest[0].toString()) / precision,
+        short: parseFloat(openInterest[1].toString()) / precision,
+        max: parseFloat(openInterest[2].toString()) / 1e10,
+    }));
+});
+exports.fetchOpenInterest = fetchOpenInterest;