@defisaver/automation-sdk 1.0.6 → 1.0.8

package/esm/automation/private/StrategiesAutomation.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { addToObjectIf, isDefined, } from '../../services/utils';
+import { addToObjectIf, isDefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
 import Automation from './Automation';
@@ -61,7 +61,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({ filter: latestUpdate.subId });
+                        const updates = yield this.getUpdateDataEventsFromSubStorage(Object.assign(Object.assign({}, addToObjectIf(!!_options, _options)), { filter: 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/esm/services/ethereumService.js

@@ -30,5 +30,5 @@ export function multicall(web3, chainId, calls, block = 'latest') {
     });
 }
 export function getEventsFromContract(contractWithMeta, event, options) {
-    return contractWithMeta.contract.getPastEvents(event, Object.assign(Object.assign({}, addToObjectIf(isDefined(options), options)), { fromBlock: contractWithMeta.createdBlock }));
+    return contractWithMeta.contract.getPastEvents(event, Object.assign({ fromBlock: contractWithMeta.createdBlock }, addToObjectIf(isDefined(options), options)));
 }

package/package.json

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

package/src/automation/private/StrategiesAutomation.ts

@@ -8,9 +8,7 @@ import type {
   Subscribe, StrategyModel, SubStorage, UpdateData,
 } from '../../types/contracts/generated/SubStorage';
 
-import {
-  addToArrayIf, addToObjectIf, isDefined,
-} from '../../services/utils';
+import { addToObjectIf, isDefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
 import { getEventsFromContract, multicall } from '../../services/ethereumService';
 
@@ -86,7 +84,7 @@ export default class StrategiesAutomation extends Automation {
         let latestUpdate = subscriptionEvents[index];
 
         if (latestUpdate.subHash !== sub?.strategySubHash) {
-          const updates = await this.getUpdateDataEventsFromSubStorage({ filter: latestUpdate.subId as any as Filter });
+          const updates = await this.getUpdateDataEventsFromSubStorage({ ...addToObjectIf(!!_options, _options), filter: latestUpdate.subId as any as Filter });
           latestUpdate = {
             ...latestUpdate, // Update is missing proxy, hence this
             ...updates?.[updates.length - 1]?.returnValues,

package/src/services/ethereumService.ts

@@ -48,8 +48,8 @@ export function getEventsFromContract<T extends BaseContract>(
   return contractWithMeta.contract.getPastEvents(
     event,
     {
-      ...addToObjectIf(isDefined(options), options),
       fromBlock: contractWithMeta.createdBlock,
+      ...addToObjectIf(isDefined(options), options),
     },
   );
 }

package/umd/index.js

@@ -991,9 +991,9 @@ function _multicall() {
   return _multicall.apply(this, arguments);
 }
 function getEventsFromContract(contractWithMeta, event, options) {
-  return contractWithMeta.contract.getPastEvents(event, _objectSpread(_objectSpread({}, (0,_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(options), options)), {}, {
+  return contractWithMeta.contract.getPastEvents(event, _objectSpread({
     fromBlock: contractWithMeta.createdBlock
-  }));
+  }, (0,_utils__WEBPACK_IMPORTED_MODULE_1__.addToObjectIf)((0,_utils__WEBPACK_IMPORTED_MODULE_1__.isDefined)(options), options)));
 }
 
 /***/ }),
@@ -1221,9 +1221,9 @@ class StrategiesAutomation extends _Automation__WEBPACK_IMPORTED_MODULE_3__["def
             var latestUpdate = subscriptionEvents[index];
             if (latestUpdate.subHash !== (sub === null || sub === void 0 ? void 0 : sub.strategySubHash)) {
               var _updates;
-              var updates = yield _this5.getUpdateDataEventsFromSubStorage({
+              var updates = yield _this5.getUpdateDataEventsFromSubStorage(_objectSpread(_objectSpread({}, (0,_services_utils__WEBPACK_IMPORTED_MODULE_0__.addToObjectIf)(!!_options, _options)), {}, {
                 filter: 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);
             }
             return _this5.getParsedSubscriptions({