@defisaver/automation-sdk 3.1.1 → 3.1.2

package/cjs/index.d.ts

@@ -1,23 +1,23 @@
-import './configuration';
-import LegacyMakerAutomation from './automation/public/legacy/LegacyMakerAutomation';
-import LegacyAaveAutomation from './automation/public/legacy/LegacyAaveAutomation';
-import LegacyCompoundAutomation from './automation/public/legacy/LegacyCompoundAutomation';
-import EthereumStrategies from './automation/public/EthereumStrategies';
-import OptimismStrategies from './automation/public/OptimismStrategies';
-import ArbitrumStrategies from './automation/public/ArbitrumStrategies';
-import BaseStrategies from './automation/public/BaseStrategies';
-import * as triggerService from './services/triggerService';
-import * as subDataService from './services/subDataService';
-import * as strategySubService from './services/strategySubService';
-import * as strategiesService from './services/strategiesService';
-import * as constants from './constants';
-import * as enums from './types/enums';
-import type * as types from './types';
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
-declare const utils: {
-    getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
-    compareSubHashes: typeof compareSubHashes;
-    encodeSubId: typeof encodeSubId;
-};
-export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
-export type { types };
+import './configuration';
+import LegacyMakerAutomation from './automation/public/legacy/LegacyMakerAutomation';
+import LegacyAaveAutomation from './automation/public/legacy/LegacyAaveAutomation';
+import LegacyCompoundAutomation from './automation/public/legacy/LegacyCompoundAutomation';
+import EthereumStrategies from './automation/public/EthereumStrategies';
+import OptimismStrategies from './automation/public/OptimismStrategies';
+import ArbitrumStrategies from './automation/public/ArbitrumStrategies';
+import BaseStrategies from './automation/public/BaseStrategies';
+import * as triggerService from './services/triggerService';
+import * as subDataService from './services/subDataService';
+import * as strategySubService from './services/strategySubService';
+import * as strategiesService from './services/strategiesService';
+import * as constants from './constants';
+import * as enums from './types/enums';
+import type * as types from './types';
+import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+declare const utils: {
+    getRatioStateInfoForAaveCloseStrategy: typeof getRatioStateInfoForAaveCloseStrategy;
+    compareSubHashes: typeof compareSubHashes;
+    encodeSubId: typeof encodeSubId;
+};
+export { LegacyMakerAutomation, LegacyAaveAutomation, LegacyCompoundAutomation, EthereumStrategies, OptimismStrategies, ArbitrumStrategies, BaseStrategies, triggerService, subDataService, strategySubService, utils, enums, constants, strategiesService, };
+export type { types };

package/cjs/index.js

@@ -1,65 +1,65 @@
-"use strict";
-// TODO
-//  [] Check @ts-ignores and PlaceholderType
-//  [] Improve typing for subData, trigger and strategySub services
-//  [] Make possible to use any provider not only web3 (This requires changes throughout the package)
-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;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.strategiesService = exports.constants = exports.enums = exports.utils = exports.strategySubService = exports.subDataService = exports.triggerService = exports.BaseStrategies = exports.ArbitrumStrategies = exports.OptimismStrategies = exports.EthereumStrategies = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.LegacyMakerAutomation = void 0;
-require("./configuration");
-const LegacyMakerAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyMakerAutomation"));
-exports.LegacyMakerAutomation = LegacyMakerAutomation_1.default;
-const LegacyAaveAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyAaveAutomation"));
-exports.LegacyAaveAutomation = LegacyAaveAutomation_1.default;
-const LegacyCompoundAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyCompoundAutomation"));
-exports.LegacyCompoundAutomation = LegacyCompoundAutomation_1.default;
-const EthereumStrategies_1 = __importDefault(require("./automation/public/EthereumStrategies"));
-exports.EthereumStrategies = EthereumStrategies_1.default;
-const OptimismStrategies_1 = __importDefault(require("./automation/public/OptimismStrategies"));
-exports.OptimismStrategies = OptimismStrategies_1.default;
-const ArbitrumStrategies_1 = __importDefault(require("./automation/public/ArbitrumStrategies"));
-exports.ArbitrumStrategies = ArbitrumStrategies_1.default;
-const BaseStrategies_1 = __importDefault(require("./automation/public/BaseStrategies"));
-exports.BaseStrategies = BaseStrategies_1.default;
-const triggerService = __importStar(require("./services/triggerService"));
-exports.triggerService = triggerService;
-const subDataService = __importStar(require("./services/subDataService"));
-exports.subDataService = subDataService;
-const strategySubService = __importStar(require("./services/strategySubService"));
-exports.strategySubService = strategySubService;
-const strategiesService = __importStar(require("./services/strategiesService"));
-exports.strategiesService = strategiesService;
-const constants = __importStar(require("./constants"));
-exports.constants = constants;
-const enums = __importStar(require("./types/enums"));
-exports.enums = enums;
-const utils_1 = require("./services/utils");
-const utils = {
-    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId,
-};
-exports.utils = utils;
+"use strict";
+// TODO
+//  [] Check @ts-ignores and PlaceholderType
+//  [] Improve typing for subData, trigger and strategySub services
+//  [] Make possible to use any provider not only web3 (This requires changes throughout the package)
+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;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.strategiesService = exports.constants = exports.enums = exports.utils = exports.strategySubService = exports.subDataService = exports.triggerService = exports.BaseStrategies = exports.ArbitrumStrategies = exports.OptimismStrategies = exports.EthereumStrategies = exports.LegacyCompoundAutomation = exports.LegacyAaveAutomation = exports.LegacyMakerAutomation = void 0;
+require("./configuration");
+const LegacyMakerAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyMakerAutomation"));
+exports.LegacyMakerAutomation = LegacyMakerAutomation_1.default;
+const LegacyAaveAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyAaveAutomation"));
+exports.LegacyAaveAutomation = LegacyAaveAutomation_1.default;
+const LegacyCompoundAutomation_1 = __importDefault(require("./automation/public/legacy/LegacyCompoundAutomation"));
+exports.LegacyCompoundAutomation = LegacyCompoundAutomation_1.default;
+const EthereumStrategies_1 = __importDefault(require("./automation/public/EthereumStrategies"));
+exports.EthereumStrategies = EthereumStrategies_1.default;
+const OptimismStrategies_1 = __importDefault(require("./automation/public/OptimismStrategies"));
+exports.OptimismStrategies = OptimismStrategies_1.default;
+const ArbitrumStrategies_1 = __importDefault(require("./automation/public/ArbitrumStrategies"));
+exports.ArbitrumStrategies = ArbitrumStrategies_1.default;
+const BaseStrategies_1 = __importDefault(require("./automation/public/BaseStrategies"));
+exports.BaseStrategies = BaseStrategies_1.default;
+const triggerService = __importStar(require("./services/triggerService"));
+exports.triggerService = triggerService;
+const subDataService = __importStar(require("./services/subDataService"));
+exports.subDataService = subDataService;
+const strategySubService = __importStar(require("./services/strategySubService"));
+exports.strategySubService = strategySubService;
+const strategiesService = __importStar(require("./services/strategiesService"));
+exports.strategiesService = strategiesService;
+const constants = __importStar(require("./constants"));
+exports.constants = constants;
+const enums = __importStar(require("./types/enums"));
+exports.enums = enums;
+const utils_1 = require("./services/utils");
+const utils = {
+    getRatioStateInfoForAaveCloseStrategy: utils_1.getRatioStateInfoForAaveCloseStrategy, compareSubHashes: utils_1.compareSubHashes, encodeSubId: utils_1.encodeSubId,
+};
+exports.utils = utils;

package/cjs/services/contractService.d.ts

@@ -1,12 +1,12 @@
-import type Web3 from 'web3';
-import type { AbiItem } from 'web3-utils';
-import type { Contract, EthereumAddress } from '../types';
-import type { BaseContract } from '../types/contracts/generated/types';
-import type { Legacy_AuthCheck, SubStorage, UniMulticall, Erc20 } from '../types/contracts/generated';
-import { ChainId } from '../types/enums';
-export declare function getAbiItem(abi: AbiItem[], itemName: string): AbiItem;
-export declare function makeUniMulticallContract(web3: Web3, chainId: ChainId): Contract.WithMeta<UniMulticall>;
-export declare function makeSubStorageContract(web3: Web3, chainId: ChainId): Contract.WithMeta<SubStorage>;
-export declare function makeAuthCheckerContract(web3: Web3, chainId: ChainId): Contract.WithMeta<Legacy_AuthCheck>;
-export declare function makeLegacySubscriptionContract<T extends BaseContract>(web3: Web3, contractJson: Contract.Json): Contract.WithMeta<T>;
-export declare function makeErc20Contract(web3: Web3, tokenAddress: EthereumAddress, chainId: ChainId): Contract.WithMeta<Erc20>;
+import type Web3 from 'web3';
+import type { AbiItem } from 'web3-utils';
+import type { Contract, EthereumAddress } from '../types';
+import type { BaseContract } from '../types/contracts/generated/types';
+import type { Legacy_AuthCheck, SubStorage, UniMulticall, Erc20 } from '../types/contracts/generated';
+import { ChainId } from '../types/enums';
+export declare function getAbiItem(abi: AbiItem[], itemName: string): AbiItem;
+export declare function makeUniMulticallContract(web3: Web3, chainId: ChainId): Contract.WithMeta<UniMulticall>;
+export declare function makeSubStorageContract(web3: Web3, chainId: ChainId): Contract.WithMeta<SubStorage>;
+export declare function makeAuthCheckerContract(web3: Web3, chainId: ChainId): Contract.WithMeta<Legacy_AuthCheck>;
+export declare function makeLegacySubscriptionContract<T extends BaseContract>(web3: Web3, contractJson: Contract.Json): Contract.WithMeta<T>;
+export declare function makeErc20Contract(web3: Web3, tokenAddress: EthereumAddress, chainId: ChainId): Contract.WithMeta<Erc20>;

package/cjs/services/contractService.js

@@ -1,54 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeErc20Contract = exports.makeLegacySubscriptionContract = exports.makeAuthCheckerContract = exports.makeSubStorageContract = exports.makeUniMulticallContract = exports.getAbiItem = void 0;
-const abis_1 = require("../abis");
-const utils_1 = require("./utils");
-const enums_1 = require("../types/enums");
-function getAbiItem(abi, itemName) {
-    const abiItem = abi.find(i => i.name === itemName);
-    if ((0, utils_1.isDefined)(abiItem)) {
-        return abiItem;
-    }
-    throw new Error(`Can't find abi item for itemName: ${itemName}`);
-}
-exports.getAbiItem = getAbiItem;
-function makeContract(web3, contractJson, chainId) {
-    const { abi } = contractJson;
-    let _address = '';
-    let _createdBlock = 'earliest';
-    if (contractJson.networks) {
-        const { address, createdBlock } = contractJson.networks[chainId];
-        _address = address;
-        if ((0, utils_1.isDefined)(createdBlock)) {
-            _createdBlock = createdBlock;
-        }
-    }
-    return {
-        abi,
-        address: _address,
-        createdBlock: _createdBlock,
-        contract: new web3.eth.Contract(abi, _address),
-    };
-}
-function makeUniMulticallContract(web3, chainId) {
-    return makeContract(web3, abis_1.UniMulticallJson, chainId);
-}
-exports.makeUniMulticallContract = makeUniMulticallContract;
-function makeSubStorageContract(web3, chainId) {
-    return makeContract(web3, abis_1.SubStorageJson, chainId);
-}
-exports.makeSubStorageContract = makeSubStorageContract;
-function makeAuthCheckerContract(web3, chainId) {
-    return makeContract(web3, abis_1.AuthCheckJson, chainId);
-}
-exports.makeAuthCheckerContract = makeAuthCheckerContract;
-function makeLegacySubscriptionContract(web3, contractJson) {
-    return makeContract(web3, contractJson, enums_1.ChainId.Ethereum);
-}
-exports.makeLegacySubscriptionContract = makeLegacySubscriptionContract;
-function makeErc20Contract(web3, tokenAddress, chainId) {
-    return makeContract(web3, Object.assign(Object.assign({}, abis_1.Erc20Json), { networks: {
-            [chainId]: { address: tokenAddress },
-        } }), chainId);
-}
-exports.makeErc20Contract = makeErc20Contract;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeErc20Contract = exports.makeLegacySubscriptionContract = exports.makeAuthCheckerContract = exports.makeSubStorageContract = exports.makeUniMulticallContract = exports.getAbiItem = void 0;
+const abis_1 = require("../abis");
+const utils_1 = require("./utils");
+const enums_1 = require("../types/enums");
+function getAbiItem(abi, itemName) {
+    const abiItem = abi.find(i => i.name === itemName);
+    if ((0, utils_1.isDefined)(abiItem)) {
+        return abiItem;
+    }
+    throw new Error(`Can't find abi item for itemName: ${itemName}`);
+}
+exports.getAbiItem = getAbiItem;
+function makeContract(web3, contractJson, chainId) {
+    const { abi } = contractJson;
+    let _address = '';
+    let _createdBlock = 'earliest';
+    if (contractJson.networks) {
+        const { address, createdBlock } = contractJson.networks[chainId];
+        _address = address;
+        if ((0, utils_1.isDefined)(createdBlock)) {
+            _createdBlock = createdBlock;
+        }
+    }
+    return {
+        abi,
+        address: _address,
+        createdBlock: _createdBlock,
+        contract: new web3.eth.Contract(abi, _address),
+    };
+}
+function makeUniMulticallContract(web3, chainId) {
+    return makeContract(web3, abis_1.UniMulticallJson, chainId);
+}
+exports.makeUniMulticallContract = makeUniMulticallContract;
+function makeSubStorageContract(web3, chainId) {
+    return makeContract(web3, abis_1.SubStorageJson, chainId);
+}
+exports.makeSubStorageContract = makeSubStorageContract;
+function makeAuthCheckerContract(web3, chainId) {
+    return makeContract(web3, abis_1.AuthCheckJson, chainId);
+}
+exports.makeAuthCheckerContract = makeAuthCheckerContract;
+function makeLegacySubscriptionContract(web3, contractJson) {
+    return makeContract(web3, contractJson, enums_1.ChainId.Ethereum);
+}
+exports.makeLegacySubscriptionContract = makeLegacySubscriptionContract;
+function makeErc20Contract(web3, tokenAddress, chainId) {
+    return makeContract(web3, Object.assign(Object.assign({}, abis_1.Erc20Json), { networks: {
+            [chainId]: { address: tokenAddress },
+        } }), chainId);
+}
+exports.makeErc20Contract = makeErc20Contract;

package/cjs/services/ethereumService.d.ts

@@ -1,7 +1,7 @@
-import type Web3 from 'web3';
-import type { PastEventOptions } from 'web3-eth-contract';
-import type { BlockNumber, Multicall, Contract } from '../types';
-import type { BaseContract } from '../types/contracts/generated/types';
-import type { ChainId } from '../types/enums';
-export declare function multicall(web3: Web3, chainId: ChainId, calls: Multicall.Calls[], block?: BlockNumber): Promise<Multicall.Payload>;
-export declare function getEventsFromContract<T extends BaseContract>(contractWithMeta: Contract.WithMeta<T>, contractWithMetaFork: Contract.WithMeta<T> | null, event: string, options?: PastEventOptions): Promise<any[]>;
+import type Web3 from 'web3';
+import type { PastEventOptions } from 'web3-eth-contract';
+import type { BlockNumber, Multicall, Contract } from '../types';
+import type { BaseContract } from '../types/contracts/generated/types';
+import type { ChainId } from '../types/enums';
+export declare function multicall(web3: Web3, chainId: ChainId, calls: Multicall.Calls[], block?: BlockNumber): Promise<Multicall.Payload>;
+export declare function getEventsFromContract<T extends BaseContract>(contractWithMeta: Contract.WithMeta<T>, contractWithMetaFork: Contract.WithMeta<T> | null, event: string, options?: PastEventOptions): Promise<any[]>;

package/cjs/services/ethereumService.js

@@ -1,49 +1,49 @@
-"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());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEventsFromContract = exports.multicall = void 0;
-const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
-const contractService_1 = require("./contractService");
-const utils_1 = require("./utils");
-function multicall(web3, chainId, calls, block = 'latest') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const multicallContract = (0, contractService_1.makeUniMulticallContract)(web3, chainId).contract;
-        const formattedCalls = calls.map((call) => ({
-            callData: web3_eth_abi_1.default.encodeFunctionCall(call.abiItem, call.params),
-            target: call.target || '0x0',
-            gasLimit: call.gasLimit || 1e6,
-        }));
-        const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, block);
-        let formattedResult = [];
-        callResult.returnData.forEach(([success, gasUsed, result], i) => {
-            const formattedRes = (result !== '0x'
-                ? web3_eth_abi_1.default.decodeParameters(calls[i].abiItem.outputs, result)
-                : undefined);
-            formattedResult = [...formattedResult, formattedRes];
-        });
-        return formattedResult;
-    });
-}
-exports.multicall = multicall;
-function getEventsFromContract(contractWithMeta, contractWithMetaFork, event, options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const events = yield contractWithMeta.contract.getPastEvents(event, Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), Object.assign(Object.assign({}, options), { fromBlock: contractWithMeta.createdBlock }))));
-        let eventsFork = [];
-        if (contractWithMetaFork) {
-            eventsFork = yield contractWithMetaFork.contract.getPastEvents(event, Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), Object.assign(Object.assign({}, options), { toBlock: 'latest' }))));
-        }
-        return [...events, ...eventsFork];
-    });
-}
-exports.getEventsFromContract = getEventsFromContract;
+"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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEventsFromContract = exports.multicall = void 0;
+const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
+const contractService_1 = require("./contractService");
+const utils_1 = require("./utils");
+function multicall(web3, chainId, calls, block = 'latest') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const multicallContract = (0, contractService_1.makeUniMulticallContract)(web3, chainId).contract;
+        const formattedCalls = calls.map((call) => ({
+            callData: web3_eth_abi_1.default.encodeFunctionCall(call.abiItem, call.params),
+            target: call.target || '0x0',
+            gasLimit: call.gasLimit || 1e6,
+        }));
+        const callResult = yield multicallContract.methods.multicall(formattedCalls.filter(item => item.target !== '0x0')).call({}, block);
+        let formattedResult = [];
+        callResult.returnData.forEach(([success, gasUsed, result], i) => {
+            const formattedRes = (result !== '0x'
+                ? web3_eth_abi_1.default.decodeParameters(calls[i].abiItem.outputs, result)
+                : undefined);
+            formattedResult = [...formattedResult, formattedRes];
+        });
+        return formattedResult;
+    });
+}
+exports.multicall = multicall;
+function getEventsFromContract(contractWithMeta, contractWithMetaFork, event, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const events = yield contractWithMeta.contract.getPastEvents(event, Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), Object.assign(Object.assign({}, options), { fromBlock: contractWithMeta.createdBlock }))));
+        let eventsFork = [];
+        if (contractWithMetaFork) {
+            eventsFork = yield contractWithMetaFork.contract.getPastEvents(event, Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), Object.assign(Object.assign({}, options), { toBlock: 'latest' }))));
+        }
+        return [...events, ...eventsFork];
+    });
+}
+exports.getEventsFromContract = getEventsFromContract;

package/cjs/services/ethereumService.test.d.ts

@@ -1 +1 @@
-import '../configuration';
+import '../configuration';