@defisaver/automation-sdk 3.3.18 → 3.3.19-sub-fetching-dev

package/cjs/types/index.d.ts

@@ -1,8 +1,8 @@
 import type Web3 from 'web3';
 import type { AbiItem } from 'web3-utils';
 import type { BaseContract, BlockType } from './contracts/generated/types';
-import type { Subscribe, StrategyModel } from './contracts/generated/SubStorage';
-import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType } from './enums';
+import type { StrategyModel } from './contracts/generated/SubStorage';
+import type { ChainId, Strategies, Bundles, ProtocolIdentifiers, RatioState, CloseToAssetType, SubscriptionStatus } from './enums';
 export type PlaceholderType = any;
 export type EthereumAddress = string;
 export type BlockNumber = BlockType;
@@ -53,6 +53,23 @@ interface _SubscriptionOptions {
     unexpiredOnly: boolean;
 }
 export type SubscriptionOptions = Partial<_SubscriptionOptions>;
+/** Subscription record as returned by the automation API (GET /v1/subscriptions) */
+export interface ApiSubscriptionRecord {
+    id: number;
+    wallet: EthereumAddress;
+    wallet_type: string;
+    is_enabled: boolean;
+    invalid: boolean;
+    status: SubscriptionStatus;
+    is_bundle: boolean;
+    strategy_or_bundle_id: number;
+    strategy_ids: number[];
+    sub_data_hash: string;
+    trigger_data: string[];
+    sub_data: string[];
+    block_number: number;
+    additional_triggers: string[] | null;
+}
 export declare namespace Interfaces {
     interface ProtocolBase {
         id: ProtocolIdentifiers.StrategiesAutomation | ProtocolIdentifiers.LegacyAutomation;
@@ -238,6 +255,8 @@ export declare namespace Position {
         subId: number;
         subIds?: number[];
         isEnabled?: boolean;
+        /** Set only for subscriptions parsed from the automation API */
+        status?: SubscriptionStatus;
         subHash: string;
         blockNumber: BlockNumber;
         protocol: Interfaces.Protocol;
@@ -291,10 +310,17 @@ export interface BundlesInfo {
     [ChainId.Base]: BaseBundleInfo;
 }
 export type StrategyOrBundleIds = typeof Strategies.MainnetIds[keyof typeof Strategies.MainnetIds] | typeof Strategies.OptimismIds[keyof typeof Strategies.OptimismIds] | typeof Strategies.ArbitrumIds[keyof typeof Strategies.ArbitrumIds] | typeof Strategies.BaseIds[keyof typeof Strategies.BaseIds] | typeof Bundles.MainnetIds[keyof typeof Bundles.MainnetIds] | typeof Bundles.OptimismIds[keyof typeof Bundles.OptimismIds] | typeof Bundles.ArbitrumIds[keyof typeof Bundles.ArbitrumIds] | typeof Bundles.BaseIds[keyof typeof Bundles.BaseIds];
+/** Fields of the Subscribe event that parsing relies on */
+export interface SubscriptionEventData {
+    subId: string;
+    proxy: EthereumAddress;
+    subHash: string;
+    subStruct: StrategyModel.StrategySubStructOutputStruct;
+}
 export interface ParseData {
     chainId: ChainId;
     blockNumber: BlockNumber;
-    subscriptionEventData: Subscribe['returnValues'];
+    subscriptionEventData: SubscriptionEventData;
     strategiesSubsData: StrategyModel.StoredSubDataStructOutputStruct;
 }
 type MapToProtocolVersion<T> = {

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

@@ -1,6 +1,6 @@
 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 { Position, Interfaces, EthereumAddress, SubscriptionOptions, Contract, ParseData, BlockNumber, ApiSubscriptionRecord } from '../../types';
 import type { StrategyModel, Subscribe, SubStorage, UpdateData } from '../../types/contracts/generated/SubStorage';
 import type { ChainId } from '../../types/enums';
 import Automation from './Automation';
@@ -30,6 +30,10 @@ export default class StrategiesAutomation extends Automation {
     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)[]>;
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records: ApiSubscriptionRecord[], options?: SubscriptionOptions): (Position.Automated | null)[];
     getSubscriptionsFor(addresses: EthereumAddress[], options?: SubscriptionOptions): Promise<(Position.Automated | null)[]>;
 }
 export {};

package/esm/automation/private/StrategiesAutomation.js

@@ -9,11 +9,12 @@ 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 { Strategies, ProtocolIdentifiers, SubscriptionStatus } 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 { parseDataFromApiSubscription } from '../../services/apiSubscriptionsService';
 import Automation from './Automation';
 export default class StrategiesAutomation extends Automation {
     constructor(args) {
@@ -121,9 +122,11 @@ export default class StrategiesAutomation extends Automation {
             if (mergePairIndex !== -1) {
                 const mergePair = mergeExtension[mergePairIndex];
                 mergeExtension.splice(mergePairIndex, 1);
-                subscriptions.push(Object.assign(Object.assign(Object.assign({}, mergePair), current), { 
+                subscriptions.push(Object.assign(Object.assign(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) }));
+                    blockNumber: Dec.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled }), addToObjectIf(isDefined(current.status), {
+                    status: mergePair.status === SubscriptionStatus.Active ? SubscriptionStatus.Active : current.status,
+                })), { specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
             }
             else {
                 subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
@@ -184,6 +187,20 @@ export default class StrategiesAutomation extends Automation {
             return this._getSubscriptions(undefined, options);
         });
     }
+    /**
+     * @description Parses subscriptions returned by the automation API (GET /v1/subscriptions)
+     */
+    parseSubscriptionsFromApi(records, options) {
+        const filtered = (options === null || options === void 0 ? void 0 : options.enabledOnly) ? records.filter((record) => record.is_enabled) : records;
+        let subscriptions = filtered.map((record) => {
+            const position = this.getParsedSubscriptions(parseDataFromApiSubscription(record, this.chainId));
+            return position && Object.assign(Object.assign({}, position), { status: record.status });
+        });
+        if (options === null || options === void 0 ? void 0 : options.mergeSubs) {
+            subscriptions = this.mergeSubs(subscriptions);
+        }
+        return (options === null || options === void 0 ? void 0 : options.unexpiredOnly) ? this.removeExpiredSubscriptions(subscriptions) : subscriptions;
+    }
     getSubscriptionsFor(addresses, options) {
         return __awaiter(this, void 0, void 0, function* () {
             return this._getSubscriptions(addresses, options);

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Web3 from 'web3';
 import { expect } from 'chai';
-import { ChainId } from '../../types/enums';
+import { ChainId, SubscriptionStatus } from '../../types/enums';
 import '../../configuration';
 import StrategiesAutomation from './StrategiesAutomation';
 require('dotenv').config({ path: '.env' });
@@ -688,4 +688,59 @@ describe('Feature: StrategiesAutomation.ts', () => {
             expect(loneBoost === null || loneBoost === void 0 ? void 0 : loneBoost.subId).to.equal(1);
         });
     }));
+    describe('When testing StrategiesAutomation.parseSubscriptionsFromApi', () => {
+        const strategiesAutomation = new StrategiesAutomation({
+            chainId: ChainId.Ethereum,
+            provider: Web3_1,
+            providerFork: null,
+        });
+        const owner = '0x9cB7E19861665366011899d74E75d4F2A419aEeD';
+        const subData = [
+            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000001',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+        ];
+        // Aave V3 leverage management: repay (bundle 8, ratio under) and boost (bundle 9, ratio over) for the same owner and market
+        const repay = {
+            id: 379,
+            wallet: owner,
+            wallet_type: 'safe',
+            is_enabled: true,
+            invalid: false,
+            status: SubscriptionStatus.Active,
+            is_bundle: true,
+            strategy_or_bundle_id: 8,
+            strategy_ids: [34, 35],
+            sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001'],
+            sub_data: subData,
+            block_number: 18015756,
+            additional_triggers: null,
+        };
+        const boost = Object.assign(Object.assign({}, repay), { id: 380, is_enabled: false, status: SubscriptionStatus.Disabled, strategy_or_bundle_id: 9, sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111', trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'] });
+        it('Given API records should return parsed positions carrying the API status', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost]);
+            expect(positions).to.have.length(2);
+            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379, 380]);
+            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.status)).to.eql([SubscriptionStatus.Active, SubscriptionStatus.Disabled]);
+            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.isEnabled)).to.eql([true, false]);
+        });
+        it('Given mergeSubs option should merge the repay and boost pair and keep the active status', () => {
+            var _a, _b, _c;
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { mergeSubs: true });
+            expect(positions).to.have.length(1);
+            expect((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.subIds).to.eql([379, 380]);
+            expect((_b = positions[0]) === null || _b === void 0 ? void 0 : _b.isEnabled).to.equal(true);
+            expect((_c = positions[0]) === null || _c === void 0 ? void 0 : _c.status).to.equal(SubscriptionStatus.Active);
+        });
+        it('Given enabledOnly option should drop disabled records before parsing', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { enabledOnly: true });
+            expect(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379]);
+        });
+        it('Given a record of an unknown strategy should return null for it', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { strategy_or_bundle_id: 9999 })]);
+            expect(positions).to.eql([null]);
+        });
+    });
 });

package/esm/constants/index.js

@@ -116,6 +116,11 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.CollateralSwitch,
         protocol: PROTOCOLS.Spark,
     },
+    [Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+        strategyId: Strategies.Identifiers.EoaCollateralSwitch,
+        protocol: PROTOCOLS.Spark,
+    },
 };
 export const OPTIMISM_STRATEGIES_INFO = {
     [Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -543,6 +548,31 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.AaveV4,
     },
+    [Bundles.MainnetIds.SPARK_EOA_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_REPAY,
+        strategyId: Strategies.Identifiers.EoaRepay,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_EOA_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_BOOST,
+        strategyId: Strategies.Identifiers.EoaBoost,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_EOA_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_CLOSE,
+        strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: PROTOCOLS.Spark,
+    },
+    [Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+        strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: PROTOCOLS.Spark,
+    },
     [Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
         strategyOrBundleId: Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
         strategyId: Strategies.Identifiers.LiquidationProtection,
@@ -618,6 +648,11 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.MorphoBlue,
     },
+    [Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+        strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: PROTOCOLS.Spark,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/apiSubscriptionsService.d.ts

@@ -0,0 +1,7 @@
+import type { ApiSubscriptionRecord, ParseData } from '../types';
+import type { ChainId } from '../types/enums';
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+export declare function parseDataFromApiSubscription(record: ApiSubscriptionRecord, chainId: ChainId): ParseData;

package/esm/services/apiSubscriptionsService.js

@@ -0,0 +1,29 @@
+function addHexPrefix(value) {
+    return value.startsWith('0x') ? value : `0x${value}`;
+}
+/**
+ * @description Maps a subscription record returned by the automation API to the data
+ * the parser expects from Subscribe events and SubStorage (trigger data is stored without 0x prefix)
+ */
+export function parseDataFromApiSubscription(record, chainId) {
+    return {
+        chainId,
+        blockNumber: record.block_number,
+        subscriptionEventData: {
+            subId: record.id.toString(),
+            proxy: record.wallet,
+            subHash: record.sub_data_hash,
+            subStruct: {
+                strategyOrBundleId: record.strategy_or_bundle_id.toString(),
+                isBundle: record.is_bundle,
+                triggerData: record.trigger_data.map(addHexPrefix),
+                subData: record.sub_data.map(addHexPrefix),
+            },
+        },
+        strategiesSubsData: {
+            userProxy: record.wallet,
+            isEnabled: record.is_enabled,
+            strategySubHash: record.sub_data_hash,
+        },
+    };
+}

package/esm/services/apiSubscriptionsService.test.d.ts

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

package/esm/services/apiSubscriptionsService.test.js

@@ -0,0 +1,67 @@
+import { expect } from 'chai';
+import { ChainId, SubscriptionStatus } from '../types/enums';
+import '../configuration';
+import { parseDataFromApiSubscription } from './apiSubscriptionsService';
+import { parseStrategiesAutomatedPosition } from './strategiesService';
+describe('Feature: apiSubscriptionsService.ts', () => {
+    describe('When testing apiSubscriptionsService.parseDataFromApiSubscription', () => {
+        // same subscription as in strategiesService.test.ts, in the shape the automation API returns it
+        const record = {
+            id: 379,
+            wallet: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+            wallet_type: 'safe',
+            is_enabled: true,
+            invalid: false,
+            status: SubscriptionStatus.Active,
+            is_bundle: true,
+            strategy_or_bundle_id: 8,
+            strategy_ids: [34, 35],
+            sub_data_hash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            trigger_data: [
+                '0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+            ],
+            sub_data: [
+                '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000001',
+                '0x0000000000000000000000000000000000000000000000000000000000000000',
+            ],
+            block_number: 18015756,
+            additional_triggers: null,
+        };
+        const fromEvents = {
+            chainId: ChainId.Ethereum,
+            blockNumber: 18015756,
+            subscriptionEventData: {
+                subId: '379',
+                proxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+                subStruct: {
+                    strategyOrBundleId: '8',
+                    isBundle: true,
+                    triggerData: [
+                        '0x0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e00000000000000000000000000000000000000000000000019ac8532c27900000000000000000000000000000000000000000000000000000000000000000001',
+                    ],
+                    subData: record.sub_data,
+                },
+            },
+            strategiesSubsData: {
+                userProxy: '0x9cB7E19861665366011899d74E75d4F2A419aEeD',
+                isEnabled: true,
+                strategySubHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
+            },
+        };
+        it('Given an API record should return the same parse data as Subscribe event and SubStorage would', () => {
+            expect(parseDataFromApiSubscription(record, ChainId.Ethereum)).to.eql(fromEvents);
+        });
+        it('Given an API record the parsed position should match the one parsed from events', () => {
+            const fromApi = parseStrategiesAutomatedPosition(parseDataFromApiSubscription(record, ChainId.Ethereum));
+            expect(fromApi).to.not.equal(null);
+            expect(fromApi).to.eql(parseStrategiesAutomatedPosition(fromEvents));
+        });
+        it('Given a disabled record should keep it disabled', () => {
+            const parseData = parseDataFromApiSubscription(Object.assign(Object.assign({}, record), { is_enabled: false }), ChainId.Ethereum);
+            expect(parseData.strategiesSubsData.isEnabled).to.equal(false);
+        });
+    });
+});

package/esm/services/ethereumService.test.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Web3 from 'web3';
 import { expect } from 'chai';
+import { omit } from 'lodash';
 import { getAssetInfo } from '@defisaver/tokens';
 import { ChainId } from '../types/enums';
 import '../configuration';
@@ -96,7 +97,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
                         'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
                         'blockNumber': 15166163,
-                        'blockTimestamp': '0x62d53ad8',
                         'event': 'Transfer',
                         'id': 'log_e2258e3a',
                         'logIndex': 385,
@@ -123,7 +123,7 @@ describe('Feature: ethereumService.ts', () => {
                     },
                 ],
                 [
-                    makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum),
+                    Object.assign(Object.assign({}, makeErc20Contract(Web3_1, getAssetInfo('LUSD').address, ChainId.Ethereum)), { createdBlock: 15166163 }),
                     null,
                     'Transfer',
                     {
@@ -142,7 +142,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -188,7 +187,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -231,9 +229,8 @@ describe('Feature: ethereumService.ts', () => {
         ];
         examples.forEach(([expected, actual]) => {
             it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => __awaiter(void 0, void 0, void 0, function* () {
-                const data = yield getEventsFromContract(...actual);
-                console.log(data);
-                expect(yield getEventsFromContract(...actual)).to.eql(expected);
+                const events = yield getEventsFromContract(...actual);
+                expect(events.map((event) => omit(event, 'blockTimestamp'))).to.eql(expected);
             }));
         });
     });

package/esm/services/strategiesService.js

@@ -330,11 +330,17 @@ function parseAaveV3CollateralSwitch(position, parseData) {
 function parseSparkCollateralSwitch(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkGenericFLCollateralSwitchSubData.decode(subStruct.subData)
+        : subDataService.sparkCollateralSwitchSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.strategy.strategyId = isEOA
+        ? Strategies.Identifiers.EoaCollateralSwitch
+        : Strategies.Identifiers.CollateralSwitch;
     return _position;
 }
 function parseAaveV4LeverageManagement(position, parseData) {
@@ -746,19 +752,22 @@ function parseSparkLeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkGenericLeverageManagementSubData.decode(subStruct.subData)
+        : subDataService.legacySparkLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: isEnabled,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
             subHashRepay: subHash,
         };
     }
@@ -768,19 +777,24 @@ function parseSparkLeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: Strategies.Identifiers.Boost,
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
             subHashBoost: subHash,
         };
     }
-    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagement
+        : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseSparkLiquidationProtection(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkLiquidationProtectionSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkGenericLiquidationProtectionSubData.decode(subStruct.subData)
+        : subDataService.sparkLiquidationProtectionSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
@@ -791,14 +805,19 @@ function parseSparkLiquidationProtection(position, parseData) {
         subId1: Number(subId),
         subHashRepay: subHash,
     };
-    _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLiquidationProtection
+        : Strategies.IdOverrides.LiquidationProtection;
     return _position;
 }
 function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
+    const subData = isEOA
+        ? subDataService.sparkLeverageManagementOnPriceGenericSubData.decode(subStruct.subData)
+        : subDataService.sparkLeverageManagementOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
@@ -815,6 +834,9 @@ function parseSparkLeverageManagementOnPrice(position, parseData) {
         price: triggerData.price,
         ratioState: triggerData.ratioState,
     };
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseSparkCloseOnPrice(position, parseData) {
@@ -822,9 +844,11 @@ function parseSparkCloseOnPrice(position, parseData) {
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
     const subData = subDataService.sparkCloseGenericSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
     const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
     _position.specific = {
         collAsset: subData.collAsset,
@@ -1247,8 +1271,15 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseSparkLeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseSparkCloseOnPrice,
         [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
+        [Strategies.Identifiers.EoaCollateralSwitch]: parseSparkCollateralSwitch,
         [Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
+        [Strategies.Identifiers.EoaLiquidationProtection]: parseSparkLiquidationProtection,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,

package/esm/services/strategiesService.test.js

@@ -81,7 +81,6 @@ describe('Feature: strategiesService.ts', () => {
                         subId: '379',
                         proxy: '0x9cb7e19861665366011899d74e75d4f2a419aeed',
                         subHash: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
-                        // @ts-ignore
                         subStruct: {
                             strategyOrBundleId: '8',
                             isBundle: true,

package/esm/services/strategySubService.d.ts

@@ -93,7 +93,11 @@ export declare const sparkEncode: {
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
     leverageManagement(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
     liquidationProtection(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementGeneric(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    liquidationProtectionGeneric(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementOnPriceGeneric(strategyOrBundleId: number, price: number, ratioState: RatioState, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): (number | boolean | string[])[];
     collateralSwitch(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
+    collateralSwitchGeneric(strategyOrBundleId: number, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, marketAddr: EthereumAddress, amountToSwitch: string, user: EthereumAddress, baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, state: RatioState): (number | boolean | string[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];

package/esm/services/strategySubService.js

@@ -250,12 +250,36 @@ export const sparkEncode = {
         const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementGeneric(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkGenericLeverageManagementSubData.encode(targetRatio, ratioState, market, user);
+        const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    liquidationProtectionGeneric(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkGenericLiquidationProtectionSubData.encode(targetRatio, ratioState, market, user);
+        const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+    leverageManagementOnPriceGeneric(strategyOrBundleId, price, ratioState, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
+        const isBundle = true;
+        const subData = subDataService.sparkLeverageManagementOnPriceGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user);
+        const triggerData = triggerService.sparkQuotePriceTrigger.encode(collAsset, debtAsset, price, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
     collateralSwitch(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, baseTokenAddress, quoteTokenAddress, price, state) {
         const isBundle = false;
         const subDataEncoded = subDataService.sparkCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch);
         const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    collateralSwitchGeneric(strategyOrBundleId, fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user, baseTokenAddress, quoteTokenAddress, price, state) {
+        const isBundle = false;
+        const subDataEncoded = subDataService.sparkGenericFLCollateralSwitchSubData.encode(fromAsset, fromAssetId, toAsset, toAssetId, marketAddr, amountToSwitch, user);
+        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, state);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 export const crvUSDEncode = {
     leverageManagement(owner, controllerAddr, ratioState, targetRatio, triggerRatio, collTokenAddr, crvUSDAddr) {