@defisaver/automation-sdk 1.0.8 → 1.0.10

package/esm/automation/private/StrategiesAutomation.js

@@ -43,7 +43,9 @@ export default class StrategiesAutomation extends Automation {
     }
     getUpdateDataEventsFromSubStorage(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.getEventFromSubStorage('UpdateData', options);
+            const events = yield this.getEventFromSubStorage('UpdateData', options);
+            /** @dev - Some RPCs sort events differently */
+            return events.sort((a, b) => a.blockNumber - b.blockNumber);
         });
     }
     getParsedSubscriptions(parseData) {
@@ -61,7 +63,7 @@ export default class StrategiesAutomation extends Automation {
                     var _a;
                     let latestUpdate = subscriptionEvents[index];
                     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: latestUpdate.subId }));
+                        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({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/automation/private/StrategiesAutomation.ts

@@ -1,5 +1,5 @@
 import type Web3 from 'web3';
-import type { PastEventOptions, Filter } from 'web3-eth-contract';
+import type { PastEventOptions } from 'web3-eth-contract';
 import type {
   Position, Interfaces, EthereumAddress,
   SubscriptionOptions, Contract, ParseData, PlaceholderType,
@@ -59,7 +59,9 @@ export default class StrategiesAutomation extends Automation {
   }
 
   protected async getUpdateDataEventsFromSubStorage(options?: PastEventOptions) {
-    return this.getEventFromSubStorage('UpdateData', options);
+    const events = await this.getEventFromSubStorage('UpdateData', options);
+    /** @dev - Some RPCs sort events differently */
+    return events.sort((a, b) => a.blockNumber - b.blockNumber);
   }
 
   protected getParsedSubscriptions(parseData: ParseData) {
@@ -84,7 +86,10 @@ export default class StrategiesAutomation extends Automation {
         let latestUpdate = subscriptionEvents[index];
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
-          const updates = await this.getUpdateDataEventsFromSubStorage({ ...addToObjectIf(!!_options, _options), filter: latestUpdate.subId as any as Filter });
+          const updates = await this.getUpdateDataEventsFromSubStorage({
+            ...addToObjectIf(!!_options, _options),
+            filter: { subId: latestUpdate.subId },
+          });
           latestUpdate = {
             ...latestUpdate, // Update is missing proxy, hence this
             ...updates?.[updates.length - 1]?.returnValues,

package/umd/index.js

@@ -1196,7 +1196,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
   getUpdateDataEventsFromSubStorage(options) {
     var _this4 = this;
     return _asyncToGenerator(function* () {
-      return _this4.getEventFromSubStorage('UpdateData', options);
+      var events = yield _this4.getEventFromSubStorage('UpdateData', options);
+      /** @dev - Some RPCs sort events differently */
+      return events.sort((a, b) => a.blockNumber - b.blockNumber);
     })();
   }
   getParsedSubscriptions(parseData) {
@@ -1222,7 +1224,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
             if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
               var _updates;
               var updates = yield _this5.getUpdateDataEventsFromSubStorage(_objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToObjectIf)(!!_options, _options)), {}, {
-                filter: latestUpdate.subId
+                filter: {
+                  subId: latestUpdate.subId
+                }
               }));
               latestUpdate = _objectSpread(_objectSpread({}, latestUpdate), updates === null || updates === void 0 ? void 0 : (_updates = updates[updates.length - 1]) === null || _updates === void 0 ? void 0 : _updates.returnValues);
             }