@defisaver/automation-sdk 3.1.10 → 3.2.1

package/.env

@@ -0,0 +1,5 @@
+# Used for testing
+RPC_1=https://eth-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
+RPC_10=https://opt-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
+RPC_42161=https://arb-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y
+RPC_8453=https://base-mainnet.g.alchemy.com/v2/4jm0fn2xvapd3pDpmdE8Y1rZKEp71U0Y

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

@@ -1,7 +1,7 @@
 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 { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
 interface IStrategiesAutomation extends Interfaces.Automation {
@@ -17,8 +17,8 @@ export default class StrategiesAutomation extends Automation {
     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 getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<Subscribe[]>;
+    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<UpdateData[]>;
     protected getParsedSubscriptions(parseData: ParseData): Position.Automated | null;
     /**
      * @description Removes expired Limit Order subscriptions

package/cjs/automation/private/StrategiesAutomation.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const es6_promise_pool_1 = __importDefault(require("es6-promise-pool"));
 const enums_1 = require("../../types/enums");
 const utils_1 = require("../../services/utils");
 const contractService_1 = require("../../services/contractService");
@@ -133,10 +134,10 @@ class StrategiesAutomation extends Automation_1.default {
     _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 subscriptionEvents = yield this.getSubscriptionEventsFromSubStorage(_options);
             let subscriptions = [];
             if (subscriptionEvents) {
-                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => +e.returnValues.subId), _options.toBlock);
                 if (_options.enabledOnly) {
                     const filteredSubscriptionEvents = [];
                     strategiesSubs = strategiesSubs.filter((sub, index) => {
@@ -146,20 +147,28 @@ class StrategiesAutomation extends Automation_1.default {
                     });
                     subscriptionEvents = filteredSubscriptionEvents;
                 }
-                subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
+                const replaceSubWithUpdate = (index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    const sub = strategiesSubs[index];
+                    let latestUpdate = Object.assign({}, 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);
+                        latestUpdate = Object.assign(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), { 2: latestUpdate[2] });
                     }
-                    return this.getParsedSubscriptions({
+                    subscriptions.push(this.getParsedSubscriptions({
                         chainId: this.chainId,
                         blockNumber: subscriptionEvents[index].blockNumber,
                         subscriptionEventData: latestUpdate,
                         strategiesSubsData: sub,
-                    });
-                })));
+                    }));
+                });
+                // eslint-disable-next-line func-names
+                const pool = new es6_promise_pool_1.default(function* () {
+                    for (let index = 0; index < strategiesSubs.length; index++) {
+                        yield replaceSubWithUpdate(index);
+                    }
+                }, 50);
+                yield pool.start();
                 if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
                     subscriptions = this.mergeSubs(subscriptions);
                 }

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

@@ -1,7 +1,7 @@
 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 { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
 interface IStrategiesAutomation extends Interfaces.Automation {
@@ -17,8 +17,8 @@ export default class StrategiesAutomation extends Automation {
     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 getSubscriptionEventsFromSubStorage(options?: PastEventOptions): Promise<Subscribe[]>;
+    protected getUpdateDataEventsFromSubStorage(options?: PastEventOptions): Promise<UpdateData[]>;
     protected getParsedSubscriptions(parseData: ParseData): Position.Automated | null;
     /**
      * @description Removes expired Limit Order subscriptions

package/esm/automation/private/StrategiesAutomation.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
+import PromisePool from 'es6-promise-pool';
 import { Strategies, ProtocolIdentifiers } from '../../types/enums';
 import { addToObjectIf, isDefined, isUndefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
@@ -128,10 +129,10 @@ export default class StrategiesAutomation extends Automation {
     _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 subscriptionEvents = yield this.getSubscriptionEventsFromSubStorage(_options);
             let subscriptions = [];
             if (subscriptionEvents) {
-                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+                let strategiesSubs = yield this.getStrategiesSubs(subscriptionEvents.map((e) => +e.returnValues.subId), _options.toBlock);
                 if (_options.enabledOnly) {
                     const filteredSubscriptionEvents = [];
                     strategiesSubs = strategiesSubs.filter((sub, index) => {
@@ -141,20 +142,28 @@ export default class StrategiesAutomation extends Automation {
                     });
                     subscriptionEvents = filteredSubscriptionEvents;
                 }
-                subscriptions = yield Promise.all(strategiesSubs.map((sub, index) => __awaiter(this, void 0, void 0, function* () {
+                const replaceSubWithUpdate = (index) => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    let latestUpdate = subscriptionEvents[index].returnValues;
+                    const sub = strategiesSubs[index];
+                    let latestUpdate = Object.assign({}, 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);
+                        latestUpdate = Object.assign(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), { 2: latestUpdate[2] });
                     }
-                    return this.getParsedSubscriptions({
+                    subscriptions.push(this.getParsedSubscriptions({
                         chainId: this.chainId,
                         blockNumber: subscriptionEvents[index].blockNumber,
                         subscriptionEventData: latestUpdate,
                         strategiesSubsData: sub,
-                    });
-                })));
+                    }));
+                });
+                // eslint-disable-next-line func-names
+                const pool = new PromisePool(function* () {
+                    for (let index = 0; index < strategiesSubs.length; index++) {
+                        yield replaceSubWithUpdate(index);
+                    }
+                }, 50);
+                yield pool.start();
                 if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
                     subscriptions = this.mergeSubs(subscriptions);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.1.10",
+  "version": "3.2.1",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,12 +23,12 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/eslint-config": "^1.0.1",
-    "@defisaver/sdk": "^1.2.17",
-    "@defisaver/tokens": "^1.5.54",
+    "@defisaver/sdk": "^1.2.20",
+    "@defisaver/tokens": "^1.5.56",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",
+    "es6-promise-pool": "^2.5.0",
     "lodash": "^4.17.21",
     "web3-eth-abi": "^1.10.2",
     "web3-utils": "^1.10.2"
@@ -46,7 +46,6 @@
     "husky": "^8.0.0",
     "jsdoc-to-markdown": "^6.0.1",
     "mocha": "^10.2.0",
-    "react": "^18.2.0",
     "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
     "typechain-target-web3-v1-3mihai3": "^6.0.1",

package/src/automation/private/StrategiesAutomation.ts

@@ -1,11 +1,12 @@
 import Dec from 'decimal.js';
 import type Web3 from 'web3';
 import type { PastEventOptions } from 'web3-eth-contract';
+import PromisePool from 'es6-promise-pool';
 import type {
   Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, PlaceholderType, BlockNumber,
 } from '../../types';
 import type {
-  StrategyModel, SubStorage,
+  StrategyModel, Subscribe, SubStorage, UpdateData,
 } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import { Strategies, ProtocolIdentifiers } from '../../types/enums';
@@ -77,13 +78,13 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getSubscriptionEventsFromSubStorage(options?: PastEventOptions) {
-    return this.getEventFromSubStorage('Subscribe', options);
+    return this.getEventFromSubStorage('Subscribe', options) as Promise<Subscribe[]>;
   }
 
   protected async getUpdateDataEventsFromSubStorage(options?: PastEventOptions) {
     const events = await this.getEventFromSubStorage('UpdateData', options);
     /** @dev - Some RPCs sort events differently */
-    return events.sort((a, b) => a.blockNumber - b.blockNumber);
+    return events.sort((a, b) => a.blockNumber - b.blockNumber) as UpdateData[];
   }
 
   protected getParsedSubscriptions(parseData: ParseData) {
@@ -183,13 +184,13 @@ export default class StrategiesAutomation extends Automation {
       ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
     } as SubscriptionOptions & PastEventOptions;
 
-    let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
+    let subscriptionEvents = await this.getSubscriptionEventsFromSubStorage(_options);
 
     let subscriptions: (Position.Automated | null)[] = [];
 
     if (subscriptionEvents) {
       let strategiesSubs = await this.getStrategiesSubs(
-        subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
+        subscriptionEvents.map((e) => +e.returnValues.subId), _options.toBlock,
       );
 
       if (_options.enabledOnly) {
@@ -203,8 +204,9 @@ export default class StrategiesAutomation extends Automation {
         subscriptionEvents = filteredSubscriptionEvents;
       }
 
-      subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
-        let latestUpdate = subscriptionEvents[index].returnValues;
+      const replaceSubWithUpdate = async (index: number) => {
+        const sub = strategiesSubs[index];
+        let latestUpdate = { ...subscriptionEvents[index].returnValues };
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
           const updates = await this.getUpdateDataEventsFromSubStorage({
@@ -214,15 +216,26 @@ export default class StrategiesAutomation extends Automation {
           latestUpdate = {
             ...latestUpdate, // Update is missing proxy, hence this
             ...updates?.[updates.length - 1]?.returnValues,
+            2: latestUpdate[2], // type issue
           };
         }
-        return this.getParsedSubscriptions({
-          chainId: this.chainId,
-          blockNumber: subscriptionEvents[index].blockNumber,
-          subscriptionEventData: latestUpdate,
-          strategiesSubsData: sub,
-        });
-      }));
+        subscriptions.push(
+          this.getParsedSubscriptions({
+            chainId: this.chainId,
+            blockNumber: subscriptionEvents[index].blockNumber,
+            subscriptionEventData: latestUpdate,
+            strategiesSubsData: sub,
+          }),
+        );
+      };
+
+      // eslint-disable-next-line func-names
+      const pool = new PromisePool(function* () {
+        for (let index = 0; index < strategiesSubs.length; index++) {
+          yield replaceSubWithUpdate(index);
+        }
+      } as any, 50);
+      await pool.start();
 
       if (options?.mergeSubs) {
         subscriptions = this.mergeSubs(subscriptions);