@gainsnetwork/sdk 0.0.13 → 0.0.14-rc1

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

@@ -1,4 +1,4 @@
-export { GFarmTradingStorageV5__factory } from "./GFarmTradingStorageV5__factory";
-export { GNSPairInfosV6_1__factory } from "./GNSPairInfosV6_1__factory";
-export { GNSPairsStorageV6__factory } from "./GNSPairsStorageV6__factory";
-export { GTokenOpenPnlFeed__factory } from "./GTokenOpenPnlFeed__factory";
+export { GFarmTradingStorageV5__factory } from "./GFarmTradingStorageV5__factory";
+export { GNSPairInfosV6_1__factory } from "./GNSPairInfosV6_1__factory";
+export { GNSPairsStorageV6__factory } from "./GNSPairsStorageV6__factory";
+export { GTokenOpenPnlFeed__factory } from "./GTokenOpenPnlFeed__factory";

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

@@ -1,14 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTokenOpenPnlFeed__factory = exports.GNSPairsStorageV6__factory = exports.GNSPairInfosV6_1__factory = exports.GFarmTradingStorageV5__factory = void 0;
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-var GFarmTradingStorageV5__factory_1 = require("./GFarmTradingStorageV5__factory");
-Object.defineProperty(exports, "GFarmTradingStorageV5__factory", { enumerable: true, get: function () { return GFarmTradingStorageV5__factory_1.GFarmTradingStorageV5__factory; } });
-var GNSPairInfosV6_1__factory_1 = require("./GNSPairInfosV6_1__factory");
-Object.defineProperty(exports, "GNSPairInfosV6_1__factory", { enumerable: true, get: function () { return GNSPairInfosV6_1__factory_1.GNSPairInfosV6_1__factory; } });
-var GNSPairsStorageV6__factory_1 = require("./GNSPairsStorageV6__factory");
-Object.defineProperty(exports, "GNSPairsStorageV6__factory", { enumerable: true, get: function () { return GNSPairsStorageV6__factory_1.GNSPairsStorageV6__factory; } });
-var GTokenOpenPnlFeed__factory_1 = require("./GTokenOpenPnlFeed__factory");
-Object.defineProperty(exports, "GTokenOpenPnlFeed__factory", { enumerable: true, get: function () { return GTokenOpenPnlFeed__factory_1.GTokenOpenPnlFeed__factory; } });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GTokenOpenPnlFeed__factory = exports.GNSPairsStorageV6__factory = exports.GNSPairInfosV6_1__factory = exports.GFarmTradingStorageV5__factory = void 0;
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+var GFarmTradingStorageV5__factory_1 = require("./GFarmTradingStorageV5__factory");
+Object.defineProperty(exports, "GFarmTradingStorageV5__factory", { enumerable: true, get: function () { return GFarmTradingStorageV5__factory_1.GFarmTradingStorageV5__factory; } });
+var GNSPairInfosV6_1__factory_1 = require("./GNSPairInfosV6_1__factory");
+Object.defineProperty(exports, "GNSPairInfosV6_1__factory", { enumerable: true, get: function () { return GNSPairInfosV6_1__factory_1.GNSPairInfosV6_1__factory; } });
+var GNSPairsStorageV6__factory_1 = require("./GNSPairsStorageV6__factory");
+Object.defineProperty(exports, "GNSPairsStorageV6__factory", { enumerable: true, get: function () { return GNSPairsStorageV6__factory_1.GNSPairsStorageV6__factory; } });
+var GTokenOpenPnlFeed__factory_1 = require("./GTokenOpenPnlFeed__factory");
+Object.defineProperty(exports, "GTokenOpenPnlFeed__factory", { enumerable: true, get: function () { return GTokenOpenPnlFeed__factory_1.GTokenOpenPnlFeed__factory; } });

package/lib/contracts/types/generated/index.d.ts

@@ -1,9 +1,9 @@
-export type { GFarmTradingStorageV5 } from "./GFarmTradingStorageV5";
-export type { GNSPairInfosV6_1 } from "./GNSPairInfosV6_1";
-export type { GNSPairsStorageV6 } from "./GNSPairsStorageV6";
-export type { GTokenOpenPnlFeed } from "./GTokenOpenPnlFeed";
-export * as factories from "./factories";
-export { GFarmTradingStorageV5__factory } from "./factories/GFarmTradingStorageV5__factory";
-export { GNSPairInfosV6_1__factory } from "./factories/GNSPairInfosV6_1__factory";
-export { GNSPairsStorageV6__factory } from "./factories/GNSPairsStorageV6__factory";
-export { GTokenOpenPnlFeed__factory } from "./factories/GTokenOpenPnlFeed__factory";
+export type { GFarmTradingStorageV5 } from "./GFarmTradingStorageV5";
+export type { GNSPairInfosV6_1 } from "./GNSPairInfosV6_1";
+export type { GNSPairsStorageV6 } from "./GNSPairsStorageV6";
+export type { GTokenOpenPnlFeed } from "./GTokenOpenPnlFeed";
+export * as factories from "./factories";
+export { GFarmTradingStorageV5__factory } from "./factories/GFarmTradingStorageV5__factory";
+export { GNSPairInfosV6_1__factory } from "./factories/GNSPairInfosV6_1__factory";
+export { GNSPairsStorageV6__factory } from "./factories/GNSPairsStorageV6__factory";
+export { GTokenOpenPnlFeed__factory } from "./factories/GTokenOpenPnlFeed__factory";

package/lib/contracts/types/generated/index.js

@@ -1,35 +1,35 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GTokenOpenPnlFeed__factory = exports.GNSPairsStorageV6__factory = exports.GNSPairInfosV6_1__factory = exports.GFarmTradingStorageV5__factory = exports.factories = void 0;
-exports.factories = __importStar(require("./factories"));
-var GFarmTradingStorageV5__factory_1 = require("./factories/GFarmTradingStorageV5__factory");
-Object.defineProperty(exports, "GFarmTradingStorageV5__factory", { enumerable: true, get: function () { return GFarmTradingStorageV5__factory_1.GFarmTradingStorageV5__factory; } });
-var GNSPairInfosV6_1__factory_1 = require("./factories/GNSPairInfosV6_1__factory");
-Object.defineProperty(exports, "GNSPairInfosV6_1__factory", { enumerable: true, get: function () { return GNSPairInfosV6_1__factory_1.GNSPairInfosV6_1__factory; } });
-var GNSPairsStorageV6__factory_1 = require("./factories/GNSPairsStorageV6__factory");
-Object.defineProperty(exports, "GNSPairsStorageV6__factory", { enumerable: true, get: function () { return GNSPairsStorageV6__factory_1.GNSPairsStorageV6__factory; } });
-var GTokenOpenPnlFeed__factory_1 = require("./factories/GTokenOpenPnlFeed__factory");
-Object.defineProperty(exports, "GTokenOpenPnlFeed__factory", { enumerable: true, get: function () { return GTokenOpenPnlFeed__factory_1.GTokenOpenPnlFeed__factory; } });
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GTokenOpenPnlFeed__factory = exports.GNSPairsStorageV6__factory = exports.GNSPairInfosV6_1__factory = exports.GFarmTradingStorageV5__factory = exports.factories = void 0;
+exports.factories = __importStar(require("./factories"));
+var GFarmTradingStorageV5__factory_1 = require("./factories/GFarmTradingStorageV5__factory");
+Object.defineProperty(exports, "GFarmTradingStorageV5__factory", { enumerable: true, get: function () { return GFarmTradingStorageV5__factory_1.GFarmTradingStorageV5__factory; } });
+var GNSPairInfosV6_1__factory_1 = require("./factories/GNSPairInfosV6_1__factory");
+Object.defineProperty(exports, "GNSPairInfosV6_1__factory", { enumerable: true, get: function () { return GNSPairInfosV6_1__factory_1.GNSPairInfosV6_1__factory; } });
+var GNSPairsStorageV6__factory_1 = require("./factories/GNSPairsStorageV6__factory");
+Object.defineProperty(exports, "GNSPairsStorageV6__factory", { enumerable: true, get: function () { return GNSPairsStorageV6__factory_1.GNSPairsStorageV6__factory; } });
+var GTokenOpenPnlFeed__factory_1 = require("./factories/GTokenOpenPnlFeed__factory");
+Object.defineProperty(exports, "GTokenOpenPnlFeed__factory", { enumerable: true, get: function () { return GTokenOpenPnlFeed__factory_1.GTokenOpenPnlFeed__factory; } });

package/lib/contracts/types/index.d.ts

@@ -1,13 +1,13 @@
-import { GFarmTradingStorageV5, GNSPairInfosV6_1, GNSPairsStorageV6, GTokenOpenPnlFeed } from "./generated";
-export type Contracts = {
-    gfarmTradingStorageV5: GFarmTradingStorageV5;
-    gnsPairInfosV6_1: GNSPairInfosV6_1;
-    gnsPairsStorageV6: GNSPairsStorageV6;
-    gTokenOpenPnlFeed: GTokenOpenPnlFeed;
-};
-export type ContractAddresses = {
-    gfarmTradingStorageV5: string;
-    gnsPairInfosV6_1: string;
-    gnsPairsStorageV6: string;
-    gTokenOpenPnlFeed: string;
-};
+import { GFarmTradingStorageV5, GNSPairInfosV6_1, GNSPairsStorageV6, GTokenOpenPnlFeed } from "./generated";
+export type Contracts = {
+    gfarmTradingStorageV5: GFarmTradingStorageV5;
+    gnsPairInfosV6_1: GNSPairInfosV6_1;
+    gnsPairsStorageV6: GNSPairsStorageV6;
+    gTokenOpenPnlFeed: GTokenOpenPnlFeed;
+};
+export type ContractAddresses = {
+    gfarmTradingStorageV5: string;
+    gnsPairInfosV6_1: string;
+    gnsPairsStorageV6: string;
+    gTokenOpenPnlFeed: string;
+};

package/lib/contracts/types/index.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -1,2 +1,2 @@
-export * from "./openTrades";
-export * from "./pairs";
+export * from "./openTrades";
+export * from "./pairs";

package/lib/contracts/utils/index.js

@@ -1,18 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-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 });
-__exportStar(require("./openTrades"), exports);
-__exportStar(require("./pairs"), exports);
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 });
+__exportStar(require("./openTrades"), exports);
+__exportStar(require("./pairs"), exports);

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

@@ -1,3 +1,3 @@
-import { TradeContainer } from "@/trade/types";
-import { Contracts } from "@/contracts/types";
-export declare const fetchOpenPairTrades: (contracts: Contracts, pairBatchSize?: number) => Promise<TradeContainer[]>;
+import { TradeContainer } from "@/trade/types";
+import { Contracts } from "@/contracts/types";
+export declare const fetchOpenPairTrades: (contracts: Contracts, pairBatchSize?: number, useMulticall?: boolean) => Promise<TradeContainer[]>;

package/lib/contracts/utils/openTrades.js

@@ -1,116 +1,202 @@
-"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.fetchOpenPairTrades = void 0;
-const fetchOpenPairTrades = (contracts, pairBatchSize = 10) => __awaiter(void 0, void 0, void 0, function* () {
-    if (!contracts) {
-        return [];
-    }
-    const { gnsPairsStorageV6: pairsStorageContract } = contracts;
-    try {
-        const totalPairIndexes = (yield pairsStorageContract.pairsCount()).toNumber() - 1;
-        let allOpenPairTrades = [];
-        for (let batchStartPairIndex = 0; batchStartPairIndex < totalPairIndexes; batchStartPairIndex += pairBatchSize) {
-            const batchEndPairIndex = Math.min(batchStartPairIndex + pairBatchSize - 1, totalPairIndexes);
-            const openPairTradesBatch = yield fetchOpenPairTradesBatch(contracts, batchStartPairIndex, batchEndPairIndex);
-            allOpenPairTrades = allOpenPairTrades.concat(openPairTradesBatch);
-        }
-        console.info(`Fetched ${allOpenPairTrades.length} total open pair trade(s).`);
-        return allOpenPairTrades;
-    }
-    catch (error) {
-        console.error(`Unexpected error while fetching open pair trades!`);
-        throw error;
-    }
-});
-exports.fetchOpenPairTrades = fetchOpenPairTrades;
-const fetchOpenPairTradesBatch = (contracts, startPairIndex, endPairIndex) => __awaiter(void 0, void 0, void 0, function* () {
-    const { gfarmTradingStorageV5: storageContract, gnsPairInfosV6_1: pairInfosContract } = 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* () {
-        console.debug(`Fetching pair traders for pairIndex ${pairIndex}...`);
-        const pairTradersCallStartTime = performance.now();
-        const pairTraderAddresses = yield storageContract.pairTradersArray(pairIndex);
-        if (pairTraderAddresses.length === 0) {
-            console.debug(`No pair traders found for pairIndex ${pairIndex}; no processing left to do!`);
-            return [];
-        }
-        console.debug(`Fetched ${pairTraderAddresses.length} pair traders for pairIndex ${pairIndex} in ${performance.now() - pairTradersCallStartTime}ms; now fetching all open trades...`);
-        const openTradesForPairTraders = yield Promise.all(pairTraderAddresses.map((pairTraderAddress) => __awaiter(void 0, void 0, void 0, function* () {
-            const openTradesCalls = new Array(maxTradesPerPair);
-            const traderOpenTradesCallsStartTime = performance.now();
-            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
-                openTradesCalls[pairTradeIndex] = storageContract.openTrades(pairTraderAddress, pairIndex, pairTradeIndex);
-            }
-            /*console.debug(
-              `Waiting on ${openTradesCalls.length} StorageContract::openTrades calls for trader ${pairTraderAddress}...`
-            );*/
-            const openTradesForTraderAddress = yield Promise.all(openTradesCalls);
-            console.debug(`Received all trades for trader ${pairTraderAddress} and pair ${pairIndex} in ${performance.now() - traderOpenTradesCallsStartTime}ms.`);
-            // 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);
-            /*console.debug(
-              `Filtered down to ${actualOpenTradesForTrader.length} actual open trades for trader ${pairTraderAddress} and pair ${pairIndex}; fetching corresponding trade info and initial fees...`
-            );*/
-            const [actualOpenTradesTradeInfos, actualOpenTradesInitialAccFees] = yield Promise.all([
-                Promise.all(actualOpenTradesForTrader.map(aot => storageContract.openTradesInfo(aot.trader, aot.pairIndex, aot.index))),
-                Promise.all(actualOpenTradesForTrader.map(aot => pairInfosContract.tradeInitialAccFees(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) {
-                    console.error("No trade info found for open trade while fetching open trades!", { trade: actualOpenTradesForTrader[tradeIndex] });
-                    continue;
-                }
-                const tradeInitialAccFees = actualOpenTradesInitialAccFees[tradeIndex];
-                if (tradeInitialAccFees === undefined) {
-                    console.error("No initial fees found for open trade while fetching open trades!", { trade: actualOpenTradesForTrader[tradeIndex] });
-                    continue;
-                }
-                const trade = actualOpenTradesForTrader[tradeIndex];
-                finalOpenTradesForTrader[tradeIndex] = {
-                    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",
-                    },
-                };
-            }
-            /*console.debug(
-              `Trade info and initial fees fetched for ${finalOpenTradesForTrader.length} trades for trader ${pairTraderAddress} and pair ${pairIndex}; done!`
-            );*/
-            return finalOpenTradesForTrader;
-        })));
-        return openTradesForPairTraders;
-    })));
-    const perPairTrades = rawTrades.reduce((a, b) => a.concat(b), []);
-    return perPairTrades.reduce((a, b) => a.concat(b), []);
-});
+"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.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 ethers_multicall_1 = require("ethers-multicall");
+const fetchOpenPairTrades = (contracts, pairBatchSize = 50, useMulticall = false) => __awaiter(void 0, void 0, void 0, function* () {
+    if (!contracts) {
+        return [];
+    }
+    const { gnsPairsStorageV6: pairsStorageContract } = contracts;
+    try {
+        const totalPairIndexes = (yield pairsStorageContract.pairsCount()).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)
+                : yield fetchOpenPairTradesBatch(contracts, batchStartPairIndex, batchEndPairIndex);
+            allOpenPairTrades = allOpenPairTrades.concat(openPairTradesBatch);
+        }
+        console.info(`Fetched ${allOpenPairTrades.length} total open pair trade(s).`);
+        return allOpenPairTrades;
+    }
+    catch (error) {
+        console.error(`Unexpected error while fetching open pair trades!`);
+        throw error;
+    }
+});
+exports.fetchOpenPairTrades = fetchOpenPairTrades;
+const fetchOpenPairTradesBatch = (contracts, startPairIndex, endPairIndex) => __awaiter(void 0, void 0, void 0, function* () {
+    const { gfarmTradingStorageV5: storageContract, gnsPairInfosV6_1: pairInfosContract, } = 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* () {
+        console.debug(`Fetching pair traders for pairIndex ${pairIndex}...`);
+        const pairTradersCallStartTime = performance.now();
+        const pairTraderAddresses = yield storageContract.pairTradersArray(pairIndex);
+        if (pairTraderAddresses.length === 0) {
+            console.debug(`No pair traders found for pairIndex ${pairIndex}; no processing left to do!`);
+            return [];
+        }
+        console.debug(`Fetched ${pairTraderAddresses.length} pair traders for pairIndex ${pairIndex} in ${performance.now() - pairTradersCallStartTime}ms; now fetching all open trades...`);
+        const openTradesForPairTraders = yield Promise.all(pairTraderAddresses.map((pairTraderAddress) => __awaiter(void 0, void 0, void 0, function* () {
+            const openTradesCalls = new Array(maxTradesPerPair);
+            const traderOpenTradesCallsStartTime = performance.now();
+            for (let pairTradeIndex = 0; pairTradeIndex < maxTradesPerPair; pairTradeIndex++) {
+                openTradesCalls[pairTradeIndex] = storageContract.openTrades(pairTraderAddress, pairIndex, pairTradeIndex);
+            }
+            /*console.debug(
+              `Waiting on ${openTradesCalls.length} StorageContract::openTrades calls for trader ${pairTraderAddress}...`
+            );*/
+            const openTradesForTraderAddress = yield Promise.all(openTradesCalls);
+            console.debug(`Received all trades for trader ${pairTraderAddress} and pair ${pairIndex} in ${performance.now() - traderOpenTradesCallsStartTime}ms.`);
+            // 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);
+            /*console.debug(
+              `Filtered down to ${actualOpenTradesForTrader.length} actual open trades for trader ${pairTraderAddress} and pair ${pairIndex}; fetching corresponding trade info and initial fees...`
+            );*/
+            const [actualOpenTradesTradeInfos, actualOpenTradesInitialAccFees] = yield Promise.all([
+                Promise.all(actualOpenTradesForTrader.map(aot => storageContract.openTradesInfo(aot.trader, aot.pairIndex, aot.index))),
+                Promise.all(actualOpenTradesForTrader.map(aot => pairInfosContract.tradeInitialAccFees(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) {
+                    //   console.error(
+                    //     "No trade info found for open trade while fetching open trades!",
+                    //     { trade: actualOpenTradesForTrader[tradeIndex] }
+                    //   );
+                    continue;
+                }
+                const tradeInitialAccFees = actualOpenTradesInitialAccFees[tradeIndex];
+                if (tradeInitialAccFees === undefined) {
+                    //   console.error(
+                    //     "No initial fees found for open trade while fetching open trades!",
+                    //     { trade: actualOpenTradesForTrader[tradeIndex] }
+                    //   );
+                    continue;
+                }
+                const trade = actualOpenTradesForTrader[tradeIndex];
+                finalOpenTradesForTrader[tradeIndex] = {
+                    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",
+                    },
+                };
+            }
+            /*console.debug(
+              `Trade info and initial fees fetched for ${finalOpenTradesForTrader.length} trades for trader ${pairTraderAddress} and pair ${pairIndex}; done!`
+            );*/
+            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) => __awaiter(void 0, void 0, void 0, function* () {
+    const { gfarmTradingStorageV5: storageContract, gnsPairInfosV6_1: pairInfosContract, } = contracts;
+    // Convert to Multicall for efficient RPC usage
+    const chainId = (yield storageContract.provider.getNetwork()).chainId;
+    const multicallProvider = new ethers_multicall_1.Provider(storageContract.provider, chainId);
+    const storageContractMulticall = new ethers_multicall_1.Contract(storageContract.address, [
+        ...storageContract.interface.fragments,
+    ]);
+    const pairInfosContractMulticall = new ethers_multicall_1.Contract(pairInfosContract.address, [
+        ...pairInfosContract.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)));
+    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), []));
+    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))),
+        multicallProvider.all(openTrades.map(openTrade => pairInfosContractMulticall.tradeInitialAccFees(openTrade.trader, openTrade.pairIndex, openTrade.index))),
+    ]);
+    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;
+        }
+        const tradeInitialAccFees = openTradesInitialAccFees[tradeIndex];
+        if (tradeInitialAccFees === undefined) {
+            console.error("No initial fees found for open trade while fetching open trades!", { trade: openTrades[tradeIndex] });
+            continue;
+        }
+        const trade = openTrades[tradeIndex];
+        finalTrades[tradeIndex] = {
+            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",
+            },
+        };
+    }
+    return finalTrades.filter(trade => trade !== undefined);
+});

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

@@ -0,0 +1,3 @@
+import { TradeContainer } from "@/trade/types";
+import { Contracts } from "@/contracts/types";
+export declare const fetchOpenPairTradesOriginal: (contracts: Contracts, pairBatchSize?: number) => Promise<TradeContainer[]>;