@defisaver/automation-sdk 3.0.9 → 3.1.1-dev

package/esm/automation/private/Protocol.js

@@ -1,41 +1,38 @@
-"use strict";
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _Protocol_versionSeparator;
-Object.defineProperty(exports, "__esModule", { value: true });
-class Protocol {
-    constructor(args) {
-        _Protocol_versionSeparator.set(this, '__');
-        this.id = args.id;
-        this.name = this.getName();
-        this.slug = this.getSlug();
-        this.version = this.getVersion();
-        this.fullName = this.getFullName();
-    }
-    hasVersion() {
-        return this.id.indexOf(__classPrivateFieldGet(this, _Protocol_versionSeparator, "f")) !== -1;
-    }
-    splitId() {
-        return this.id.split(__classPrivateFieldGet(this, _Protocol_versionSeparator, "f"));
-    }
-    /**
-     * @dev See naming convention at ProtocolIdentifiers declaration
-     */
-    getVersion() {
-        return this.hasVersion() ? this.splitId().reverse()[0] : '';
-    }
-    getName() {
-        return this.hasVersion() ? this.splitId()[0] : this.id;
-    }
-    getSlug() {
-        return this.name.split(' ').join('-').toLowerCase();
-    }
-    getFullName() {
-        return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
-    }
-}
-exports.default = Protocol;
-_Protocol_versionSeparator = new WeakMap();
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _Protocol_versionSeparator;
+export default class Protocol {
+    constructor(args) {
+        _Protocol_versionSeparator.set(this, '__');
+        this.id = args.id;
+        this.name = this.getName();
+        this.slug = this.getSlug();
+        this.version = this.getVersion();
+        this.fullName = this.getFullName();
+    }
+    hasVersion() {
+        return this.id.indexOf(__classPrivateFieldGet(this, _Protocol_versionSeparator, "f")) !== -1;
+    }
+    splitId() {
+        return this.id.split(__classPrivateFieldGet(this, _Protocol_versionSeparator, "f"));
+    }
+    /**
+     * @dev See naming convention at ProtocolIdentifiers declaration
+     */
+    getVersion() {
+        return this.hasVersion() ? this.splitId().reverse()[0] : '';
+    }
+    getName() {
+        return this.hasVersion() ? this.splitId()[0] : this.id;
+    }
+    getSlug() {
+        return this.name.split(' ').join('-').toLowerCase();
+    }
+    getFullName() {
+        return this.hasVersion() ? `${this.name} ${this.version}` : this.name;
+    }
+}
+_Protocol_versionSeparator = new WeakMap();

package/esm/automation/private/Protocol.test.d.ts

@@ -1 +1 @@
-export {};
+export {};

package/esm/automation/private/Protocol.test.js

@@ -1,25 +1,20 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-const enums_1 = require("../../types/enums");
-const Protocol_1 = __importDefault(require("./Protocol"));
-describe('Feature: Protocol.ts', () => {
-    describe('When testing class Protocol', () => {
-        const exampleProtocol = new Protocol_1.default({ id: enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV3 });
-        const examples = [
-            [exampleProtocol.id, 'Aave__V3'],
-            [exampleProtocol.name, 'Aave'],
-            [exampleProtocol.slug, 'aave'],
-            [exampleProtocol.version, 'V3'],
-            [exampleProtocol.fullName, 'Aave V3'],
-        ];
-        examples.forEach(([expected, actual]) => {
-            it(`Given ${actual} should return expected value: ${expected}`, () => {
-                (0, chai_1.expect)(actual).to.equal(expected);
-            });
-        });
-    });
-});
+import { expect } from 'chai';
+import { ProtocolIdentifiers } from '../../types/enums';
+import Protocol from './Protocol';
+describe('Feature: Protocol.ts', () => {
+    describe('When testing class Protocol', () => {
+        const exampleProtocol = new Protocol({ id: ProtocolIdentifiers.StrategiesAutomation.AaveV3 });
+        const examples = [
+            [exampleProtocol.id, 'Aave__V3'],
+            [exampleProtocol.name, 'Aave'],
+            [exampleProtocol.slug, 'aave'],
+            [exampleProtocol.version, 'V3'],
+            [exampleProtocol.fullName, 'Aave V3'],
+        ];
+        examples.forEach(([expected, actual]) => {
+            it(`Given ${actual} should return expected value: ${expected}`, () => {
+                expect(actual).to.equal(expected);
+            });
+        });
+    });
+});

package/esm/automation/private/StrategiesAutomation.d.ts

@@ -1,33 +1,33 @@
-import type Web3 from 'web3';
-import type { PastEventOptions } from 'web3-eth-contract';
-import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber } from '../../types';
-import type { StrategyModel, SubStorage } from '../../types/contracts/generated/SubStorage';
-import type { ChainId } from '../../types/enums';
-import Automation from './Automation';
-interface IStrategiesAutomation extends Interfaces.Automation {
-    chainId: ChainId;
-    providerFork: Web3;
-}
-export default class StrategiesAutomation extends Automation {
-    protected chainId: ChainId;
-    protected web3: Web3;
-    protected web3Fork: Web3;
-    protected subStorageContract: Contract.WithMeta<SubStorage>;
-    protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
-    constructor(args: IStrategiesAutomation);
-    protected getEventFromSubStorage(event: string, options?: PastEventOptions): Promise<any[]>;
-    protected getStrategiesSubs(subIds: number[], fromBlock?: BlockNumber): Promise<StrategyModel.StoredSubDataStructOutputStruct[]>;
-    protected getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
-    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
-    protected getParsedSubscriptions(parseData: ParseData): Position.Automated | null;
-    /**
-     * @description Removes expired Limit Order subscriptions
-     */
-    protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]): (Position.Automated | null)[];
-    private _mergeCheck;
-    protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
-    protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
-    getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
-    getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
-}
-export {};
+import type Web3 from 'web3';
+import type { PastEventOptions } from 'web3-eth-contract';
+import type { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber } from '../../types';
+import type { StrategyModel, SubStorage } from '../../types/contracts/generated/SubStorage';
+import type { ChainId } from '../../types/enums';
+import Automation from './Automation';
+interface IStrategiesAutomation extends Interfaces.Automation {
+    chainId: ChainId;
+    providerFork: Web3;
+}
+export default class StrategiesAutomation extends Automation {
+    protected chainId: ChainId;
+    protected web3: Web3;
+    protected web3Fork: Web3;
+    protected subStorageContract: Contract.WithMeta<SubStorage>;
+    protected subStorageContractFork: Contract.WithMeta<SubStorage> | null;
+    constructor(args: IStrategiesAutomation);
+    protected getEventFromSubStorage(event: string, options?: PastEventOptions): Promise<any[]>;
+    protected getStrategiesSubs(subIds: number[], fromBlock?: BlockNumber): Promise<StrategyModel.StoredSubDataStructOutputStruct[]>;
+    protected getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
+    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<any[]>;
+    protected getParsedSubscriptions(parseData: ParseData): Position.Automated | null;
+    /**
+     * @description Removes expired Limit Order subscriptions
+     */
+    protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]): (Position.Automated | null)[];
+    private _mergeCheck;
+    protected mergeSubs(_subscriptions: (Position.Automated | null)[]): Position.Automated[];
+    protected _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
+    getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
+    getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
+}
+export {};

package/esm/automation/private/StrategiesAutomation.js

@@ -1,181 +1,175 @@
-"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 });
-const decimal_js_1 = __importDefault(require("decimal.js"));
-const enums_1 = require("../../types/enums");
-const utils_1 = require("../../services/utils");
-const contractService_1 = require("../../services/contractService");
-const ethereumService_1 = require("../../services/ethereumService");
-const strategiesService_1 = require("../../services/strategiesService");
-const Automation_1 = __importDefault(require("./Automation"));
-class StrategiesAutomation extends Automation_1.default {
-    constructor(args) {
-        super();
-        this.web3 = args.provider;
-        this.web3Fork = args.providerFork;
-        this.chainId = args.chainId;
-        this.subStorageContract = (0, contractService_1.makeSubStorageContract)(this.web3, this.chainId);
-        this.subStorageContractFork = this.web3Fork ? (0, contractService_1.makeSubStorageContract)(this.web3Fork, this.chainId) : null;
-        this.assert();
-    }
-    getEventFromSubStorage(event, options) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            // only used for backfilling, so in case options?.fromBlock in undefined
-            // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
-            if (new decimal_js_1.default(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || this.subStorageContract.createdBlock.toString())) {
-                return [];
-            }
-            return (0, ethereumService_1.getEventsFromContract)(this.subStorageContract, this.subStorageContractFork, event, options);
-        });
-    }
-    getStrategiesSubs(subIds, fromBlock = 'latest') {
-        return __awaiter(this, void 0, void 0, function* () {
-            let options;
-            let web3;
-            if (this.web3Fork && this.subStorageContractFork) {
-                options = {
-                    target: this.subStorageContractFork.address,
-                    abiItem: (0, contractService_1.getAbiItem)(this.subStorageContractFork.abi, 'strategiesSubs'),
-                };
-                web3 = this.web3Fork;
-            }
-            else {
-                options = {
-                    target: this.subStorageContract.address,
-                    abiItem: (0, contractService_1.getAbiItem)(this.subStorageContract.abi, 'strategiesSubs'),
-                };
-                web3 = this.web3;
-            }
-            const multicallCalls = subIds.map((subId) => (Object.assign(Object.assign({}, options), { params: [subId] })));
-            return (0, ethereumService_1.multicall)(web3, this.chainId, multicallCalls, fromBlock);
-        });
-    }
-    getSubscriptionEventsFromSubStorage(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.getEventFromSubStorage('Subscribe', options);
-        });
-    }
-    getUpdateDataEventsFromSubStorage(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const events = yield this.getEventFromSubStorage('UpdateData', options);
-            /** @dev - Some RPCs sort events differently */
-            return events.sort((a, b) => a.blockNumber - b.blockNumber);
-        });
-    }
-    getParsedSubscriptions(parseData) {
-        return (0, strategiesService_1.parseStrategiesAutomatedPosition)(parseData);
-    }
-    /**
-     * @description Removes expired Limit Order subscriptions
-     */
-    removeExpiredSubscriptions(subscriptions) {
-        return subscriptions.filter((subscription) => {
-            if (!subscription) {
-                return true;
-            }
-            const { protocol, strategy, strategyData } = subscription;
-            if (protocol.id === enums_1.ProtocolIdentifiers.StrategiesAutomation.Exchange
-                && strategy.strategyId === enums_1.Strategies.Identifiers.LimitOrder) {
-                return new decimal_js_1.default(strategyData.decoded.triggerData.goodUntil).gt(new decimal_js_1.default(Date.now()).div(1000));
-            }
-            return true;
-        });
-    }
-    _mergeCheck(s, current) {
-        return s.owner === current.owner
-            && s.strategy.strategyId === current.strategy.strategyId
-            && s.protocol.id === current.protocol.id
-            && s.specific.mergeId === current.specific.mergeWithId
-            && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
-                || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId)
-            && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
-                || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase())
-            && (s.protocol.id !== enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
-                || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase());
-    }
-    mergeSubs(_subscriptions) {
-        const mergeBase = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isDefined)(s.specific.mergeWithId));
-        const mergeExtension = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isDefined)(s.specific.mergeId));
-        let subscriptions = _subscriptions.filter(s => (0, utils_1.isDefined)(s) && (0, utils_1.isUndefined)(s.specific.mergeWithId) && (0, utils_1.isUndefined)(s.specific.mergeId)).map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })));
-        mergeBase.forEach((current) => {
-            const mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
-            const mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
-            const mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
-            if (mergePairIndex !== -1) {
-                const mergePair = mergeExtension[mergePairIndex];
-                mergeExtension.splice(mergePairIndex, 1);
-                subscriptions.push(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
-                    // @ts-ignore
-                    blockNumber: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
-            }
-            else {
-                subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
-            }
-        });
-        if (mergeExtension.length > 0) {
-            console.error('Not all merge-able extensions were used', mergeExtension);
-            subscriptions = [...subscriptions, ...mergeExtension.map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
-        }
-        return subscriptions;
-    }
-    _getSubscriptions(addresses, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const _options = Object.assign(Object.assign({}, (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(options), options)), (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(addresses), { filter: { proxy: addresses } }));
-            let subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
-            let subscriptions = [];
-            if (subscriptionEvents) {
-                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
-                if (_options.enabledOnly) {
-                    const filteredSubscriptionEvents = [];
-                    strategiesSubs = strategiesSubs.filter((sub, index) => {
-                        if (sub === null || sub === void 0 ? void 0 : sub.isEnabled)
-                            filteredSubscriptionEvents.push(subscriptionEvents[index]);
-                        return sub === null || sub === void 0 ? void 0 : sub.isEnabled;
-                    });
-                    subscriptionEvents = filteredSubscriptionEvents;
-                }
-                subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    let latestUpdate = subscriptionEvents[index].returnValues;
-                    if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
-                        const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, (0, utils_1.addToObjectIf)(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
-                        latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
-                    }
-                    return this.getParsedSubscriptions({
-                        chainId: this.chainId,
-                        blockNumber: subscriptionEvents[index].blockNumber,
-                        subscriptionEventData: latestUpdate,
-                        strategiesSubsData: sub,
-                    });
-                })));
-                if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
-                    subscriptions = this.mergeSubs(subscriptions);
-                }
-            }
-            return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
-        });
-    }
-    getSubscriptions(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._getSubscriptions(undefined, options);
-        });
-    }
-    getSubscriptionsFor(addresses, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this._getSubscriptions(addresses, options);
-        });
-    }
-}
-exports.default = StrategiesAutomation;
+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());
+    });
+};
+import Dec from 'decimal.js';
+import { Strategies, ProtocolIdentifiers } from '../../types/enums';
+import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
+import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
+import { getEventsFromContract, multicall } from '../../services/ethereumService';
+import { parseStrategiesAutomatedPosition } from '../../services/strategiesService';
+import Automation from './Automation';
+export default class StrategiesAutomation extends Automation {
+    constructor(args) {
+        super();
+        this.web3 = args.provider;
+        this.web3Fork = args.providerFork;
+        this.chainId = args.chainId;
+        this.subStorageContract = makeSubStorageContract(this.web3, this.chainId);
+        this.subStorageContractFork = this.web3Fork ? makeSubStorageContract(this.web3Fork, this.chainId) : null;
+        this.assert();
+    }
+    getEventFromSubStorage(event, options) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            // only used for backfilling, so in case options?.fromBlock in undefined
+            // (just like we omit fromBlock when we call from app when not on fork), we still want to fetch events
+            if (new Dec(this.subStorageContract.createdBlock.toString()).gt(((_a = options === null || options === void 0 ? void 0 : options.fromBlock) === null || _a === void 0 ? void 0 : _a.toString()) || this.subStorageContract.createdBlock.toString())) {
+                return [];
+            }
+            return getEventsFromContract(this.subStorageContract, this.subStorageContractFork, event, options);
+        });
+    }
+    getStrategiesSubs(subIds, fromBlock = 'latest') {
+        return __awaiter(this, void 0, void 0, function* () {
+            let options;
+            let web3;
+            if (this.web3Fork && this.subStorageContractFork) {
+                options = {
+                    target: this.subStorageContractFork.address,
+                    abiItem: getAbiItem(this.subStorageContractFork.abi, 'strategiesSubs'),
+                };
+                web3 = this.web3Fork;
+            }
+            else {
+                options = {
+                    target: this.subStorageContract.address,
+                    abiItem: getAbiItem(this.subStorageContract.abi, 'strategiesSubs'),
+                };
+                web3 = this.web3;
+            }
+            const multicallCalls = subIds.map((subId) => (Object.assign(Object.assign({}, options), { params: [subId] })));
+            return multicall(web3, this.chainId, multicallCalls, fromBlock);
+        });
+    }
+    getSubscriptionEventsFromSubStorage(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.getEventFromSubStorage('Subscribe', options);
+        });
+    }
+    getUpdateDataEventsFromSubStorage(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const events = yield this.getEventFromSubStorage('UpdateData', options);
+            /** @dev - Some RPCs sort events differently */
+            return events.sort((a, b) => a.blockNumber - b.blockNumber);
+        });
+    }
+    getParsedSubscriptions(parseData) {
+        return parseStrategiesAutomatedPosition(parseData);
+    }
+    /**
+     * @description Removes expired Limit Order subscriptions
+     */
+    removeExpiredSubscriptions(subscriptions) {
+        return subscriptions.filter((subscription) => {
+            if (!subscription) {
+                return true;
+            }
+            const { protocol, strategy, strategyData } = subscription;
+            if (protocol.id === ProtocolIdentifiers.StrategiesAutomation.Exchange
+                && strategy.strategyId === Strategies.Identifiers.LimitOrder) {
+                return new Dec(strategyData.decoded.triggerData.goodUntil).gt(new Dec(Date.now()).div(1000));
+            }
+            return true;
+        });
+    }
+    _mergeCheck(s, current) {
+        return s.owner === current.owner
+            && s.strategy.strategyId === current.strategy.strategyId
+            && s.protocol.id === current.protocol.id
+            && s.specific.mergeId === current.specific.mergeWithId
+            && (s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MakerDAO // reflexer needs to get added if we have it
+                || s.strategyData.decoded.subData.vaultId === current.strategyData.decoded.triggerData.vaultId)
+            && (s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.CrvUSD // merge only crvUSD leverage management for the same market
+                || s.strategyData.decoded.subData.controller.toLowerCase() === current.strategyData.decoded.triggerData.controller.toLowerCase())
+            && (s.protocol.id !== ProtocolIdentifiers.StrategiesAutomation.MorphoBlue // merge morpho blue with the same marketId
+                || s.strategyData.decoded.triggerData.marketId.toLowerCase() === current.strategyData.decoded.triggerData.marketId.toLowerCase());
+    }
+    mergeSubs(_subscriptions) {
+        const mergeBase = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeWithId));
+        const mergeExtension = _subscriptions.filter(s => isDefined(s) && isDefined(s.specific.mergeId));
+        let subscriptions = _subscriptions.filter(s => isDefined(s) && isUndefined(s.specific.mergeWithId) && isUndefined(s.specific.mergeId)).map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })));
+        mergeBase.forEach((current) => {
+            const mergePairIndexSubEnabled = mergeExtension.findIndex(s => this._mergeCheck(s, current) && s.isEnabled === current.isEnabled);
+            const mergePairIndexSubDisabled = mergeExtension.findIndex(s => this._mergeCheck(s, current));
+            const mergePairIndex = mergePairIndexSubEnabled !== -1 ? mergePairIndexSubEnabled : mergePairIndexSubDisabled;
+            if (mergePairIndex !== -1) {
+                const mergePair = mergeExtension[mergePairIndex];
+                mergeExtension.splice(mergePairIndex, 1);
+                subscriptions.push(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                    // @ts-ignore
+                    blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled, specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
+            }
+            else {
+                subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
+            }
+        });
+        if (mergeExtension.length > 0) {
+            console.error('Not all merge-able extensions were used', mergeExtension);
+            subscriptions = [...subscriptions, ...mergeExtension.map((s) => (Object.assign(Object.assign({}, s), { subIds: [s.subId] })))];
+        }
+        return subscriptions;
+    }
+    _getSubscriptions(addresses, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const _options = Object.assign(Object.assign({}, addToObjectIf(isDefined(options), options)), addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }));
+            let subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
+            let subscriptions = [];
+            if (subscriptionEvents) {
+                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+                if (_options.enabledOnly) {
+                    const filteredSubscriptionEvents = [];
+                    strategiesSubs = strategiesSubs.filter((sub, index) => {
+                        if (sub === null || sub === void 0 ? void 0 : sub.isEnabled)
+                            filteredSubscriptionEvents.push(subscriptionEvents[index]);
+                        return sub === null || sub === void 0 ? void 0 : sub.isEnabled;
+                    });
+                    subscriptionEvents = filteredSubscriptionEvents;
+                }
+                subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
+                    var _a;
+                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
+                        const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, addToObjectIf(!!_options, _options)), { filter: { subId: latestUpdate.subId } }));
+                        latestUpdate = Object.assign(Object.assign({}, latestUpdate), (_a = updates === null || updates === void 0 ? void 0 : updates[updates.length - 1]) === null || _a === void 0 ? void 0 : _a.returnValues);
+                    }
+                    return this.getParsedSubscriptions({
+                        chainId: this.chainId,
+                        blockNumber: subscriptionEvents[index].blockNumber,
+                        subscriptionEventData: latestUpdate,
+                        strategiesSubsData: sub,
+                    });
+                })));
+                if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
+                    subscriptions = this.mergeSubs(subscriptions);
+                }
+            }
+            return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
+        });
+    }
+    getSubscriptions(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._getSubscriptions(undefined, options);
+        });
+    }
+    getSubscriptionsFor(addresses, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this._getSubscriptions(addresses, options);
+        });
+    }
+}

package/esm/automation/private/StrategiesAutomation.test.d.ts

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