@defisaver/automation-sdk 3.3.16-liq-prot-dev → 3.3.17-liq-prot-dev

package/esm/services/strategiesService.js

@@ -918,6 +918,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId, subHash } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -931,7 +932,7 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             repayEnabled: isEnabled,
             subId1: Number(subId),
             subHashRepay: subHash,
-            mergeWithId: Strategies.Identifiers.Boost,
+            mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
         };
     }
     else {
@@ -941,10 +942,9 @@ function parseMorphoBlueLeverageManagement(position, parseData) {
             boostEnabled: isEnabled,
             subId2: Number(subId),
             subHashBoost: subHash,
-            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;
 }
@@ -971,6 +971,7 @@ function parseMorphoBlueLiquidationProtection(position, parseData) {
 function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBluePriceTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -993,11 +994,15 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
         ratio: subData.targetRatio,
         ratioState: triggerData.priceState,
     };
+    _position.strategy.strategyId = isEOA
+        ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+        : Strategies.IdOverrides.LeverageManagementOnPrice;
     return _position;
 }
 function parseMorphoBlueCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
+    const isEOA = _position.strategy.strategyId.includes('eoa');
     const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
     const subData = subDataService.morphoBlueCloseOnPriceSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
@@ -1012,6 +1017,7 @@ function parseMorphoBlueCloseOnPrice(position, parseData) {
     ]);
     const marketId = web3.utils.keccak256(marketIdEncodedData);
     const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
     _position.specific = {
         subHash: _position.subHash,
         marketId,
@@ -1256,9 +1262,12 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
         [Strategies.Identifiers.RepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaBoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [Strategies.Identifiers.EoaRepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
         [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
         [Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
         [Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
+        [Strategies.Identifiers.EoaCloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -99,11 +99,15 @@ 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 type MorphoBlueBundleStrategy = 'repay' | 'boost' | 'repayOnPrice' | 'boostOnPrice' | 'close' | 'liquidationProtection';
+export declare function getMorphoBlueBundleId(network: ChainId, strategy: MorphoBlueBundleStrategy, isEOA: boolean): number;
 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.BaseIds)[] | (boolean | string[] | Bundles.MainnetIds | Bundles.ArbitrumIds)[];
-    liquidationProtection(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)[];
+    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): (number | boolean | string[])[];
+    liquidationProtection(marketId: string, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, triggerRatio: number, user: EthereumAddress, isEOA: boolean, network: ChainId): (number | boolean | string[])[];
     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[])[];
+    leverageManagementOnPriceGeneric(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState, isBoost: boolean, isEOA: boolean, network: ChainId): (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[])[];
+    closeOnPriceGeneric(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, stopLossPrice: number | undefined, stopLossType: CloseToAssetType | undefined, takeProfitPrice: number | undefined, takeProfitType: CloseToAssetType | undefined, isEOA: boolean, network: ChainId): (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[])[];

package/esm/services/strategySubService.js

@@ -3,7 +3,7 @@ import { STRATEGY_IDS } from '../constants';
 import { Bundles, ChainId, CloseToAssetType, RatioState, Strategies, } from '../types/enums';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
-import { compareAddresses, getBundleIdsByNetwork, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
+import { compareAddresses, getCloseStrategyType, requireAddress, requireAddresses, } from './utils';
 export const makerEncode = {
     repayFromSavings(bundleId, vaultId, triggerRepayRatio, targetRepayRatio, isBundle = true, chainId = ChainId.Ethereum, daiAddr, mcdCdpManagerAddr) {
         const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, targetRepayRatio, chainId, daiAddr, mcdCdpManagerAddr);
@@ -274,31 +274,51 @@ export const crvUSDEncode = {
         return [strategyId, isBundle, triggerData, subData];
     },
 };
+function getMorphoBlueBundlesIds(network) {
+    switch (network) {
+        case ChainId.Ethereum:
+            return Bundles.MainnetIds;
+        case ChainId.Base:
+            return Bundles.BaseIds;
+        case ChainId.Arbitrum:
+            return Bundles.ArbitrumIds;
+        default:
+            throw new Error(`Morpho Blue strategies are not supported on chain ${network}`);
+    }
+}
+export function getMorphoBlueBundleId(network, strategy, isEOA) {
+    const bundlesIds = getMorphoBlueBundlesIds(network);
+    switch (strategy) {
+        case 'repay':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
+        case 'boost':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
+        case 'repayOnPrice':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE : bundlesIds.MORPHO_BLUE_REPAY_ON_PRICE;
+        case 'boostOnPrice':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE : bundlesIds.MORPHO_BLUE_BOOST_ON_PRICE;
+        case 'close':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_CLOSE : bundlesIds.MORPHO_BLUE_CLOSE;
+        case 'liquidationProtection':
+            return isEOA ? bundlesIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundlesIds.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
+        default:
+            throw new Error(`Unknown Morpho Blue strategy: ${strategy}`);
+    }
+}
 export const morphoBlueEncode = {
     leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user, isEOA, network) {
         const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA);
         const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
         // over is boost, under is repay
         const isBoost = ratioState === RatioState.OVER;
-        let strategyOrBundleId;
-        if (network === ChainId.Base) {
-            return [isBoost ? Bundles.BaseIds.MORPHO_BLUE_BOOST : Bundles.BaseIds.MORPHO_BLUE_REPAY, true, triggerData, subData];
-        }
-        const bundlesIds = network === ChainId.Arbitrum ? Bundles.ArbitrumIds : Bundles.MainnetIds;
-        if (isBoost)
-            strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_BOOST : bundlesIds.MORPHO_BLUE_BOOST;
-        else
-            strategyOrBundleId = isEOA ? bundlesIds.MORPHO_BLUE_EOA_REPAY : bundlesIds.MORPHO_BLUE_REPAY;
+        const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boost' : 'repay', isEOA);
         const isBundle = true;
-        return [strategyOrBundleId, isBundle, triggerData, subData];
+        return [bundleId, isBundle, triggerData, subData];
     },
     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);
-        // 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);
-        const bundleId = isEOA ? bundleNetwork.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION : bundleNetwork.MORPHO_BLUE_SW_LIQUIDATION_PROTECTION;
+        const bundleId = getMorphoBlueBundleId(network, 'liquidationProtection', isEOA);
         const isBundle = true;
         return [bundleId, isBundle, triggerData, subData];
     },
@@ -307,6 +327,13 @@ export const morphoBlueEncode = {
         const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
+    leverageManagementOnPriceGeneric(loanToken, collToken, oracle, irm, lltv, user, targetRatio, price, priceState, isBoost, isEOA, network) {
+        const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user);
+        const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
+        const bundleId = getMorphoBlueBundleId(network, isBoost ? 'boostOnPrice' : 'repayOnPrice', isEOA);
+        const isBundle = true;
+        return [bundleId, isBundle, triggerData, subData];
+    },
     closeOnPrice(strategyOrBundleId, loanToken, collToken, oracle, irm, lltv, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
         const isBundle = true;
         const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
@@ -314,6 +341,14 @@ export const morphoBlueEncode = {
         const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    closeOnPriceGeneric(loanToken, collToken, oracle, irm, lltv, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL, isEOA, network) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subDataEncoded = subDataService.morphoBlueCloseOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, user, closeType);
+        const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
+        const bundleId = getMorphoBlueBundleId(network, 'close', isEOA);
+        return [bundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 export const liquityV2Encode = {
     leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {

package/esm/services/strategySubService.test.js

@@ -1229,6 +1229,75 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('leverageManagementOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_REPAY_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        200,
+                        2500,
+                        RatioState.UNDER,
+                        false,
+                        false,
+                        ChainId.Ethereum,
+                    ],
+                ],
+                [
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_BOOST_ON_PRICE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        160,
+                        4000,
+                        RatioState.OVER,
+                        true,
+                        false,
+                        ChainId.Ethereum,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBlueEncode.leverageManagementOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
         describe('closeOnPrice()', () => {
             const examples = [
                 [
@@ -1257,7 +1326,7 @@ describe('Feature: strategySubService.ts', () => {
                         1500,
                         CloseToAssetType.DEBT,
                         4000,
-                        CloseToAssetType.COLLATERAL
+                        CloseToAssetType.COLLATERAL,
                     ]
                 ],
             ];
@@ -1267,6 +1336,45 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('closeOnPriceGeneric()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                        ],
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        4000,
+                        CloseToAssetType.COLLATERAL,
+                        false,
+                        ChainId.Ethereum,
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBlueEncode.closeOnPriceGeneric(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.sparkEncode', () => {
         describe('leverageManagementOnPrice()', () => {

package/esm/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -28,4 +28,3 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;
 };
-export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;

package/esm/services/utils.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -137,15 +137,3 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyTyp
             throw new Error('CloseStrategyType not supported');
     }
 }
-export function getBundleIdsByNetwork(network) {
-    switch (Number(network)) {
-        case ChainId.Ethereum:
-            return Bundles.MainnetIds;
-        case ChainId.Arbitrum:
-            return Bundles.ArbitrumIds;
-        case ChainId.Base:
-            return Bundles.BaseIds;
-        default:
-            throw new Error(`Unsupported network ${network}`);
-    }
-}

package/esm/types/enums.d.ts

@@ -240,7 +240,10 @@ export declare namespace Bundles {
         MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 81,
         COMP_V3_SW_LIQUIDATION_PROTECTION = 82,
         COMP_V3_EOA_LIQUIDATION_PROTECTION = 83,
-        MORPHO_BLUE_REPAY_ON_PRICE = 84
+        MORPHO_BLUE_REPAY_ON_PRICE = 84,
+        MORPHO_BLUE_EOA_BOOST_ON_PRICE = 85,
+        MORPHO_BLUE_EOA_REPAY_ON_PRICE = 86,
+        MORPHO_BLUE_EOA_CLOSE = 87
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -291,7 +294,13 @@ export declare namespace Bundles {
         COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
         AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
         MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 35,
-        MORPHO_BLUE_REPAY_ON_PRICE = 36
+        MORPHO_BLUE_REPAY_ON_PRICE = 36,
+        MORPHO_BLUE_EOA_REPAY = 37,
+        MORPHO_BLUE_EOA_BOOST = 38,
+        MORPHO_BLUE_EOA_BOOST_ON_PRICE = 39,
+        MORPHO_BLUE_EOA_REPAY_ON_PRICE = 40,
+        MORPHO_BLUE_EOA_CLOSE = 41,
+        MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 42
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -330,6 +339,9 @@ export declare namespace Bundles {
         COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
         AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
         MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 35,
-        MORPHO_BLUE_REPAY_ON_PRICE = 36
+        MORPHO_BLUE_REPAY_ON_PRICE = 36,
+        MORPHO_BLUE_EOA_BOOST_ON_PRICE = 37,
+        MORPHO_BLUE_EOA_REPAY_ON_PRICE = 38,
+        MORPHO_BLUE_EOA_CLOSE = 39
     }
 }

package/esm/types/enums.js

@@ -261,6 +261,9 @@ export var Bundles;
         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[MainnetIds["MORPHO_BLUE_REPAY_ON_PRICE"] = 84] = "MORPHO_BLUE_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 85] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 86] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_EOA_CLOSE"] = 87] = "MORPHO_BLUE_EOA_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -314,6 +317,12 @@ export var Bundles;
         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[BaseIds["MORPHO_BLUE_REPAY_ON_PRICE"] = 36] = "MORPHO_BLUE_REPAY_ON_PRICE";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_REPAY"] = 37] = "MORPHO_BLUE_EOA_REPAY";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_BOOST"] = 38] = "MORPHO_BLUE_EOA_BOOST";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 39] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 40] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_CLOSE"] = 41] = "MORPHO_BLUE_EOA_CLOSE";
+        BaseIds[BaseIds["MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION"] = 42] = "MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -354,5 +363,8 @@ export var Bundles;
         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[ArbitrumIds["MORPHO_BLUE_REPAY_ON_PRICE"] = 36] = "MORPHO_BLUE_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST_ON_PRICE"] = 37] = "MORPHO_BLUE_EOA_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY_ON_PRICE"] = 38] = "MORPHO_BLUE_EOA_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_CLOSE"] = 39] = "MORPHO_BLUE_EOA_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/package.json

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

package/src/constants/index.ts

@@ -634,6 +634,21 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.MorphoBlue,
   },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -865,6 +880,11 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.LiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION,
+    strategyId: Strategies.Identifiers.EoaLiquidationProtection,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
   [Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION]: {
     strategyOrBundleId: Bundles.BaseIds.FLUID_T1_SW_LIQUIDATION_PROTECTION,
     strategyId: Strategies.Identifiers.LiquidationProtection,
@@ -875,6 +895,31 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -1064,6 +1109,21 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.EoaLiquidationProtection,
     protocol: PROTOCOLS.MorphoBlue,
   },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
+  [Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.MorphoBlue,
+  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {

package/src/services/strategiesService.ts

@@ -1214,6 +1214,7 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
 
   const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
   const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
   const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
 
@@ -1231,7 +1232,7 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
       repayEnabled: isEnabled,
       subId1: Number(subId),
       subHashRepay: subHash,
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -1240,14 +1241,12 @@ function parseMorphoBlueLeverageManagement(position: Position.Automated, parseDa
       boostEnabled: isEnabled,
       subId2: Number(subId),
       subHashBoost: subHash,
-      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;
 }
 
@@ -1283,6 +1282,7 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
   const _position = cloneDeep(position);
 
   const { subStruct } = parseData.subscriptionEventData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
   const triggerData = triggerService.morphoBluePriceTrigger.decode(subStruct.triggerData);
   const subData = subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(subStruct.subData);
 
@@ -1313,6 +1313,10 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
     ratioState: triggerData.priceState,
   };
 
+  _position.strategy.strategyId = isEOA
+    ? Strategies.IdOverrides.EoaLeverageManagementOnPrice
+    : Strategies.IdOverrides.LeverageManagementOnPrice;
+
   return _position;
 }
 
@@ -1320,6 +1324,7 @@ function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: Pa
   const _position = cloneDeep(position);
 
   const { subStruct } = parseData.subscriptionEventData;
+  const isEOA = _position.strategy.strategyId.includes('eoa');
 
   const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
   const subData = subDataService.morphoBlueCloseOnPriceSubData.decode(subStruct.subData);
@@ -1344,6 +1349,8 @@ function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: Pa
 
   const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
 
+  _position.strategy.strategyId = isEOA ? Strategies.Identifiers.EoaCloseOnPrice : Strategies.Identifiers.CloseOnPrice;
+
   _position.specific = {
     subHash: _position.subHash,
     marketId,
@@ -1633,9 +1640,12 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
     [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
     [Strategies.Identifiers.LiquidationProtection]: parseMorphoBlueLiquidationProtection,
     [Strategies.Identifiers.EoaLiquidationProtection]: parseMorphoBlueLiquidationProtection,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseMorphoBlueCloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
     [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,