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

package/esm/services/strategiesService.js

@@ -2,14 +2,11 @@ import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 import Web3 from 'web3';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
-import { ChainId, ProtocolIdentifiers, Strategies } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, Strategies, } from '../types/enums';
 import { getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTakeProfitTypeByCloseStrategyType, isRatioStateOver, wethToEthByAddress, } from './utils';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 const web3 = new Web3();
-const SPARK_MARKET_ADDRESSES = {
-    [ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
-};
 const AAVE_V3_MARKET_ADDRESSES = {
     [ChainId.Ethereum]: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
     [ChainId.Optimism]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
@@ -160,21 +157,29 @@ function parseAaveV2LeverageManagement(position, parseData) {
 }
 function parseAaveV3LeverageManagement(position, parseData) {
     const _position = 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 = 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: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -183,29 +188,133 @@ function parseAaveV3LeverageManagement(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;
+    if (!isEOA) {
+        _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    }
+    else {
+        _position.strategy.strategyId = Strategies.IdOverrides.EoaLeverageManagement;
+    }
     return _position;
 }
-function parseMorphoAaveV2LeverageManagement(position, parseData) {
+function parseAaveV3LeverageManagementOnPrice(position, parseData) {
     const _position = 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 = 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 = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.positionId = 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 } = 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 = 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 } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
+        _position.strategy.strategyId = isRatioStateOver(ratioState)
+            ? Strategies.IdOverrides.TakeProfit
+            : Strategies.IdOverrides.StopLoss;
+    }
+    return _position;
+}
+function parseAaveV3CollateralSwitch(position, parseData) {
+    const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    return _position;
+}
+function parseSparkCollateralSwitch(position, parseData) {
+    const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    return _position;
+}
+function parseAaveV4LeverageManagement(position, parseData) {
+    const _position = 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 = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
-    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     if (isRepay) {
         _position.specific = {
             triggerRepayRatio: triggerData.ratio,
             targetRepayRatio: subData.targetRatio,
-            repayEnabled: true,
+            repayEnabled: isEnabled,
             subId1: Number(subId),
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
+            subHashRepay: subHash,
         };
     }
     else {
@@ -214,32 +323,97 @@ function parseMorphoAaveV2LeverageManagement(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;
     return _position;
 }
-function parseAaveV3CloseOnPrice(position, parseData) {
+function parseAaveV4LeverageManagementOnPrice(position, parseData) {
     const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, AAVE_V3_MARKET_ADDRESSES[_position.chainId]);
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : 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 } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+    return _position;
+}
+function parseAaveV4CloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.aaveV4QuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV4CloseSubData.decode(subStruct.subData);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    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, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : 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 = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCollateralSwitch : Strategies.Identifiers.CollateralSwitch;
+    return _position;
+}
+function parseMorphoAaveV2LeverageManagement(position, parseData) {
+    const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner);
+    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+            mergeWithId: Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            mergeId: Strategies.Identifiers.Boost,
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseAaveV3CloseOnPriceWithMaximumGasPrice(position, parseData) {
@@ -296,7 +470,8 @@ function parseCompoundV2LeverageManagement(position, parseData) {
             mergeId: Strategies.Identifiers.Boost,
         };
     }
-    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
 function parseCompoundV3LeverageManagement(position, parseData) {
@@ -312,13 +487,14 @@ function parseCompoundV3LeverageManagement(position, parseData) {
     _position.strategyData.decoded.subData = subData;
     _position.positionId = getPositionId(_position.chainId, _position.protocol.id, triggerData.owner.toLowerCase(), triggerData.market);
     const isRepay = [Strategies.Identifiers.Repay, 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: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -327,13 +503,52 @@ function parseCompoundV3LeverageManagement(position, parseData) {
             targetBoostRatio: subData.targetRatio,
             boostEnabled: isEnabled,
             subId2: Number(subId),
-            mergeId: Strategies.Identifiers.Boost,
+            mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
-    const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseCompoundV3LeverageManagementOnPrice(position, parseData) {
+    const _position = 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 = 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 = 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 = getPositionId(_position.chainId, _position.protocol.id, triggerData.market, Math.random());
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : 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 = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -469,26 +684,50 @@ function parseSparkLeverageManagement(position, parseData) {
     _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
-function parseSparkCloseOnPrice(position, parseData) {
+function parseSparkLeverageManagementOnPrice(position, parseData) {
     const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, SPARK_MARKET_ADDRESSES[_position.chainId]);
+    _position.positionId = 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 } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+    return _position;
+}
+function parseSparkCloseOnPrice(position, parseData) {
+    const _position = 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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    const { takeProfitType, stopLossType } = 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) {
@@ -625,24 +864,32 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
-function parseAaveV3LeverageManagementOnPrice(position, parseData) {
+function parseMorphoBlueCloseOnPrice(position, parseData) {
     const _position = 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 = 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 } = 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;
 }
@@ -659,7 +906,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 = Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         market: subData.market,
@@ -784,6 +1030,26 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
         [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
         [Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
+        [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
+    },
+    [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
+        [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.Boost]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.RepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.BoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseAaveV4CloseOnPrice,
+        [Strategies.Identifiers.EoaRepay]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.EoaBoost]: parseAaveV4LeverageManagement,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV4LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV4CloseOnPrice,
+        [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
+        [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -794,6 +1060,12 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,
         [Strategies.Identifiers.EoaRepay]: parseCompoundV3LeverageManagement,
         [Strategies.Identifiers.EoaBoost]: parseCompoundV3LeverageManagement,
+        [Strategies.Identifiers.RepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.BoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.ChickenBonds]: {
         [Strategies.Identifiers.Rebond]: parseChickenBondsRebond,
@@ -809,8 +1081,10 @@ const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
         [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
         [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
-        [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
-        [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.RepayOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.BoostOnPrice]: parseSparkLeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.CollateralSwitch]: parseSparkCollateralSwitch,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -823,6 +1097,7 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
         [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/esm/services/strategiesService.test.js

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

package/esm/services/strategySubService.d.ts

@@ -6,6 +6,7 @@ export declare const makerEncode: {
     closeOnPrice(vaultId: number, ratioState: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(vaultId: number, triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     leverageManagement(vaultId: number, triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string, targetRepayRatio: string, boostEnabled: boolean): (string | number | boolean)[];
+    leverageManagementWithoutSubProxy(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, isBoost: boolean, daiAddr?: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
 };
 export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
@@ -60,15 +61,21 @@ export declare const aaveV3Encode: {
         marketAddr: EthereumAddress;
         targetRatio: number;
     }): (number | boolean | string[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, isGeneric?: boolean): (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[])[];
+    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[])[];
+    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[])[];
 };
 export declare const compoundV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
 };
 export declare const compoundV3Encode: {
     leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    leverageManagementOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, ratioState: RatioState, user: EthereumAddress): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, stopLossPrice: number | undefined, stopLossType: CloseToAssetType | undefined, takeProfitPrice: number | undefined, takeProfitType: CloseToAssetType | undefined, user: EthereumAddress): (number | boolean | string[])[];
 };
 export declare const compoundV3L2Encode: {
-    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
+    leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA?: boolean): string;
 };
 export declare const morphoAaveV2Encode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string[];
@@ -79,9 +86,9 @@ export declare const exchangeEncode: {
 };
 export declare const sparkEncode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
-    closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
-        baseTokenAddress: EthereumAddress;
-        quoteTokenAddress: EthereumAddress;
+    leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
+        baseTokenAddr: EthereumAddress;
+        quoteTokenAddr: EthereumAddress;
         price: number;
         ratioState: RatioState;
     }, subData: {
@@ -89,15 +96,21 @@ export declare const sparkEncode: {
         collAssetId: number;
         debtAsset: EthereumAddress;
         debtAssetId: number;
+        marketAddr: EthereumAddress;
+        targetRatio: number;
     }): (number | boolean | string[])[];
+    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[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (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[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
     payback(proxyAddress: EthereumAddress, addressToPullTokensFrom: EthereumAddress, positionOwner: EthereumAddress, paybackAmount: string, crvUSDAddr: EthereumAddress, controllerAddr: EthereumAddress, minHealthRatio: number): (boolean | string[] | Strategies.MainnetIds)[];
 };
 export declare const morphoBlueEncode: {
-    leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (boolean | string[] | Bundles.MainnetIds)[] | (boolean | string[] | Bundles.BaseIds)[];
+    leverageManagement(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (boolean | string[] | Bundles.BaseIds)[] | (boolean | string[] | Bundles.MainnetIds | Bundles.ArbitrumIds)[];
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const liquityV2Encode: {
     leverageManagement(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
@@ -108,3 +121,9 @@ export declare const liquityV2Encode: {
 export declare const fluidEncode: {
     leverageManagement(nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];
 };
+export declare const aaveV4Encode: {
+    leverageManagement(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
+    leverageManagementOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, targetRatio: number, price: string, priceState: RatioState, ratioState: RatioState): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, stopLossPrice?: string, stopLossType?: CloseToAssetType, takeProfitPrice?: string, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    collateralSwitch(strategyOrBundleId: number, owner: EthereumAddress, spoke: EthereumAddress, fromAsset: EthereumAddress, fromAssetId: number, toAsset: EthereumAddress, toAssetId: number, amountToSwitch: string, price: string, ratioState: RatioState): (number | boolean | string[])[];
+};