@defisaver/automation-sdk 3.3.7-morpho-dev → 3.3.7

package/esm/services/subDataService.test.js

@@ -1264,58 +1264,6 @@ 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 = [

package/esm/services/triggerService.d.ts

@@ -275,13 +275,3 @@ 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,23 +498,3 @@ 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(),
-        };
-    },
-};

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, morphoBluePriceRangeTrigger, } 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, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -1111,52 +1111,4 @@ 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,8 +206,7 @@ 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,
-        MORPHO_BLUE_CLOSE = 58
+        SPARK_CLOSE = 57
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -248,8 +247,7 @@ 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,
-        MORPHO_BLUE_CLOSE = 28
+        AAVE_V3_EOA_CLOSE = 27
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -279,7 +277,6 @@ 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_CLOSE = 28
+        MORPHO_BLUE_EOA_BOOST = 27
     }
 }

package/esm/types/enums.js

@@ -227,7 +227,6 @@ 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) {
@@ -271,7 +270,6 @@ 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) {
@@ -303,6 +301,5 @@ 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-morpho-dev",
+  "version": "3.3.7",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -491,11 +491,6 @@ 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 = {
@@ -688,11 +683,6 @@ 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 = {
@@ -836,11 +826,6 @@ 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/strategiesService.ts

@@ -990,48 +990,6 @@ 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);
 
@@ -1250,7 +1208,6 @@ 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

@@ -1587,61 +1587,6 @@ 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

@@ -670,27 +670,6 @@ 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,65 +1368,6 @@ 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]]> = [

package/src/services/subDataService.ts

@@ -1212,43 +1212,3 @@ export const sparkCloseGenericSubData = {
     };
   },
 };
-
-export const morphoBlueCloseOnPriceSubData = {
-  encode(
-    loanToken: EthereumAddress,
-    collToken: EthereumAddress,
-    oracle: EthereumAddress,
-    irm: EthereumAddress,
-    lltv: string,
-    user: EthereumAddress,
-    closeType: CloseStrategyType,
-  ): SubData {
-    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: SubData) {
-    const loanToken = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collToken = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
-    const oracle = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
-    const irm = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
-    const lltv = AbiCoder.decodeParameter('uint256', subData[4]) as any as EthereumAddress;
-    const user = AbiCoder.decodeParameter('address', subData[5]) as any as EthereumAddress;
-    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6])) as CloseStrategyType;
-
-    return {
-      loanToken,
-      collToken,
-      oracle,
-      irm,
-      lltv,
-      user,
-      closeType,
-    };
-  },
-};

package/src/services/triggerService.test.ts

@@ -31,7 +31,6 @@ import {
   crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger,
   compoundV3PriceRangeTrigger,
   aaveV3QuotePriceRangeTrigger,
-  morphoBluePriceRangeTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -1231,56 +1230,4 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
-
-  describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
-    describe('encode()', () => {
-      const examples: Array<[[string], [oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: number, upperPrice: number]]> = [
-        [
-          ['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: Array<[{ oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: string, upperPrice: string }, TriggerData]> = [
-        [
-          {
-            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/src/services/triggerService.ts

@@ -688,36 +688,4 @@ export const sparkQuotePriceRangeTrigger = {
       upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
     };
   },
-};
-
-export const morphoBluePriceRangeTrigger = {
-  encode(
-    oracle: EthereumAddress,
-    collateralToken: EthereumAddress,
-    loanToken: EthereumAddress,
-    lowerPrice: number,
-    upperPrice: number,
-  ) {
-    // 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: TriggerData,
-  ) {
-    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], triggerData[0]);
-    return {
-      oracle: decodedData[0] as EthereumAddress,
-      collateralToken: decodedData[1] as EthereumAddress,
-      loanToken: decodedData[2] as EthereumAddress,
-      lowerPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
-      upperPrice: new Dec(decodedData[4] as string).div(1e8).toString(),
-    };
-  },
 };

package/src/types/enums.ts

@@ -222,7 +222,6 @@ export namespace Bundles {
     AAVE_V3_EOA_BOOST_ON_PRICE = 55,
     AAVE_V3_EOA_CLOSE = 56,
     SPARK_CLOSE = 57,
-    MORPHO_BLUE_CLOSE = 58,
   }
 
   export enum OptimismIds {
@@ -266,7 +265,6 @@ export namespace Bundles {
     AAVE_V3_EOA_REPAY_ON_PRICE = 25,
     AAVE_V3_EOA_BOOST_ON_PRICE = 26,
     AAVE_V3_EOA_CLOSE = 27,
-    MORPHO_BLUE_CLOSE = 28,
   }
 
   export enum ArbitrumIds {
@@ -298,7 +296,6 @@ export namespace Bundles {
     MORPHO_BLUE_BOOST_ON_PRICE = 25,
     MORPHO_BLUE_EOA_REPAY = 26,
     MORPHO_BLUE_EOA_BOOST = 27,
-    MORPHO_BLUE_CLOSE = 28,
   }
 }