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

package/cjs/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/cjs/automation/private/StrategiesAutomation.js

@@ -19,7 +19,20 @@ const utils_1 = require("../../services/utils");
 const contractService_1 = require("../../services/contractService");
 const ethereumService_1 = require("../../services/ethereumService");
 const strategiesService_1 = require("../../services/strategiesService");
+const apiSubscriptionsService_1 = require("../../services/apiSubscriptionsService");
 const Automation_1 = __importDefault(require("./Automation"));
+/**
+ * Adds the backend flags to a parsed position. A repay or boost half of a leverage management pair also gets its
+ * own invalid flag in specific, next to repayEnabled and boostEnabled, so it survives merging.
+ */
+const withApiFlags = (position, record) => {
+    const specific = Object.assign({}, position.specific);
+    if ((0, utils_1.isDefined)(specific.mergeWithId))
+        specific.repayInvalid = record.invalid;
+    if ((0, utils_1.isDefined)(specific.mergeId))
+        specific.boostInvalid = record.invalid;
+    return Object.assign(Object.assign({}, position), { invalid: record.invalid, specific: specific });
+};
 class StrategiesAutomation extends Automation_1.default {
     constructor(args) {
         super();
@@ -126,9 +139,9 @@ class StrategiesAutomation extends Automation_1.default {
             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: decimal_js_1.default.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: decimal_js_1.default.max(mergePair.blockNumber, current.blockNumber).toNumber(), subIds: [current.subId, mergePair.subId], isEnabled: mergePair.isEnabled || current.isEnabled }), (0, utils_1.addToObjectIf)((0, utils_1.isDefined)(current.invalid), { invalid: !!mergePair.invalid && !!current.invalid })), { specific: Object.assign(Object.assign({}, mergePair.specific), current.specific) }));
             }
             else {
                 subscriptions.push(Object.assign(Object.assign({}, current), { subIds: [current.subId] }));
@@ -189,6 +202,20 @@ class StrategiesAutomation extends Automation_1.default {
             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((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, this.chainId));
+            return position && withApiFlags(position, record);
+        });
+        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/cjs/automation/private/StrategiesAutomation.test.js

@@ -693,4 +693,70 @@ describe('Feature: StrategiesAutomation.ts', () => {
             (0, chai_1.expect)(loneBoost === null || loneBoost === void 0 ? void 0 : loneBoost.subId).to.equal(1);
         });
     }));
+    describe('When testing StrategiesAutomation.parseSubscriptionsFromApi', () => {
+        const strategiesAutomation = new StrategiesAutomation_1.default({
+            chainId: enums_1.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: enums_1.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: enums_1.SubscriptionStatus.Disabled, strategy_or_bundle_id: 9, sub_data_hash: '0x1111111111111111111111111111111111111111111111111111111111111111', trigger_data: ['0000000000000000000000009cb7e19861665366011899d74e75d4f2a419aeed0000000000000000000000002f39d218133afab8f2b819b1066c7e434ad94e9e0000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000000000000000000000000000000000000000000000'] });
+        it('Given API records should return parsed positions carrying the invalid flags', () => {
+            var _a, _b;
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })]);
+            (0, chai_1.expect)(positions).to.have.length(2);
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.subId)).to.eql([379, 380]);
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.isEnabled)).to.eql([true, false]);
+            (0, chai_1.expect)(positions.map((p) => p === null || p === void 0 ? void 0 : p.invalid)).to.eql([false, true]);
+            (0, chai_1.expect)(((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.specific).repayInvalid).to.equal(false);
+            (0, chai_1.expect)(((_b = positions[1]) === null || _b === void 0 ? void 0 : _b.specific).boostInvalid).to.equal(true);
+        });
+        it('Given a merged pair should keep each half\'s invalid flag and mark the pair invalid only when both are', () => {
+            var _a, _b, _c;
+            const oneInvalid = strategiesAutomation.parseSubscriptionsFromApi([repay, Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
+            (0, chai_1.expect)(oneInvalid).to.have.length(1);
+            (0, chai_1.expect)((_a = oneInvalid[0]) === null || _a === void 0 ? void 0 : _a.invalid).to.equal(false);
+            (0, chai_1.expect)((_b = oneInvalid[0]) === null || _b === void 0 ? void 0 : _b.specific).to.include({ repayInvalid: false, boostInvalid: true });
+            const bothInvalid = strategiesAutomation.parseSubscriptionsFromApi([Object.assign(Object.assign({}, repay), { invalid: true }), Object.assign(Object.assign({}, boost), { invalid: true })], { mergeSubs: true });
+            (0, chai_1.expect)((_c = bothInvalid[0]) === null || _c === void 0 ? void 0 : _c.invalid).to.equal(true);
+        });
+        it('Given mergeSubs option should merge the repay and boost pair', () => {
+            var _a, _b;
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { mergeSubs: true });
+            (0, chai_1.expect)(positions).to.have.length(1);
+            (0, chai_1.expect)((_a = positions[0]) === null || _a === void 0 ? void 0 : _a.subIds).to.eql([379, 380]);
+            (0, chai_1.expect)((_b = positions[0]) === null || _b === void 0 ? void 0 : _b.isEnabled).to.equal(true);
+        });
+        it('Given enabledOnly option should drop disabled records before parsing', () => {
+            const positions = strategiesAutomation.parseSubscriptionsFromApi([repay, boost], { enabledOnly: true });
+            (0, chai_1.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 })]);
+            (0, chai_1.expect)(positions).to.eql([null]);
+        });
+    });
 });

package/cjs/constants/index.js

@@ -122,6 +122,11 @@ exports.MAINNET_STRATEGIES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CollateralSwitch,
         protocol: exports.PROTOCOLS.Spark,
     },
+    [enums_1.Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH]: {
+        strategyOrBundleId: enums_1.Strategies.MainnetIds.SPARK_GENERIC_FL_COLLATERAL_SWITCH,
+        strategyId: enums_1.Strategies.Identifiers.EoaCollateralSwitch,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_STRATEGIES_INFO = {
     [enums_1.Strategies.OptimismIds.EXCHANGE_DCA]: {
@@ -549,6 +554,31 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV4,
     },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepay,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoost,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_CLOSE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_CLOSE,
+        strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_REPAY_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaRepayOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_BOOST_ON_PRICE,
+        strategyId: enums_1.Strategies.Identifiers.EoaBoostOnPrice,
+        protocol: exports.PROTOCOLS.Spark,
+    },
     [enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
@@ -624,6 +654,11 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
+    [enums_1.Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.Spark,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/cjs/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/cjs/services/apiSubscriptionsService.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDataFromApiSubscription = void 0;
+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)
+ */
+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,
+        },
+    };
+}
+exports.parseDataFromApiSubscription = parseDataFromApiSubscription;

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

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

package/cjs/services/apiSubscriptionsService.test.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const chai_1 = require("chai");
+const enums_1 = require("../types/enums");
+require("../configuration");
+const apiSubscriptionsService_1 = require("./apiSubscriptionsService");
+const strategiesService_1 = require("./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: enums_1.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: enums_1.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', () => {
+            (0, chai_1.expect)((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, enums_1.ChainId.Ethereum)).to.eql(fromEvents);
+        });
+        it('Given an API record the parsed position should match the one parsed from events', () => {
+            const fromApi = (0, strategiesService_1.parseStrategiesAutomatedPosition)((0, apiSubscriptionsService_1.parseDataFromApiSubscription)(record, enums_1.ChainId.Ethereum));
+            (0, chai_1.expect)(fromApi).to.not.equal(null);
+            (0, chai_1.expect)(fromApi).to.eql((0, strategiesService_1.parseStrategiesAutomatedPosition)(fromEvents));
+        });
+        it('Given a disabled record should keep it disabled', () => {
+            const parseData = (0, apiSubscriptionsService_1.parseDataFromApiSubscription)(Object.assign(Object.assign({}, record), { is_enabled: false }), enums_1.ChainId.Ethereum);
+            (0, chai_1.expect)(parseData.strategiesSubsData.isEnabled).to.equal(false);
+        });
+    });
+});

package/cjs/services/ethereumService.test.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const web3_1 = __importDefault(require("web3"));
 const chai_1 = require("chai");
+const lodash_1 = require("lodash");
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
 require("../configuration");
@@ -101,7 +102,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
                         'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
                         'blockNumber': 15166163,
-                        'blockTimestamp': '0x62d53ad8',
                         'event': 'Transfer',
                         'id': 'log_e2258e3a',
                         'logIndex': 385,
@@ -128,7 +128,7 @@ describe('Feature: ethereumService.ts', () => {
                     },
                 ],
                 [
-                    (0, contractService_1.makeErc20Contract)(Web3_1, (0, tokens_1.getAssetInfo)('LUSD').address, enums_1.ChainId.Ethereum),
+                    Object.assign(Object.assign({}, (0, contractService_1.makeErc20Contract)(Web3_1, (0, tokens_1.getAssetInfo)('LUSD').address, enums_1.ChainId.Ethereum)), { createdBlock: 15166163 }),
                     null,
                     'Transfer',
                     {
@@ -147,7 +147,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -193,7 +192,6 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
-                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -236,9 +234,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 (0, ethereumService_1.getEventsFromContract)(...actual);
-                console.log(data);
-                (0, chai_1.expect)(yield (0, ethereumService_1.getEventsFromContract)(...actual)).to.eql(expected);
+                const events = yield (0, ethereumService_1.getEventsFromContract)(...actual);
+                (0, chai_1.expect)(events.map((event) => (0, lodash_1.omit)(event, 'blockTimestamp'))).to.eql(expected);
             }));
         });
     });

package/cjs/services/strategiesService.js

@@ -359,11 +359,17 @@ function parseAaveV3CollateralSwitch(position, parseData) {
 function parseSparkCollateralSwitch(position, parseData) {
     const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.Identifiers.EoaCollateralSwitch
+        : enums_1.Strategies.Identifiers.CollateralSwitch;
     return _position;
 }
 function parseAaveV4LeverageManagement(position, parseData) {
@@ -775,19 +781,22 @@ function parseSparkLeverageManagement(position, parseData) {
     const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
-    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: isEnabled,
             subId1: Number(subId),
-            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
             subHashRepay: subHash,
         };
     }
@@ -797,19 +806,24 @@ function parseSparkLeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: enums_1.Strategies.Identifiers.Boost,
+            mergeId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
             subHashBoost: subHash,
         };
     }
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.IdOverrides.EoaLeverageManagement
+        : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseSparkLiquidationProtection(position, parseData) {
     const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
@@ -820,14 +834,19 @@ function parseSparkLiquidationProtection(position, parseData) {
         subId1: Number(subId),
         subHashRepay: subHash,
     };
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LiquidationProtection;
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection
+        : enums_1.Strategies.IdOverrides.LiquidationProtection;
     return _position;
 }
 function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
@@ -844,6 +863,9 @@ function parseSparkLeverageManagementOnPrice(position, parseData) {
         price: triggerData.price,
         ratioState: triggerData.ratioState,
     };
+    _position.strategy.strategyId = isEOA
+        ? enums_1.Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : enums_1.Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseSparkCloseOnPrice(position, parseData) {
@@ -851,9 +873,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 = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCloseOnPrice : enums_1.Strategies.Identifiers.CloseOnPrice;
     const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
     _position.specific = {
         collAsset: subData.collAsset,
@@ -1276,8 +1300,15 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepay]: parseSparkLeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaBoost]: parseSparkLeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseSparkLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseSparkCloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
+        [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseSparkCollateralSwitch,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseSparkLiquidationProtection,
+        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseSparkLiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,

package/cjs/services/strategiesService.test.js

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

package/cjs/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/cjs/services/strategySubService.js

@@ -276,12 +276,36 @@ exports.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];
+    },
 };
 exports.crvUSDEncode = {
     leverageManagement(owner, controllerAddr, ratioState, targetRatio, triggerRatio, collTokenAddr, crvUSDAddr) {