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

package/esm/services/subDataService.test.js

@@ -685,74 +685,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        new Dec(160).mul(1e16).toString(),
-                        new Dec(220).mul(1e16).toString(),
-                        new Dec(180).mul(1e16).toString(),
-                        new Dec(190).mul(1e16).toString(),
-                        true, false,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
-                        160, 220, 180, 190,
-                        true, false,
-                    ]
-                ],
-                [
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        new Dec(160).mul(1e16).toString(),
-                        new Dec(210).mul(1e16).toString(),
-                        new Dec(180).mul(1e16).toString(),
-                        new Dec(190).mul(1e16).toString(),
-                        false, true,
-                    ],
-                    [
-                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        160, 210, 180, 190,
-                        false, true,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    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)}`, () => {
-                    expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/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/esm/services/utils.js

@@ -138,15 +138,15 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyTyp
     }
 }
 export function getBundleIdsByNetwork(network) {
-    switch (network) {
+    switch (Number(network)) {
+        case ChainId.Ethereum:
+            return Bundles.MainnetIds;
         case ChainId.Arbitrum:
             return Bundles.ArbitrumIds;
         case ChainId.Base:
             return Bundles.BaseIds;
-        case ChainId.Optimism:
-            return Bundles.OptimismIds;
         default:
-            return Bundles.MainnetIds;
+            throw new Error(`Unsupported network ${network}`);
     }
 }
 // Mainnet uses the V2 bundle ids; L2s use the original bundle ids.

package/esm/types/enums.d.ts

@@ -140,7 +140,7 @@ export declare namespace Strategies {
         CollateralSwitch = "collateral-switch",
         EoaCollateralSwitch = "eoa-collateral-switch",
         LiquidationProtection = "liquidation-protection",
-        EoaLiquidationProtection = "eoa-liquidation-protection"
+        EoaLiquidationProtection = "liquidation-protection-eoa"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -229,14 +229,17 @@ export declare namespace Bundles {
         AAVE_V4_EOA_REPAY_ON_PRICE = 68,
         AAVE_V4_EOA_BOOST_ON_PRICE = 69,
         AAVE_V4_EOA_CLOSE = 70,
-        AAVE_V3_LIQUIDATION_PROTECTION = 71,
-        SPARK_LIQUIDATION_PROTECTION = 72,
-        COMP_V3_SW_LIQUIDATION_PROTECTION = 73,
-        COMP_V3_EOA_LIQUIDATION_PROTECTION = 74,
-        MAKER_LIQUIDATION_PROTECTION = 75,
-        FLUID_T1_LIQUIDATION_PROTECTION = 76,
-        AAVE_V4_LIQUIDATION_PROTECTION = 77,
-        MORPHO_BLUE_LIQUIDATION_PROTECTION = 78
+        AAVE_V3_SW_LIQUIDATION_PROTECTION = 71,
+        SPARK_SW_LIQUIDATION_PROTECTION = 72,
+        MAKER_SW_LIQUIDATION_PROTECTION = 75,
+        FLUID_T1_SW_LIQUIDATION_PROTECTION = 76,
+        AAVE_V4_SW_LIQUIDATION_PROTECTION = 77,
+        MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 78,
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 79,
+        AAVE_V4_EOA_LIQUIDATION_PROTECTION = 80,
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 81,
+        COMP_V3_SW_LIQUIDATION_PROTECTION = 82,
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 83
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -250,7 +253,8 @@ export declare namespace Bundles {
         AAVE_V3_EOA_REPAY_ON_PRICE = 8,
         AAVE_V3_EOA_BOOST_ON_PRICE = 9,
         AAVE_V3_EOA_CLOSE = 10,
-        AAVE_V3_LIQUIDATION_PROTECTION = 11
+        AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -280,11 +284,12 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST_ON_PRICE = 26,
         AAVE_V3_EOA_CLOSE = 27,
         MORPHO_BLUE_CLOSE = 28,
-        AAVE_V3_LIQUIDATION_PROTECTION = 29,
-        FLUID_T1_LIQUIDATION_PROTECTION = 30,
-        MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+        AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
+        FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
         COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
-        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
+        MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 35
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -316,10 +321,12 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_REPAY = 26,
         MORPHO_BLUE_EOA_BOOST = 27,
         MORPHO_BLUE_CLOSE = 28,
-        AAVE_V3_LIQUIDATION_PROTECTION = 29,
-        FLUID_T1_LIQUIDATION_PROTECTION = 30,
-        MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+        AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
+        FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
+        MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 31,
         COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
-        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
+        AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 35
     }
 }

package/esm/types/enums.js

@@ -157,7 +157,7 @@ export var Strategies;
         Identifiers["CollateralSwitch"] = "collateral-switch";
         Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
         Identifiers["LiquidationProtection"] = "liquidation-protection";
-        Identifiers["EoaLiquidationProtection"] = "eoa-liquidation-protection";
+        Identifiers["EoaLiquidationProtection"] = "liquidation-protection-eoa";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -249,14 +249,17 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY_ON_PRICE"] = 68] = "AAVE_V4_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST_ON_PRICE"] = 69] = "AAVE_V4_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V4_EOA_CLOSE"] = 70] = "AAVE_V4_EOA_CLOSE";
-        MainnetIds[MainnetIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 71] = "AAVE_V3_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["SPARK_LIQUIDATION_PROTECTION"] = 72] = "SPARK_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 73] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 74] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["MAKER_LIQUIDATION_PROTECTION"] = 75] = "MAKER_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 76] = "FLUID_T1_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["AAVE_V4_LIQUIDATION_PROTECTION"] = 77] = "AAVE_V4_LIQUIDATION_PROTECTION";
-        MainnetIds[MainnetIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 78] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 71] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["SPARK_SW_LIQUIDATION_PROTECTION"] = 72] = "SPARK_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["MAKER_SW_LIQUIDATION_PROTECTION"] = 75] = "MAKER_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["FLUID_T1_SW_LIQUIDATION_PROTECTION"] = 76] = "FLUID_T1_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V4_SW_LIQUIDATION_PROTECTION"] = 77] = "AAVE_V4_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["MORPHO_BLUE_SW_LIQUIDATION_PROTECTION"] = 78] = "MORPHO_BLUE_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 79] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V4_EOA_LIQUIDATION_PROTECTION"] = 80] = "AAVE_V4_EOA_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION"] = 81] = "MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 82] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 83] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -271,7 +274,8 @@ export var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 8] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 9] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
-        OptimismIds[OptimismIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 11] = "AAVE_V3_LIQUIDATION_PROTECTION";
+        OptimismIds[OptimismIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 11] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 12] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -302,11 +306,12 @@ export var Bundles;
         BaseIds[BaseIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 26] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         BaseIds[BaseIds["AAVE_V3_EOA_CLOSE"] = 27] = "AAVE_V3_EOA_CLOSE";
         BaseIds[BaseIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
-        BaseIds[BaseIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_LIQUIDATION_PROTECTION";
-        BaseIds[BaseIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_LIQUIDATION_PROTECTION";
-        BaseIds[BaseIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 31] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["FLUID_T1_SW_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_SW_LIQUIDATION_PROTECTION";
         BaseIds[BaseIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 32] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
         BaseIds[BaseIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 33] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 34] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["MORPHO_BLUE_SW_LIQUIDATION_PROTECTION"] = 35] = "MORPHO_BLUE_SW_LIQUIDATION_PROTECTION";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -339,10 +344,12 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY"] = 26] = "MORPHO_BLUE_EOA_REPAY";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST"] = 27] = "MORPHO_BLUE_EOA_BOOST";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
-        ArbitrumIds[ArbitrumIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_LIQUIDATION_PROTECTION";
-        ArbitrumIds[ArbitrumIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_LIQUIDATION_PROTECTION";
-        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 31] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_SW_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_SW_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["FLUID_T1_SW_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_SW_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_SW_LIQUIDATION_PROTECTION"] = 31] = "MORPHO_BLUE_SW_LIQUIDATION_PROTECTION";
         ArbitrumIds[ArbitrumIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 32] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 33] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_LIQUIDATION_PROTECTION"] = 34] = "AAVE_V3_EOA_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION"] = 35] = "MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.15-liq-prot-dev",
+  "version": "3.3.15-liq-prot-2-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -573,23 +573,23 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV4,
   },
-  [Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MakerDAO,
   },
-  [Bundles.MainnetIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
-  [Bundles.MainnetIds.AAVE_V4_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.AaveV4,
   },
-  [Bundles.MainnetIds.SPARK_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.SPARK_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.SPARK_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.Spark,
   },
@@ -600,19 +600,35 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
   },
   [Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
     strategyOrBundleId: Bundles.MainnetIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-    strategyId: Strategies.Identifiers.LiquidationProtection,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.CompoundV3,
   },
-  [Bundles.MainnetIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId:
+      Bundles.MainnetIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.MainnetIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.MainnetIds.FLUID_T1_LIQUIDATION_PROTECTION,
+  [Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.FluidT1,
   },
+  [Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V4_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV4,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -671,12 +687,16 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
-  [Bundles.OptimismIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_LIQUIDATION_PROTECTION,
+  [Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
-
+  [Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const BASE_BUNDLES_INFO: BaseBundleInfo = {
@@ -815,8 +835,8 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.CloseOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.BaseIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_LIQUIDATION_PROTECTION,
+  [Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
@@ -827,20 +847,24 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
   },
   [Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
     strategyOrBundleId: Bundles.BaseIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-    strategyId: Strategies.Identifiers.LiquidationProtection,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.CompoundV3,
   },
-  [Bundles.BaseIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+  [Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.BaseIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.BaseIds.FLUID_T1_LIQUIDATION_PROTECTION,
+  [Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.FluidT1,
   },
-
+  [Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -989,8 +1013,8 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.CloseOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.ArbitrumIds.AAVE_V3_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_LIQUIDATION_PROTECTION,
+  [Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
@@ -1001,19 +1025,30 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
   },
   [Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION]: {
     strategyOrBundleId: Bundles.ArbitrumIds.COMP_V3_EOA_LIQUIDATION_PROTECTION,
-    strategyId: Strategies.Identifiers.LiquidationProtection,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.CompoundV3,
   },
-  [Bundles.ArbitrumIds.MORPHO_BLUE_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_LIQUIDATION_PROTECTION,
+  [Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId:
+      Bundles.ArbitrumIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
-  [Bundles.ArbitrumIds.FLUID_T1_LIQUIDATION_PROTECTION]: {
-    strategyOrBundleId: Bundles.ArbitrumIds.FLUID_T1_LIQUIDATION_PROTECTION,
+  [Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.FluidT1,
   },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {

package/src/services/strategiesService.ts

@@ -158,11 +158,10 @@ function parseMakerLiquidationProtection(position: Position.Automated, parseData
   _position.specific = {
     triggerRepayRatio: triggerData.ratio,
     targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled, // TODO -> Not sure if should hardcode to TRUE
+    repayEnabled: isEnabled,
     subId1: Number(subId),
   };
 
-  // TODO -> Is this ok?
   _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
 
   return _position;
@@ -315,7 +314,6 @@ function parseAaveV3LiquidationProtection(position: Position.Automated, parseDat
   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);
 
@@ -332,8 +330,8 @@ function parseAaveV3LiquidationProtection(position: Position.Automated, parseDat
     subHashRepay: subHash,
   };
 
-  // TODO -> Should split for EOA or not? Prob not as they will use same encoding and decoding
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
 
   return _position;
 }
@@ -501,13 +499,12 @@ function parseAaveV4LiquidationProtection(position: Position.Automated, parseDat
   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 = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.spoke);
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
 
   _position.specific = {
     triggerRepayRatio: triggerData.ratio,
@@ -761,7 +758,7 @@ function parseCompoundV3LiquidationProtection(position: Position.Automated, pars
   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);
@@ -771,14 +768,12 @@ function parseCompoundV3LiquidationProtection(position: Position.Automated, pars
 
   _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 as Strategies.Identifiers);
-
   const isEOA = _position.strategy.strategyId.includes('eoa');
 
   _position.specific = {
     triggerRepayRatio: triggerData.ratio,
     targetRepayRatio: subData.targetRatio,
-    repayEnabled: isEnabled, // TODO -> Should be hardcoded to true?
+    repayEnabled: isEnabled,
     subId1: Number(subId),
     subHashRepay: subHash,
   };
@@ -1279,8 +1274,7 @@ function parseMorphoBlueLiquidationProtection(position: Position.Automated, pars
   };
 
   const isEOA = _position.strategy.strategyId.includes('eoa');
-  // TODO -> Should be separate for EOA ?
-  _position.strategy.strategyId = Strategies.IdOverrides.LiquidationProtection;
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLiquidationProtection : Strategies.IdOverrides.LiquidationProtection;
 
   return _position;
 }
@@ -1571,6 +1565,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV3CollateralSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseAaveV3LiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV3LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV4]: {
     [Strategies.Identifiers.Repay]: parseAaveV4LeverageManagement,
@@ -1586,6 +1581,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CollateralSwitch]: parseAaveV4CollateralSwitch,
     [Strategies.Identifiers.EoaCollateralSwitch]: parseAaveV4CollateralSwitch,
     [Strategies.Identifiers.LiquidationProtection]: parseAaveV4LiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseAaveV4LiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
@@ -1602,7 +1598,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoostOnPrice]: parseCompoundV3LeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseCompoundV3CloseOnPrice,
     [Strategies.Identifiers.EoaCloseOnPrice]: parseCompoundV3CloseOnPrice,
-    // TODO -> here should prob separate EOA from SW
     [Strategies.Identifiers.LiquidationProtection]: parseCompoundV3LiquidationProtection,
     [Strategies.Identifiers.EoaLiquidationProtection]: parseCompoundV3LiquidationProtection,
   },
@@ -1639,6 +1634,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
     [Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
+    [Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
   },
   [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
     [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/src/services/strategySubService.ts

@@ -114,7 +114,7 @@ export const makerEncode = {
     ratioState: RatioState,
     daiAddr?: EthereumAddress,
   ) {
-    const bundleId = Bundles.MainnetIds.MAKER_LIQUIDATION_PROTECTION;
+    const bundleId = Bundles.MainnetIds.MAKER_SW_LIQUIDATION_PROTECTION;
 
     const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
     const subData = subDataService.makerLiquidationProtectionSubData.encode(vaultId, targetRatio, daiAddr);
@@ -487,17 +487,21 @@ export const compoundV3Encode = {
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
 
-  liquidationProtection(
+  liquidationProtectionWithoutSubProxy(
+    strategyOrBundleId: number,
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
   ) {
-    return subDataService.compoundV3LiquidationProtectionSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+    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(
@@ -785,8 +789,11 @@ export const morphoBlueEncode = {
 
     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 = (getBundleIdsByNetwork(network) as typeof Bundles.MainnetIds).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 = getBundleIdsByNetwork(network) as typeof Bundles.MainnetIds;
+    const bundleId = isEOA ? bundleNetwork.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundleNetwork.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
     const isBundle = true;
 
     return [bundleId, isBundle, triggerData, subData];