@defisaver/automation-sdk 3.1.10 → 3.1.14-spark-dev

package/cjs/services/ethereumService.test.js

@@ -101,6 +101,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
                         'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
                         'blockNumber': 15166163,
+                        'blockTimestamp': '0x62d53ad8',
                         'event': 'Transfer',
                         'id': 'log_e2258e3a',
                         'logIndex': 385,
@@ -146,6 +147,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
+                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,
@@ -191,6 +193,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1',
                         'blockHash': '0xacb0213af63b4c17c436f084a96d1ac385641a59a9a4cf014ae3337cbe545aa7',
                         'blockNumber': 5353002,
+                        'blockTimestamp': '0x624c1a5b',
                         'event': 'Transfer',
                         'id': 'log_f49645b8',
                         'logIndex': 1,

package/cjs/services/strategiesService.js

@@ -36,9 +36,6 @@ const utils_1 = require("./utils");
 const subDataService = __importStar(require("./subDataService"));
 const triggerService = __importStar(require("./triggerService"));
 const web3 = new web3_1.default();
-const SPARK_MARKET_ADDRESSES = {
-    [enums_1.ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
-};
 const AAVE_V3_MARKET_ADDRESSES = {
     [enums_1.ChainId.Ethereum]: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
     [enums_1.ChainId.Optimism]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
@@ -189,21 +186,29 @@ function parseAaveV2LeverageManagement(position, parseData) {
 }
 function parseAaveV3LeverageManagement(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementSubDataWithoutSubProxy.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementSubData.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: true,
+            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,
         };
     }
     else {
@@ -212,29 +217,133 @@ function parseAaveV3LeverageManagement(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;
+    if (!isEOA) {
+        _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    }
+    else {
+        _position.strategy.strategyId = enums_1.Strategies.IdOverrides.EoaLeverageManagement;
+    }
     return _position;
 }
-function parseMorphoAaveV2LeverageManagement(position, parseData) {
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
-    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    let subData;
+    if (isEOA) {
+        subData = subDataService.aaveV3LeverageManagementOnPriceGeneric.decode(subStruct.subData);
+    }
+    else {
+        subData = subDataService.aaveV3LeverageManagementOnPriceSubData.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, Math.random());
+    _position.specific = {
+        collAsset: subData.collAsset,
+        debtAsset: subData.debtAsset,
+        baseToken: triggerData.baseTokenAddress,
+        quoteToken: triggerData.quoteTokenAddress,
+        price: triggerData.price,
+        ratioState: triggerData.ratioState,
+        debtAssetId: subData.debtAssetId,
+        collAssetId: subData.collAssetId,
+        ratio: subData.targetRatio,
+    };
+    return _position;
+}
+function parseAaveV3CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+    if (isEOA) {
+        const triggerData = triggerService.aaveV3QuotePriceRangeTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3CloseGenericSubData.decode(subStruct.subData);
+        const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+        _position.strategyData.decoded.triggerData = triggerData;
+        _position.strategyData.decoded.subData = subData;
+        _position.specific = {
+            collAsset: subData.collAsset,
+            collAssetId: subData.collAssetId,
+            debtAsset: subData.debtAsset,
+            debtAssetId: subData.debtAssetId,
+            baseToken: triggerData.collToken,
+            quoteToken: triggerData.debtToken,
+            stopLossPrice: triggerData.lowerPrice,
+            takeProfitPrice: triggerData.upperPrice,
+            stopLossType,
+            takeProfitType,
+        };
+        _position.strategy.strategyId = enums_1.Strategies.Identifiers.EoaCloseOnPrice;
+    }
+    else {
+        const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+        const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+        _position.strategyData.decoded.triggerData = triggerData;
+        _position.strategyData.decoded.subData = subData;
+        _position.specific = {
+            collAsset: subData.collAsset,
+            collAssetId: subData.collAssetId,
+            debtAsset: subData.debtAsset,
+            debtAssetId: subData.debtAssetId,
+            baseToken: triggerData.baseTokenAddress,
+            quoteToken: triggerData.quoteTokenAddress,
+            price: triggerData.price,
+            ratioState: triggerData.ratioState,
+        };
+        const { ratioState } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+        _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState)
+            ? enums_1.Strategies.IdOverrides.TakeProfit
+            : enums_1.Strategies.IdOverrides.StopLoss;
+    }
+    return _position;
+}
+function parseAaveV3CollateralSwitch(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV3CollateralSwitchSubData.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);
+    return _position;
+}
+function parseSparkCollateralSwitch(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
+    const 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);
+    return _position;
+}
+function parseAaveV4LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
-    const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
+    const triggerData = triggerService.aaveV4RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4LeverageManagementSubData.decode(subStruct.subData);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner);
-    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            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,
         };
     }
     else {
@@ -243,32 +352,97 @@ function parseMorphoAaveV2LeverageManagement(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;
     return _position;
 }
-function parseAaveV3CloseOnPrice(position, parseData) {
+function parseAaveV4LeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3QuotePriceSubData.decode(subStruct.subData);
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4LeverageManagementOnPriceSubData.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, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagementOnPrice : enums_1.Strategies.IdOverrides.LeverageManagementOnPrice;
     _position.specific = {
         collAsset: subData.collAsset,
         collAssetId: subData.collAssetId,
         debtAsset: subData.debtAsset,
         debtAssetId: subData.debtAssetId,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
         price: triggerData.price,
         ratioState: triggerData.ratioState,
+        ratio: subData.targetRatio,
     };
-    const { ratioState } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState) ? enums_1.Strategies.IdOverrides.TakeProfit : enums_1.Strategies.IdOverrides.StopLoss;
+    return _position;
+}
+function parseAaveV4CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4CloseSubData.decode(subStruct.subData);
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    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, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCloseOnPrice : enums_1.Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
+    };
+    return _position;
+}
+function parseAaveV4CollateralSwitch(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4CollateralSwitchSubData.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, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCollateralSwitch : enums_1.Strategies.Identifiers.CollateralSwitch;
+    return _position;
+}
+function parseMorphoAaveV2LeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.morphoAaveV2LeverageManagementSubData.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);
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
@@ -325,7 +499,8 @@ function parseCompoundV2LeverageManagement(position, parseData) {
             mergeId: enums_1.Strategies.Identifiers.Boost,
         };
     }
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseCompoundV3LeverageManagement(position, parseData) {
@@ -341,13 +516,14 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategyData.decoded.subData = subData;
     _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
     const isRepay = [enums_1.Strategies.Identifiers.Repay, enums_1.Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
             repayEnabled: true,
             subId1: Number(subId),
-            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? enums_1.Strategies.Identifiers.EoaBoost : enums_1.Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -356,13 +532,52 @@ function parseCompoundV3LeverageManagement(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,
         };
     }
-    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLeverageManagement : enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseCompoundV3LeverageManagementOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.compoundV3PriceTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.compoundV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.market, triggerData.user, Math.random());
+    _position.specific = {
+        market: subData.market,
+        collToken: subData.collToken,
+        baseToken: subData.baseToken,
+        ratio: subData.targetRatio,
+        price: triggerData.price,
+        priceState: triggerData.priceState,
+    };
+    return _position;
+}
+function parseCompoundV3CloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.compoundV3PriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.compoundV3CloseSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.Identifiers.EoaCloseOnPrice : enums_1.Strategies.Identifiers.CloseOnPrice;
+    _position.specific = {
+        market: subData.market,
+        collToken: subData.collToken,
+        baseToken: subData.baseToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        takeProfitType,
+        stopLossType,
+    };
+    return _position;
+}
 function parseChickenBondsRebond(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -498,26 +713,50 @@ function parseSparkLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseSparkCloseOnPrice(position, parseData) {
+function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
     const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+    const 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, SPARK_MARKET_ADDRESSES[_position.chainId]);
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
     _position.specific = {
+        // subData
         collAsset: subData.collAsset,
         collAssetId: subData.collAssetId,
         debtAsset: subData.debtAsset,
         debtAssetId: subData.debtAssetId,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
+        ratio: subData.targetRatio,
+        // triggerData
+        baseToken: triggerData.baseTokenAddr,
+        quoteToken: triggerData.quoteTokenAddr,
         price: triggerData.price,
         ratioState: triggerData.ratioState,
     };
-    const { ratioState } = (0, utils_1.getRatioStateInfoForAaveCloseStrategy)(_position.specific.ratioState, (0, utils_1.wethToEthByAddress)(_position.specific.collAsset, parseData.chainId), (0, utils_1.wethToEthByAddress)(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = (0, utils_1.isRatioStateOver)(ratioState) ? enums_1.Strategies.IdOverrides.TakeProfit : enums_1.Strategies.IdOverrides.StopLoss;
+    return _position;
+}
+function parseSparkCloseOnPrice(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkCloseGenericSubData.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);
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
+    _position.specific = {
+        collAsset: subData.collAsset,
+        collAssetId: subData.collAssetId,
+        debtAsset: subData.debtAsset,
+        debtAssetId: subData.debtAssetId,
+        baseToken: triggerData.collToken,
+        quoteToken: triggerData.debtToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
+    };
     return _position;
 }
 function parseLiquitySavingsLiqProtection(position, parseData) {
@@ -654,24 +893,32 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
-function parseAaveV3LeverageManagementOnPrice(position, parseData) {
+function parseMorphoBlueCloseOnPrice(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.aaveV3QuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveV3LeverageManagementOnPriceSubData.decode(subStruct.subData);
+    const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.morphoBlueCloseOnPriceSubData.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, Math.random());
+    const marketIdEncodedData = web3.eth.abi.encodeParameters(['address', 'address', 'address', 'address', 'uint256'], [
+        subData.loanToken,
+        subData.collToken,
+        subData.oracle,
+        subData.irm,
+        subData.lltv,
+    ]);
+    const marketId = web3.utils.keccak256(marketIdEncodedData);
+    const { takeProfitType, stopLossType } = (0, utils_1.getStopLossAndTakeProfitTypeByCloseStrategyType)(+subData.closeType);
     _position.specific = {
-        collAsset: subData.collAsset,
-        debtAsset: subData.debtAsset,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
-        price: triggerData.price,
-        ratioState: triggerData.ratioState,
-        debtAssetId: subData.debtAssetId,
-        collAssetId: subData.collAssetId,
-        ratio: subData.targetRatio,
+        subHash: _position.subHash,
+        marketId,
+        collAsset: subData.collToken,
+        debtAsset: subData.loanToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
     };
     return _position;
 }
@@ -688,7 +935,6 @@ function parseLiquityV2CloseOnPrice(position, parseData) {
     // - Only TakeProfit
     // - Only StopLoss
     // - Both
-    // TODO: see on frontend what specific data we need here because stop-loss and take-profit is one bundle now
     _position.strategy.strategyId = enums_1.Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         market: subData.market,
@@ -813,6 +1059,26 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [enums_1.Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
+        [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
+    },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseAaveV4LeverageManagement,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.BoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseAaveV4CloseOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepay]: parseAaveV4LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaBoost]: parseAaveV4LeverageManagement,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
+        [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
+        [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -823,6 +1089,12 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,
         [enums_1.Strategies.Identifiers.EoaRepay]: parseCompoundV3LeverageManagement,
         [enums_1.Strategies.Identifiers.EoaBoost]: parseCompoundV3LeverageManagement,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.BoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaRepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
+        [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
         [enums_1.Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -838,8 +1110,10 @@ const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.Spark]: {
         [enums_1.Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
-        [enums_1.Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
-        [enums_1.Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+        [enums_1.Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [enums_1.Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -852,6 +1126,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [enums_1.Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [enums_1.Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/cjs/services/strategiesService.test.js

@@ -73,6 +73,7 @@ describe('Feature: strategiesService.ts', () => {
                         repayEnabled: true,
                         subId1: 379,
                         mergeWithId: enums_1.Strategies.Identifiers.Boost,
+                        subHashRepay: '0xafa4d200be62f171b57b1ae0f4e8348d1ac3f6d0812ad6da74a2adae8037dde1',
                     }
                 },
                 {