@defisaver/automation-sdk 3.3.15-liq-prot-dev → 3.3.15-liq-prot-1-dev

package/cjs/constants/index.js

@@ -549,23 +549,23 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV4,
     },
-    [enums_1.Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.MakerDAO,
     },
-    [enums_1.Bundles.MainnetIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Bundles.MainnetIds.AAVE_V4_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV4,
     },
-    [enums_1.Bundles.MainnetIds.SPARK_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.Spark,
     },
@@ -576,19 +576,34 @@ exports.MAINNET_BUNDLES_INFO = {
     },
     [enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
         strategyOrBundleId: enums_1.Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
-    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.MainnetIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV4,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -646,11 +661,16 @@ exports.OPTIMISM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.EoaCloseOnPrice,
         protocol: exports.PROTOCOLS.AaveV3,
     },
-    [enums_1.Bundles.OptimismIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV3,
     },
+    [enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.BASE_BUNDLES_INFO = {
     [enums_1.Bundles.BaseIds.AAVE_V3_REPAY]: {
@@ -788,8 +808,8 @@ exports.BASE_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV3,
     },
@@ -800,19 +820,24 @@ exports.BASE_BUNDLES_INFO = {
     },
     [enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
         strategyOrBundleId: enums_1.Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
-    [enums_1.Bundles.BaseIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.BaseIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
 };
 exports.ARBITRUM_BUNDLES_INFO = {
     [enums_1.Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -960,8 +985,8 @@ exports.ARBITRUM_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.CloseOnPrice,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.ArbitrumIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.AaveV3,
     },
@@ -972,19 +997,29 @@ exports.ARBITRUM_BUNDLES_INFO = {
     },
     [enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
         strategyOrBundleId: enums_1.Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-        strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
         protocol: exports.PROTOCOLS.CompoundV3,
     },
-    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.MorphoBlue,
     },
-    [enums_1.Bundles.ArbitrumIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_LIQUIDATION_PROTECTION,
+    [enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
         strategyId: enums_1.Strategies.Identifiers.LiquidationProtection,
         protocol: exports.PROTOCOLS.FluidT1,
     },
+    [enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.AaveV3,
+    },
+    [enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+        strategyOrBundleId: enums_1.Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+        strategyId: enums_1.Strategies.Identifiers.EoaLiquidationProtection,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
 };
 exports.BUNDLES_INFO = {
     [enums_1.ChainId.Ethereum]: exports.MAINNET_BUNDLES_INFO,

package/cjs/services/strategiesService.js

@@ -138,7 +138,6 @@ function parseMakerLiquidationProtection(position, parseData) {
         repayEnabled: isEnabled,
         subId1: Number(subId),
     };
-    // TODO -> Is this ok?
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LiquidationProtection;
     return _position;
 }
@@ -257,7 +256,6 @@ function parseAaveV3LiquidationProtection(position, parseData) {
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-    //  const isEOA = _position.strategy.strategyId.includes('eoa');
     const subData = subDataService.aaveV3LiquidationProtectionSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
@@ -269,8 +267,8 @@ function parseAaveV3LiquidationProtection(position, parseData) {
         subId1: Number(subId),
         subHashRepay: subHash,
     };
-    // TODO -> Should split for EOA or not? Prob not as they will use same encoding and decoding
-    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LiquidationProtection;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.Strategies.IdOverrides.LiquidationProtection;
     return _position;
 }
 function parseAaveV3LeverageManagementOnPrice(position, parseData) {
@@ -408,12 +406,11 @@ function parseAaveV4LiquidationProtection(position, parseData) {
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV4RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.aaveV4LiquidationProtectionSubData.decode(subStruct.subData);
-    // const isEOA = _position.strategy.strategyId.includes('eoa');
-    // const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
+    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 = enums_1.Strategies.IdOverrides.LiquidationProtection;
+    _position.strategy.strategyId = isEOA ? enums_1.Strategies.IdOverrides.EoaLiquidationProtection : enums_1.Strategies.IdOverrides.LiquidationProtection;
     _position.specific = {
         triggerRepayRatio: triggerData.ratio,
         targetRepayRatio: subData.targetRatio,
@@ -611,13 +608,12 @@ function parseCompoundV3LiquidationProtection(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
-    const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubData;
+    const subDataDecoder = subDataService.compoundV3LiquidationProtectionSubDataWithoutSubProxy;
     const triggerData = triggerService.compoundV3RatioTrigger.decode(subStruct.triggerData);
     const subData = subDataDecoder.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.owner.toLowerCase(), triggerData.market);
-    // const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
     const isEOA = _position.strategy.strategyId.includes('eoa');
     _position.specific = {
         triggerRepayRatio: triggerData.ratio,
@@ -998,8 +994,7 @@ function parseMorphoBlueLiquidationProtection(position, parseData) {
         subHashRepay: subHash,
     };
     const isEOA = _position.strategy.strategyId.includes('eoa');
-    // TODO -> Should be separate for EOA ?
-    _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 parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
@@ -1222,6 +1217,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
+        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
         [enums_1.Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
@@ -1237,6 +1233,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
         [enums_1.Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseAaveV4LiquidationProtection,
+        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV4LiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
         [enums_1.Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1253,7 +1250,6 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
         [enums_1.Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
-        // TODO -> here should prob separate EOA from SW
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseCompoundV3LiquidationProtection,
         [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseCompoundV3LiquidationProtection,
     },
@@ -1290,6 +1286,7 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
         [enums_1.Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
         [enums_1.Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
+        [enums_1.Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
     },
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [enums_1.Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/cjs/services/strategySubService.d.ts

@@ -71,7 +71,7 @@ export declare const compoundV2Encode: {
 };
 export declare const compoundV3Encode: {
     leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
-    liquidationProtection(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    liquidationProtectionWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, baseToken: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | 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[])[];
 };

package/cjs/services/strategySubService.js

@@ -68,7 +68,7 @@ exports.makerEncode = {
         ];
     },
     liquidationProtection(vaultId, triggerRatio, targetRatio, ratioState, daiAddr) {
-        const bundleId = enums_1.Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION;
+        const bundleId = enums_1.Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION;
         const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
         const subData = subDataService.makerLiquidationProtectionSubData.encode(vaultId, targetRatio, daiAddr);
         return [
@@ -217,8 +217,11 @@ exports.compoundV3Encode = {
         const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
-    liquidationProtection(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    liquidationProtectionWithoutSubProxy(strategyOrBundleId, market, baseToken, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.compoundV3LiquidationProtectionSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
+        const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
     },
     leverageManagementOnPrice(strategyOrBundleId, market, collToken, baseToken, targetRatio, price, priceState, ratioState, // REPAY for repay on price, BOOST for boost on price
     user) {
@@ -328,8 +331,10 @@ exports.morphoBlueEncode = {
     liquidationProtection(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user, isEOA, network) {
         const subData = subDataService.morphoBlueLiquidationProtectionSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
         const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
-        // TODO -> Check if need to deploy separate bundles for EOA, or can reuse this for EOA. Logic above is different for EOA and SW on arbi and mainnet. Base uses same for both, not sure if because of lack of EOA support or because it is using same bundle for both.
-        const bundleId = (0, utils_1.getBundleIdsByNetwork)(network).MORPHO_BLUE_LIQUIDATION_PROTECTION;
+        // Type casting because there is no MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION for Base chain.
+        // That is fine because we will just always send isEOA == false for Base chain.
+        const bundleNetwork = (0, utils_1.getBundleIdsByNetwork)(network);
+        const bundleId = isEOA ? bundleNetwork.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundleNetwork.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
         const isBundle = true;
         return [bundleId, isBundle, triggerData, subData];
     },

package/cjs/services/subDataService.d.ts

@@ -374,12 +374,6 @@ export declare const compoundV2LeverageManagementSubDataWithoutSubProxy: {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-export declare const compoundV3LeverageManagementSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
-    decode(subData: string[]): {
-        targetRatio: number;
-    };
-};
 export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
@@ -389,16 +383,13 @@ export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
-export declare const compoundV3LiquidationProtectionSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
-    decode(subData: string[]): {
-        targetRatio: number;
-    };
-};
-export declare const compoundV3L2LiquidationProtectionSubData: {
-    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string;
+export declare const compoundV3LiquidationProtectionSubDataWithoutSubProxy: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState): string[];
     decode(subData: string[]): {
+        market: EthereumAddress;
+        baseToken: EthereumAddress;
         targetRatio: number;
+        ratioState: RatioState;
     };
 };
 export declare const compoundV3LeverageManagementOnPriceSubData: {

package/cjs/services/subDataService.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3L2LiquidationProtectionSubData = exports.compoundV3LiquidationProtectionSubData = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
-exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = void 0;
+exports.crvUSDLeverageManagementSubData = exports.sparkCollateralSwitchSubData = exports.sparkLeverageManagementOnPriceSubData = exports.sparkCloseGenericSubData = exports.sparkLiquidationProtectionSubData = exports.sparkLeverageManagementSubDataWithoutSubProxy = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubDataWithoutSubProxy = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.compoundV3CloseSubData = exports.compoundV3LeverageManagementOnPriceSubData = exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = exports.compoundV3LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubDataWithoutSubProxy = exports.compoundV2LeverageManagementSubData = exports.aaveV4CollateralSwitchSubData = exports.aaveV4CloseSubData = exports.aaveV4LeverageManagementOnPriceSubData = exports.aaveV4LiquidationProtectionSubData = exports.aaveV4LeverageManagementSubData = exports.aaveV3LeverageManagementOnPriceSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3CollateralSwitchSubData = exports.aaveV3CloseGenericSubData = exports.aaveV3LeverageManagementOnPriceGeneric = exports.aaveV3LiquidationProtectionSubData = exports.aaveV3LeverageManagementSubDataWithoutSubProxy = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubDataWithoutSubProxy = exports.aaveV2LeverageManagementSubData = exports.liquityV2PaybackSubData = exports.liquityV2LeverageManagementOnPriceSubData = exports.liquityV2CloseSubData = exports.liquityV2LeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubDataWithoutSubProxy = exports.liquityLeverageManagementSubData = exports.liquityRepayFromSavingsSubData = exports.makerLiquidationProtectionSubData = exports.makerLeverageManagementWithoutSubProxy = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = void 0;
+exports.fluidLiquidationProtectionSubData = exports.fluidLeverageManagementSubData = exports.morphoBlueCloseOnPriceSubData = exports.morphoBlueLeverageManagementOnPriceSubData = exports.morphoBlueLiquidationProtectionSubData = exports.morphoBlueLeverageManagementSubData = exports.crvUSDPaybackSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const web3_utils_1 = require("web3-utils");
@@ -874,28 +874,7 @@ exports.compoundV2LeverageManagementSubDataWithoutSubProxy = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
-exports.compoundV3LeverageManagementSubData = {
-    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return [
-            market,
-            baseToken,
-            new decimal_js_1.default(triggerRepayRatio).mul(1e16).toString(),
-            new decimal_js_1.default(triggerBoostRatio).mul(1e16).toString(),
-            new decimal_js_1.default(targetBoostRatio).mul(1e16).toString(),
-            new decimal_js_1.default(targetRepayRatio).mul(1e16).toString(),
-            // @ts-ignore // TODO
-            boostEnabled, isEOA,
-        ];
-    },
-    decode(subData) {
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return { targetRatio };
-    },
-};
-// ! Any change here will PROBABLY require a change in compoundV3L2LiquidationProtectionSubData as well, since it is copy paste
+// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubDataWithoutSubProxy as well, since it is copy paste
 // ! Double check before changing
 exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
     encode(market, baseToken, targetRatio, ratioState) {
@@ -915,50 +894,22 @@ exports.compoundV3LeverageManagementSubDataWithoutSubProxy = {
         };
     },
 };
-exports.compoundV3LiquidationProtectionSubData = {
-    encode(market, baseToken, triggerRepayRatio, 
-    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
-    triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        return [
-            market,
-            baseToken,
-            new decimal_js_1.default(triggerRepayRatio).mul(1e16).toString(),
-            new decimal_js_1.default(triggerBoostRatio).mul(1e16).toString(),
-            new decimal_js_1.default(targetBoostRatio).mul(1e16).toString(),
-            new decimal_js_1.default(targetRepayRatio).mul(1e16).toString(),
-            // @ts-ignore // TODO
-            boostEnabled, isEOA,
-        ];
-    },
-    decode(subData) {
-        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
-        return { targetRatio };
-    },
-};
-exports.compoundV3L2LiquidationProtectionSubData = {
-    encode(market, baseToken, triggerRepayRatio, 
-    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
-    triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
-        let subInput = '0x';
-        subInput = subInput.concat(market.slice(2));
-        subInput = subInput.concat(baseToken.slice(2));
-        subInput = subInput.concat(new decimal_js_1.default(triggerRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(triggerBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(targetBoostRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(new decimal_js_1.default(targetRepayRatio).mul(1e16).toHex().slice(2)
-            .padStart(32, '0'));
-        subInput = subInput.concat(boostEnabled ? '01' : '00');
-        subInput = subInput.concat(isEOA ? '01' : '00');
-        return subInput;
+exports.compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
+    encode(market, baseToken, targetRatio, ratioState) {
+        const encodedMarket = web3_eth_abi_1.default.encodeParameter('address', market);
+        const encodedBaseToken = web3_eth_abi_1.default.encodeParameter('address', baseToken);
+        const encodedRatioState = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const encodedTargetRatio = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
     },
     decode(subData) {
-        const ratioWei = web3_eth_abi_1.default.decodeParameter('uint256', subData[3]);
-        const targetRatio = (0, utils_1.weiToRatioPercentage)(ratioWei);
-        return { targetRatio };
+        const market = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const baseToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const ratioState = web3_eth_abi_1.default.decodeParameter('uint8', subData[2]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(web3_eth_abi_1.default.decodeParameter('uint256', subData[3]));
+        return {
+            market, baseToken, targetRatio, ratioState,
+        };
     },
 };
 exports.compoundV3LeverageManagementOnPriceSubData = {
@@ -1418,8 +1369,9 @@ exports.fluidLeverageManagementSubData = {
         const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
         const wrapEthEncoded = web3_eth_abi_1.default.encodeParameter('bool', true);
-        const collActionType = enums_1.CollActionType.WITHDRAW;
-        const debtActionType = enums_1.DebtActionType.PAYBACK;
+        const isRepay = ratioState === enums_1.RatioState.UNDER;
+        const collActionType = isRepay ? enums_1.CollActionType.WITHDRAW : enums_1.CollActionType.SUPPLY;
+        const debtActionType = isRepay ? enums_1.DebtActionType.PAYBACK : enums_1.DebtActionType.BORROW;
         const collActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', collActionType);
         const debtActionTypeEncoded = web3_eth_abi_1.default.encodeParameter('uint8', debtActionType);
         return [

package/cjs/services/subDataService.test.js

@@ -713,74 +713,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        new decimal_js_1.default(160).mul(1e16).toString(),
-                        new decimal_js_1.default(220).mul(1e16).toString(),
-                        new decimal_js_1.default(180).mul(1e16).toString(),
-                        new decimal_js_1.default(190).mul(1e16).toString(),
-                        true, false,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Ethereum).address),
-                        160, 220, 180, 190,
-                        true, false,
-                    ]
-                ],
-                [
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        new decimal_js_1.default(160).mul(1e16).toString(),
-                        new decimal_js_1.default(210).mul(1e16).toString(),
-                        new decimal_js_1.default(180).mul(1e16).toString(),
-                        new decimal_js_1.default(190).mul(1e16).toString(),
-                        false, true,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WETH', enums_1.ChainId.Ethereum).address),
-                        160, 210, 180, 190,
-                        false, true,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    (0, chai_1.expect)(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    { targetRatio: 123 },
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
-                    ],
-                ],
-                [
-                    { targetRatio: 200 },
-                    [
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [

package/cjs/services/utils.d.ts

@@ -28,5 +28,5 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;
 };
-export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.OptimismIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;
+export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;
 export declare function getCompoundV3LeverageManagementBundleId(network: ChainId, isEOA: boolean, isBoost: boolean): number;

package/cjs/services/utils.js

@@ -189,15 +189,15 @@ function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyType) {
 }
 exports.getStopLossAndTakeProfitTypeByCloseStrategyType = getStopLossAndTakeProfitTypeByCloseStrategyType;
 function getBundleIdsByNetwork(network) {
-    switch (network) {
+    switch (Number(network)) {
+        case enums_1.ChainId.Ethereum:
+            return enums_1.Bundles.MainnetIds;
         case enums_1.ChainId.Arbitrum:
             return enums_1.Bundles.ArbitrumIds;
         case enums_1.ChainId.Base:
             return enums_1.Bundles.BaseIds;
-        case enums_1.ChainId.Optimism:
-            return enums_1.Bundles.OptimismIds;
         default:
-            return enums_1.Bundles.MainnetIds;
+            throw new Error(`Unsupported network ${network}`);
     }
 }
 exports.getBundleIdsByNetwork = getBundleIdsByNetwork;