@defisaver/automation-sdk 3.3.7 → 3.3.8-lev-management-dev

package/cjs/types/enums.d.ts

@@ -206,7 +206,8 @@ export declare namespace Bundles {
         AAVE_V3_EOA_REPAY_ON_PRICE = 54,
         AAVE_V3_EOA_BOOST_ON_PRICE = 55,
         AAVE_V3_EOA_CLOSE = 56,
-        SPARK_CLOSE = 57
+        SPARK_CLOSE = 57,
+        MORPHO_BLUE_CLOSE = 58
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -247,7 +248,8 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST = 24,
         AAVE_V3_EOA_REPAY_ON_PRICE = 25,
         AAVE_V3_EOA_BOOST_ON_PRICE = 26,
-        AAVE_V3_EOA_CLOSE = 27
+        AAVE_V3_EOA_CLOSE = 27,
+        MORPHO_BLUE_CLOSE = 28
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -277,6 +279,7 @@ export declare namespace Bundles {
         MORPHO_BLUE_BOOST = 24,
         MORPHO_BLUE_BOOST_ON_PRICE = 25,
         MORPHO_BLUE_EOA_REPAY = 26,
-        MORPHO_BLUE_EOA_BOOST = 27
+        MORPHO_BLUE_EOA_BOOST = 27,
+        MORPHO_BLUE_CLOSE = 28
     }
 }

package/cjs/types/enums.js

@@ -230,6 +230,7 @@ var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
         MainnetIds[MainnetIds["SPARK_CLOSE"] = 57] = "SPARK_CLOSE";
+        MainnetIds[MainnetIds["MORPHO_BLUE_CLOSE"] = 58] = "MORPHO_BLUE_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -273,6 +274,7 @@ var Bundles;
         BaseIds[BaseIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 25] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         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 = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -304,5 +306,6 @@ var Bundles;
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_BOOST_ON_PRICE"] = 25] = "MORPHO_BLUE_BOOST_ON_PRICE";
         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 = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles = exports.Bundles || (exports.Bundles = {}));

package/esm/constants/index.js

@@ -462,6 +462,11 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.CloseOnPrice,
         protocol: PROTOCOLS.Spark,
     },
+    [Bundles.MainnetIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+        strategyId: Strategies.Identifiers.CloseOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {
@@ -651,6 +656,11 @@ export const BASE_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.BaseIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: Bundles.BaseIds.MORPHO_BLUE_CLOSE,
+        strategyId: Strategies.Identifiers.CloseOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
+    },
 };
 export const ARBITRUM_BUNDLES_INFO = {
     [Bundles.ArbitrumIds.AAVE_V3_REPAY]: {
@@ -793,6 +803,11 @@ export const ARBITRUM_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaBoost,
         protocol: PROTOCOLS.MorphoBlue,
     },
+    [Bundles.ArbitrumIds.MORPHO_BLUE_CLOSE]: {
+        strategyOrBundleId: Bundles.ArbitrumIds.MORPHO_BLUE_CLOSE,
+        strategyId: Strategies.Identifiers.CloseOnPrice,
+        protocol: PROTOCOLS.MorphoBlue,
+    },
 };
 export const BUNDLES_INFO = {
     [ChainId.Ethereum]: MAINNET_BUNDLES_INFO,

package/esm/services/ethereumService.test.js

@@ -96,6 +96,7 @@ describe('Feature: ethereumService.ts', () => {
                         'address': '0x5f98805A4E8be255a32880FDeC7F6728C6568bA0',
                         'blockHash': '0xb92cab2569456dbfbdb853d2c67d72c9a7580543dbcb55d483a77322b40755a4',
                         'blockNumber': 15166163,
+                        'blockTimestamp': '0x62d53ad8',
                         'event': 'Transfer',
                         'id': 'log_e2258e3a',
                         'logIndex': 385,

package/esm/services/strategiesService.js

@@ -741,6 +741,35 @@ function parseMorphoBlueLeverageManagementOnPrice(position, parseData) {
     };
     return _position;
 }
+function parseMorphoBlueCloseOnPrice(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct } = parseData.subscriptionEventData;
+    const triggerData = triggerService.morphoBluePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.morphoBlueCloseOnPriceSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, Math.random());
+    const marketIdEncodedData = web3.eth.abi.encodeParameters(['address', 'address', 'address', 'address', 'uint256'], [
+        subData.loanToken,
+        subData.collToken,
+        subData.oracle,
+        subData.irm,
+        subData.lltv,
+    ]);
+    const marketId = web3.utils.keccak256(marketIdEncodedData);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
+    _position.specific = {
+        subHash: _position.subHash,
+        marketId,
+        collAsset: subData.collToken,
+        debtAsset: subData.loanToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
+    };
+    return _position;
+}
 function parseLiquityV2CloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
@@ -928,6 +957,7 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
         [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
         [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
         [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/esm/services/strategiesService.test.js

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

package/esm/services/strategySubService.d.ts

@@ -6,6 +6,7 @@ export declare const makerEncode: {
     closeOnPrice(vaultId: number, ratioState: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     trailingStop(vaultId: number, triggerPercentage: number, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, roundId: number, chainId?: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
     leverageManagement(vaultId: number, triggerRepayRatio: string, triggerBoostRatio: string, targetBoostRatio: string, targetRepayRatio: string, boostEnabled: boolean): (string | number | boolean)[];
+    leverageManagementWithoutSubProxy(vaultId: number, triggerRatio: number, targetRatio: number, ratioState: RatioState, isBoost: boolean): (boolean | string[] | Bundles.MainnetIds)[];
 };
 export declare const liquityEncode: {
     closeOnPrice(priceOverOrUnder: RatioState, price: string, closeToAssetAddr: EthereumAddress, chainlinkCollAddress: EthereumAddress, chainId?: ChainId, collAddr?: EthereumAddress, debtAddr?: EthereumAddress): (boolean | string[] | Strategies.MainnetIds)[];
@@ -86,6 +87,7 @@ export declare const exchangeEncode: {
 export declare const sparkEncode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
     closeOnPriceGeneric(strategyOrBundleId: number, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
+    leverageManagementWithoutSubProxy(strategyOrBundleId: number, market: EthereumAddress, user: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number): (number | boolean | string[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
@@ -94,6 +96,7 @@ export declare const crvUSDEncode: {
 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)[];
     leverageManagementOnPrice(strategyOrBundleId: number, isBundle: boolean | undefined, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, targetRatio: number, price: number, priceState: RatioState): (number | boolean | string[])[];
+    closeOnPrice(strategyOrBundleId: number, loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, stopLossPrice?: number, stopLossType?: CloseToAssetType, takeProfitPrice?: number, takeProfitType?: CloseToAssetType): (number | boolean | string[])[];
 };
 export declare const liquityV2Encode: {
     leverageManagement(market: EthereumAddress, troveId: string, collToken: EthereumAddress, boldToken: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, strategyOrBundleId: number): (number | boolean | string[])[];

package/esm/services/strategySubService.js

@@ -41,6 +41,17 @@ export const makerEncode = {
             boostEnabled,
         ];
     },
+    leverageManagementWithoutSubProxy(vaultId, triggerRatio, targetRatio, ratioState, isBoost) {
+        const bundleId = isBoost ? Bundles.MainnetIds.MAKER_BOOST : Bundles.MainnetIds.MAKER_REPAY;
+        const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRatio, ratioState);
+        const subData = subDataService.makerLeverageManagementWithoutSubProxy.encode(vaultId, targetRatio, ratioState);
+        return [
+            bundleId,
+            true,
+            triggerData,
+            subData,
+        ];
+    },
 };
 export const liquityEncode = {
     closeOnPrice(priceOverOrUnder, price, closeToAssetAddr, chainlinkCollAddress, chainId = ChainId.Ethereum, collAddr, debtAddr) {
@@ -239,6 +250,12 @@ export const sparkEncode = {
         const triggerDataEncoded = triggerService.sparkQuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
+    leverageManagementWithoutSubProxy(strategyOrBundleId, market, user, ratioState, targetRatio, triggerRatio) {
+        const isBundle = true;
+        const subData = subDataService.sparkLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
+        const triggerData = triggerService.sparkRatioTrigger.encode(user, market, triggerRatio, ratioState);
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
 };
 export const crvUSDEncode = {
     leverageManagement(owner, controllerAddr, ratioState, targetRatio, triggerRatio, collTokenAddr, crvUSDAddr) {
@@ -280,6 +297,13 @@ export const morphoBlueEncode = {
         const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
         return [strategyOrBundleId, 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);
+        const subDataEncoded = subDataService.morphoBlueCloseOnPriceSubData.encode(loanToken, collToken, oracle, irm, lltv, user, closeType);
+        const triggerDataEncoded = triggerService.morphoBluePriceRangeTrigger.encode(oracle, collToken, loanToken, stopLossPrice, takeProfitPrice);
+        return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
+    },
 };
 export const liquityV2Encode = {
     leverageManagement(market, troveId, collToken, boldToken, ratioState, targetRatio, triggerRatio, strategyOrBundleId) {

package/esm/services/strategySubService.test.js

@@ -472,7 +472,7 @@ describe('Feature: strategySubService.ts', () => {
                     [
                         Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
                         true,
-                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
+                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
                         [
                             '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
                             '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -500,7 +500,7 @@ describe('Feature: strategySubService.ts', () => {
                     [
                         Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
                         true,
-                        ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
+                        ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
                         [
                             '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
                             '0x0000000000000000000000000000000000000000000000000000000000000002',
@@ -1336,6 +1336,44 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('closeOnPrice()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        4000,
+                        CloseToAssetType.COLLATERAL
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBlueEncode.closeOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.compoundV3L2Encode', () => {
         describe('leverageManagement()', () => {

package/esm/services/subDataService.d.ts

@@ -28,6 +28,13 @@ export declare const makerLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const makerLeverageManagementWithoutSubProxy: {
+    encode(cdpId: number, targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const liquityLeverageManagementSubData: {
     decode: (subData: string[]) => {
         targetRatio: number;
@@ -166,6 +173,13 @@ export declare const sparkLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const liquityDsrPaybackSubData: {
     encode: (targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -318,3 +332,15 @@ export declare const sparkCloseGenericSubData: {
         owner: EthereumAddress;
     };
 };
+export declare const morphoBlueCloseOnPriceSubData: {
+    encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        closeType: CloseStrategyType;
+    };
+};

package/esm/services/subDataService.js

@@ -70,6 +70,19 @@ export const makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
+export const makerLeverageManagementWithoutSubProxy = {
+    encode(cdpId, targetRatio, ratioState) {
+        const encodedCdpId = AbiCoder.encodeParameter('uint256', cdpId);
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        return [encodedTargetRatio, encodedRatioState, encodedCdpId];
+    },
+    decode(subData) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 export const liquityLeverageManagementSubData = {
     decode: (subData) => {
         const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]);
@@ -411,6 +424,20 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const sparkLeverageManagementSubDataWithoutSubProxy = {
+    encode(targetRatio, ratioState) {
+        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+        const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
+        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
+        return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
+    },
+    decode(subData) {
+        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
+        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
+        return { targetRatio, ratioState };
+    },
+};
 export const liquityDsrPaybackSubData = {
     encode: (targetRatio) => {
         const daiAddress = getAssetInfo('DAI').address;
@@ -852,3 +879,33 @@ export const sparkCloseGenericSubData = {
         };
     },
 };
+export const morphoBlueCloseOnPriceSubData = {
+    encode(loanToken, collToken, oracle, irm, lltv, user, closeType) {
+        const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
+        const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+        const oracleEncoded = AbiCoder.encodeParameter('address', oracle);
+        const irmEncoded = AbiCoder.encodeParameter('address', irm);
+        const lltvEncoded = AbiCoder.encodeParameter('uint256', lltv);
+        const userEncoded = AbiCoder.encodeParameter('address', user);
+        const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, userEncoded, closeTypeEncoded];
+    },
+    decode(subData) {
+        const loanToken = AbiCoder.decodeParameter('address', subData[0]);
+        const collToken = AbiCoder.decodeParameter('address', subData[1]);
+        const oracle = AbiCoder.decodeParameter('address', subData[2]);
+        const irm = AbiCoder.decodeParameter('address', subData[3]);
+        const lltv = AbiCoder.decodeParameter('uint256', subData[4]);
+        const user = AbiCoder.decodeParameter('address', subData[5]);
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6]));
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            closeType,
+        };
+    },
+};

package/esm/services/subDataService.test.js

@@ -1264,6 +1264,58 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.morphoBlueCloseOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'), '945000000000000000', web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1557,7 +1609,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
                         targetRatio: 200,
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1577,7 +1629,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
                         targetRatio: 200,
-                        user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
                     },
                     [
                         '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
@@ -1786,7 +1838,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1807,7 +1859,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.STOP_LOSS_IN_COLLATERAL,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1828,7 +1880,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_IN_DEBT,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1849,7 +1901,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.STOP_LOSS_IN_DEBT,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1870,7 +1922,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_COLLATERAL,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+                        owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
                     },
                     [
                         '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1891,7 +1943,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_IN_COLLATERAL_AND_STOP_LOSS_IN_DEBT,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
@@ -1912,7 +1964,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
@@ -1933,7 +1985,7 @@ describe('Feature: subDataService.ts', () => {
                         debtAssetId: 1,
                         closeType: CloseStrategyType.TAKE_PROFIT_IN_DEBT_AND_STOP_LOSS_IN_COLLATERAL,
                         marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
-                        user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
                     },
                     [
                         '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',

package/esm/services/triggerService.d.ts

@@ -275,3 +275,13 @@ export declare const sparkQuotePriceRangeTrigger: {
         upperPrice: string;
     };
 };
+export declare const morphoBluePriceRangeTrigger: {
+    encode(oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        oracle: string;
+        collateralToken: string;
+        loanToken: string;
+        lowerPrice: string;
+        upperPrice: string;
+    };
+};

package/esm/services/triggerService.js

@@ -498,3 +498,23 @@ export const sparkQuotePriceRangeTrigger = {
         };
     },
 };
+export const morphoBluePriceRangeTrigger = {
+    encode(oracle, collateralToken, loanToken, lowerPrice, upperPrice) {
+        // Price is scaled to 1e8
+        const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+        return [
+            AbiCoder.encodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], [oracle, collateralToken, loanToken, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            oracle: decodedData[0],
+            collateralToken: decodedData[1],
+            loanToken: decodedData[2],
+            lowerPrice: new Dec(decodedData[3]).div(1e8).toString(),
+            upperPrice: new Dec(decodedData[4]).div(1e8).toString(),
+        };
+    },
+};