@defisaver/automation-sdk 2.0.8 → 2.0.9

package/.env

@@ -0,0 +1,4 @@
+RPC_1=https://mainnet.infura.io/v3/a3503e4501d040cd9ea2c913c68983a1
+RPC_10=https://opt-mainnet.g.alchemy.com/v2/Pwh-hdbsP7Bf0CP_UMw4_Pw-NfHhSpIA
+RPC_8453=https://base-mainnet.g.alchemy.com/v2/TERsAaPNcA7sgCVHHAMBvd95UtT4wCEf
+RPC_42161=https://arb-mainnet.g.alchemy.com/v2/Pwh-hdbsP7Bf0CP_UMw4_Pw-NfHhSpIA

package/esm/automation/private/LegacyAutomation.js

@@ -12,6 +12,7 @@ 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 contractService_1 = require("../../services/contractService");
 const ethereumService_1 = require("../../services/ethereumService");
 const utils_1 = require("../../services/utils");
@@ -82,13 +83,18 @@ class LegacyAutomation extends Automation_1.default {
     }
     getParsedSubscriptions(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Legacy automation was disabled on block 18213086
+            if (!(options === null || options === void 0 ? void 0 : options.fromBlock)
+                || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'latest'
+                || (options === null || options === void 0 ? void 0 : options.fromBlock) === 'pending'
+                || ((options === null || options === void 0 ? void 0 : options.fromBlock) && new decimal_js_1.default(options === null || options === void 0 ? void 0 : options.fromBlock.toString()).lt(18213086))) {
+                return [];
+            }
             const subscriptions = yield this._getSubscriptions(addresses, options);
-            // @ts-ignore
             return subscriptions.map((sub) => ({
                 chainId: this.chainId,
                 owner: sub[this.getOwnerPropName()],
-                isEnabled: ((options === null || options === void 0 ? void 0 : options.fromBlock) && (options === null || options === void 0 ? void 0 : options.fromBlock) !== 'latest')
-                    ? (options === null || options === void 0 ? void 0 : options.fromBlock) > 18213086 : false,
+                isEnabled: true,
                 protocol: this.protocol,
                 specific: Object.assign({}, sub),
                 strategy: {

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

@@ -20,6 +20,10 @@ export default class StrategiesAutomation extends Automation {
     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)[];
     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)[]>;

package/esm/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 enums_1 = require("../../types/enums");
 const utils_1 = require("../../services/utils");
 const contractService_1 = require("../../services/contractService");
 const ethereumService_1 = require("../../services/ethereumService");
@@ -70,14 +71,38 @@ class StrategiesAutomation extends Automation_1.default {
     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;
+        });
+    }
     _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 } }));
-            const subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
+            let subscriptionEvents = (yield this.getSubscriptionEventsFromSubStorage(_options)); // TODO PlaceholderType
             let subscriptions = [];
             if (subscriptionEvents) {
-                // @ts-ignore
-                const 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) => {
+                        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;
@@ -120,7 +145,7 @@ class StrategiesAutomation extends Automation_1.default {
                     }, []);
                 }
             }
-            return subscriptions;
+            return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
         });
     }
     getSubscriptions(options) {

package/esm/types/index.d.ts

@@ -45,11 +45,14 @@ export declare namespace Multicall {
     }
     type Payload = any[];
 }
-export interface SubscriptionOptions {
+interface _SubscriptionOptions {
     toBlock: BlockNumber;
     fromBlock: BlockNumber;
-    mergeWithSameId?: boolean;
+    mergeWithSameId: boolean;
+    enabledOnly: boolean;
+    unexpiredOnly: boolean;
 }
+export type SubscriptionOptions = Partial<_SubscriptionOptions>;
 export declare namespace Interfaces {
     interface ProtocolBase {
         id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "2.0.8",
+  "version": "2.0.9",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -22,8 +22,8 @@
   "license": "ISC",
   "dependencies": {
     "@defisaver/eslint-config": "^1.0.0",
-    "@defisaver/sdk": "^1.0.43",
-    "@defisaver/tokens": "^1.4.55",
+    "@defisaver/sdk": "^1.0.53",
+    "@defisaver/tokens": "^1.5.1",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",
     "decimal.js": "^10.4.3",

package/src/automation/private/LegacyAutomation.ts

@@ -1,3 +1,5 @@
+import Dec from 'decimal.js';
+
 import type Web3 from 'web3';
 import type {
   EthereumAddress, Position, Interfaces, Contract, PlaceholderType, SubscriptionOptions,
@@ -99,14 +101,22 @@ export default class LegacyAutomation extends Automation {
   }
 
   protected async getParsedSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
+    // Legacy automation was disabled on block 18213086
+    if (
+      !options?.fromBlock
+      || options?.fromBlock === 'latest'
+      || options?.fromBlock === 'pending'
+      || (options?.fromBlock && new Dec(options?.fromBlock.toString()).lt(18213086))
+    ) {
+      return [];
+    }
+
     const subscriptions = await this._getSubscriptions(addresses, options);
 
-    // @ts-ignore
-    return subscriptions.map((sub) => ({
+    return subscriptions.map((sub: any) => ({
       chainId: this.chainId,
       owner: sub[this.getOwnerPropName()],
-      isEnabled: (options?.fromBlock && options?.fromBlock !== 'latest')
-        ? options?.fromBlock > 18213086 : false, // Legacy automation was disabled on block 18213086
+      isEnabled: true,
       protocol: this.protocol,
       specific: { ...sub },
       strategy: {

package/src/automation/private/StrategiesAutomation.ts

@@ -8,6 +8,7 @@ import type {
   StrategyModel, SubStorage,
 } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
+import { Strategies, ProtocolIdentifiers } from '../../types/enums';
 
 import { addToObjectIf, isDefined } from '../../services/utils';
 import { getAbiItem, makeSubStorageContract } from '../../services/contractService';
@@ -84,20 +85,53 @@ export default class StrategiesAutomation extends Automation {
     return parseStrategiesAutomatedPosition(parseData);
   }
 
+  /**
+   * @description Removes expired Limit Order subscriptions
+   */
+  protected removeExpiredSubscriptions(subscriptions: (Position.Automated | null)[]) {
+    return subscriptions.filter((subscription: Position.Automated | null) => {
+      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;
+    });
+  }
+
   protected async _getSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {
     const _options = {
       ...addToObjectIf(isDefined(options), options),
       ...addToObjectIf(isDefined(addresses), { filter: { proxy: addresses } }),
-    };
+    } as SubscriptionOptions & PastEventOptions;
 
-
-    const subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
+    let subscriptionEvents = (await this.getSubscriptionEventsFromSubStorage(_options)) as PlaceholderType; // TODO PlaceholderType
 
     let subscriptions: (Position.Automated | null)[] = [];
 
     if (subscriptionEvents) {
-      // @ts-ignore
-      const strategiesSubs = await this.getStrategiesSubs(subscriptionEvents.map((e) => e.returnValues.subId), _options.toBlock);
+      let strategiesSubs = await this.getStrategiesSubs(
+        subscriptionEvents.map((e: { returnValues: { subId: number } }) => e.returnValues.subId), _options.toBlock,
+      );
+
+      if (_options.enabledOnly) {
+        const filteredSubscriptionEvents = [] as PlaceholderType;
+
+        strategiesSubs = strategiesSubs.filter((sub, index) => {
+          if (sub?.isEnabled) filteredSubscriptionEvents.push(subscriptionEvents[index]);
+          return sub?.isEnabled;
+        });
+
+        subscriptionEvents = filteredSubscriptionEvents;
+      }
 
       subscriptions = await Promise.all(strategiesSubs.map(async (sub, index: number) => {
         let latestUpdate = subscriptionEvents[index].returnValues;
@@ -168,7 +202,7 @@ export default class StrategiesAutomation extends Automation {
       }
     }
 
-    return subscriptions;
+    return _options.unexpiredOnly ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
   }
 
   public async getSubscriptions(options?: SubscriptionOptions): Promise<(Position.Automated | null)[]> {

package/src/types/index.ts

@@ -61,12 +61,16 @@ export declare namespace Multicall {
   type Payload = any[];
 }
 
-export interface SubscriptionOptions {
+interface _SubscriptionOptions {
   toBlock: BlockNumber,
   fromBlock: BlockNumber,
-  mergeWithSameId?: boolean,
+  mergeWithSameId: boolean,
+  enabledOnly: boolean,
+  unexpiredOnly: boolean,
 }
 
+export type SubscriptionOptions = Partial<_SubscriptionOptions>;
+
 export declare namespace Interfaces {
   interface ProtocolBase {
     id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation,