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

package/esm/services/triggerService.test.js

@@ -3,7 +3,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { ChainId, OrderType, RatioState } from '../types/enums';
 import '../configuration';
-import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, } from './triggerService';
+import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, morphoBluePriceRangeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -1111,4 +1111,52 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(morphoBluePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8dA6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/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/esm/types/enums.js

@@ -227,6 +227,7 @@ export 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) {
@@ -270,6 +271,7 @@ export 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) {
@@ -301,5 +303,6 @@ export 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 || (Bundles = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.7",
+  "version": "3.3.8-lev-management-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,7 +23,7 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/sdk": "^1.3.11",
+    "@defisaver/sdk": "^1.3.15",
     "@defisaver/tokens": "^1.6.19",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",

package/src/constants/index.ts

@@ -491,6 +491,11 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     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: OptimismBundleInfo = {
@@ -683,6 +688,11 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     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: ArbitrumBundleInfo = {
@@ -826,6 +836,11 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     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: BundlesInfo = {

package/src/services/ethereumService.test.ts

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

package/src/services/strategiesService.test.ts

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

package/src/services/strategiesService.ts

@@ -990,6 +990,48 @@ function parseMorphoBlueLeverageManagementOnPrice(position: Position.Automated,
   return _position;
 }
 
+function parseMorphoBlueCloseOnPrice(position: Position.Automated, parseData: ParseData): Position.Automated {
+  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: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -1208,6 +1250,7 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.EoaRepay]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.EoaBoost]: parseMorphoBlueLeverageManagement,
     [Strategies.Identifiers.BoostOnPrice]: parseMorphoBlueLeverageManagementOnPrice,
+    [Strategies.Identifiers.CloseOnPrice]: parseMorphoBlueCloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.FluidT1]: {
     [Strategies.Identifiers.Repay]: parseFluidT1LeverageManagement,

package/src/services/strategySubService.test.ts

@@ -640,7 +640,7 @@ describe('Feature: strategySubService.ts', () => {
           [
             Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
             true,
-            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
+            ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000001'],
             [
               '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
               '0x0000000000000000000000000000000000000000000000000000000000000000',
@@ -668,7 +668,7 @@ describe('Feature: strategySubService.ts', () => {
           [
             Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
             true,
-            ['0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c5990000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
+            ['0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000002faf0800000000000000000000000000000000000000000000000000000000000000000'],
             [
               '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
               '0x0000000000000000000000000000000000000000000000000000000000000002',
@@ -1587,6 +1587,61 @@ describe('Feature: strategySubService.ts', () => {
         });
       });
     });
+
+    describe('closeOnPrice()', () => {
+      const examples: Array<[
+        [StrategyOrBundleIds, boolean, TriggerData, SubData],
+        [
+          strategyOrBundleId: number,
+          loanToken: EthereumAddress,
+          collToken: EthereumAddress,
+          oracle: EthereumAddress,
+          irm: EthereumAddress,
+          lltv: string,
+          user: EthereumAddress,
+          stopLossPrice: number,
+          stopLossType: CloseToAssetType,
+          takeProfitPrice: number,
+          takeProfitType: CloseToAssetType,
+        ]
+      ]> = [
+        [
+          [
+            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', () => {

package/src/services/strategySubService.ts

@@ -3,8 +3,11 @@ import { getAssetInfo } from '@defisaver/tokens';
 
 import type { OrderType } from '../types/enums';
 import {
-  CloseStrategyType, CloseToAssetType,
-  Bundles, ChainId, RatioState, Strategies,
+  CloseToAssetType,
+  Bundles,
+  ChainId,
+  RatioState,
+  Strategies,
 } from '../types/enums';
 import type { EthereumAddress, StrategyOrBundleIds } from '../types';
 
@@ -95,6 +98,26 @@ export const makerEncode = {
       boostEnabled,
     ];
   },
+  leverageManagementWithoutSubProxy(
+    vaultId: number,
+    triggerRatio: number,
+    targetRatio: number,
+    ratioState: RatioState,
+    isBoost: boolean,
+  ) {
+    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 = {
@@ -578,6 +601,24 @@ export const sparkEncode = {
 
     return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
   },
+  leverageManagementWithoutSubProxy(
+    strategyOrBundleId: number,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    ratioState: RatioState,
+    targetRatio: number,
+    triggerRatio: number,
+  ) {
+    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 = {
@@ -670,6 +711,27 @@ export const morphoBlueEncode = {
     const triggerData = triggerService.morphoBluePriceTrigger.encode(oracle, collToken, loanToken, price, priceState);
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  closeOnPrice(
+    strategyOrBundleId: number,
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    stopLossPrice: number = 0,
+    stopLossType: CloseToAssetType = CloseToAssetType.DEBT,
+    takeProfitPrice: number = 0,
+    takeProfitType: CloseToAssetType = 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 = {

package/src/services/subDataService.test.ts

@@ -1368,6 +1368,65 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.morphoBlueCloseOnPriceSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType],
+      ]> = [
+        [
+          [
+            '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: Array<[{ loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType }, SubData]> = [
+        [
+          {
+            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: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]]> = [
@@ -1625,7 +1684,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: number,
             marketAddr: EthereumAddress,
             targetRatio: number,
-            user: EthereumAddress
+            owner: EthereumAddress
           ]
         ]
       > = [
@@ -1692,7 +1751,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: number,
             marketAddr: EthereumAddress,
             targetRatio: number,
-            user: EthereumAddress,
+            owner: EthereumAddress,
           },
           string[]
         ]
@@ -1705,7 +1764,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: 1,
             marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
             targetRatio: 200,
-            user: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+            owner: web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
           },
           [
             '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
@@ -1725,7 +1784,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: 1,
             marketAddr: web3Utils.toChecksumAddress('0x87870Bca3F3fD6335C3F4ce8392D69d0B4161d39'),
             targetRatio: 200,
-            user: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
+            owner: web3Utils.toChecksumAddress('0x1234567890123456789012345678901234567890'),
           },
           [
             '0x0000000000000000000000002260fac5e5542a773aa44fbcfedf7c193bc2c599',
@@ -1763,7 +1822,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: number,
             closeType: CloseStrategyType,
             marketAddr: EthereumAddress,
-            user: EthereumAddress
+            owner: EthereumAddress
           ]
         ]
       > = [
@@ -1958,7 +2017,7 @@ describe('Feature: subDataService.ts', () => {
             debtAssetId: number,
             closeType: CloseStrategyType,
             marketAddr: EthereumAddress,
-            user: EthereumAddress,
+            owner: EthereumAddress,
           },
           string[]
         ]
@@ -1972,7 +2031,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',
@@ -1993,7 +2052,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',
@@ -2014,7 +2073,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',
@@ -2035,7 +2094,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',
@@ -2056,7 +2115,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',
@@ -2077,7 +2136,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',
@@ -2098,7 +2157,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',
@@ -2119,7 +2178,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',