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

package/cjs/services/triggerService.d.ts

@@ -153,15 +153,6 @@ export declare const sparkRatioTrigger: {
         ratioState: number;
     };
 };
-export declare const sparkQuotePriceTrigger: {
-    encode(baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState): string[];
-    decode(triggerData: string[]): {
-        baseTokenAddress: EthereumAddress;
-        quoteTokenAddress: EthereumAddress;
-        price: string;
-        ratioState: RatioState;
-    };
-};
 export declare const curveUsdBorrowRateTrigger: {
     encode(market: EthereumAddress, targetRate: string, rateState: RatioState): string[];
     decode(triggerData: string[]): {
@@ -275,3 +266,22 @@ export declare const aaveV3QuotePriceRangeTrigger: {
         upperPrice: string;
     };
 };
+export declare const sparkQuotePriceRangeTrigger: {
+    encode(collToken: EthereumAddress, debtToken: EthereumAddress, lowerPrice: number, upperPrice: number): string[];
+    decode(triggerData: string[]): {
+        collToken: string;
+        debtToken: string;
+        lowerPrice: string;
+        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/cjs/services/triggerService.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aaveV3QuotePriceRangeTrigger = exports.compoundV3PriceRangeTrigger = exports.compoundV3PriceTrigger = exports.fluidRatioTrigger = exports.morphoBluePriceTrigger = exports.closePriceTrigger = exports.liquityV2QuotePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityV2AdjustTimeTrigger = exports.liquityV2DebtInFrontTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
+exports.morphoBluePriceRangeTrigger = exports.sparkQuotePriceRangeTrigger = exports.aaveV3QuotePriceRangeTrigger = exports.compoundV3PriceRangeTrigger = exports.compoundV3PriceTrigger = exports.fluidRatioTrigger = exports.morphoBluePriceTrigger = exports.closePriceTrigger = exports.liquityV2QuotePriceTrigger = exports.liquityV2RatioTrigger = exports.morphoBlueRatioTrigger = exports.crvUsdHealthRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = exports.liquityV2AdjustTimeTrigger = exports.liquityV2DebtInFrontTrigger = exports.liquityDebtInFrontWithLimitTrigger = exports.liquityDebtInFrontTrigger = exports.liquityRatioTrigger = exports.compoundV2RatioTrigger = exports.aaveV3QuotePriceWithMaximumGasPriceTrigger = exports.aaveV3QuotePriceTrigger = exports.morphoAaveV2RatioTrigger = exports.aaveV3RatioTrigger = exports.makerRatioTrigger = exports.trailingStopTrigger = exports.chainlinkPriceTrigger = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
@@ -290,24 +290,6 @@ exports.sparkRatioTrigger = {
         };
     },
 };
-exports.sparkQuotePriceTrigger = {
-    encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
-        // Price is always in 8 decimals
-        const _price = new decimal_js_1.default(price.toString()).mul(Math.pow(10, 8)).floor().toString();
-        return [web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
-    },
-    decode(triggerData) {
-        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
-        // Price is always in 8 decimals
-        const price = new decimal_js_1.default(decodedData[2]).div(Math.pow(10, 8)).toDP(8).toString();
-        return {
-            price,
-            baseTokenAddress: decodedData[0],
-            quoteTokenAddress: decodedData[1],
-            ratioState: +decodedData[3],
-        };
-    },
-};
 exports.curveUsdBorrowRateTrigger = {
     encode(market, targetRate, rateState) {
         // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
@@ -526,3 +508,42 @@ exports.aaveV3QuotePriceRangeTrigger = {
         };
     },
 };
+exports.sparkQuotePriceRangeTrigger = {
+    encode(collToken, debtToken, lowerPrice, upperPrice) {
+        // Price is scaled to 1e8
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'address', 'uint256', 'uint256'], [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            collToken: decodedData[0],
+            debtToken: decodedData[1],
+            lowerPrice: new decimal_js_1.default(decodedData[2]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[3]).div(1e8).toString(),
+        };
+    },
+};
+exports.morphoBluePriceRangeTrigger = {
+    encode(oracle, collateralToken, loanToken, lowerPrice, upperPrice) {
+        // Price is scaled to 1e8
+        const lowerPriceFormatted = new decimal_js_1.default(lowerPrice).mul(1e8).floor().toString();
+        const upperPriceFormatted = new decimal_js_1.default(upperPrice).mul(1e8).floor().toString();
+        return [
+            web3_eth_abi_1.default.encodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], [oracle, collateralToken, loanToken, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            oracle: decodedData[0],
+            collateralToken: decodedData[1],
+            loanToken: decodedData[2],
+            lowerPrice: new decimal_js_1.default(decodedData[3]).div(1e8).toString(),
+            upperPrice: new decimal_js_1.default(decodedData[4]).div(1e8).toString(),
+        };
+    },
+};

package/cjs/services/triggerService.test.js

@@ -806,52 +806,6 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
-    describe('When testing triggerService.sparkQuotePriceTrigger', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-                    [(0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address, (0, tokens_1.getAssetInfo)('wstETH', enums_1.ChainId.Ethereum).address, 0.0004321, enums_1.RatioState.UNDER]
-                ],
-                [
-                    ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-                    [(0, tokens_1.getAssetInfo)('WBTC', enums_1.ChainId.Arbitrum).address, (0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Arbitrum).address, 0.00100023, enums_1.RatioState.OVER]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    (0, chai_1.expect)(triggerService_1.sparkQuotePriceTrigger.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        baseTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('DAI', enums_1.ChainId.Ethereum).address),
-                        quoteTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('wstETH', enums_1.ChainId.Ethereum).address),
-                        price: '0.0004321',
-                        ratioState: enums_1.RatioState.UNDER,
-                    },
-                    ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-                ],
-                [
-                    {
-                        baseTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('WBTC', enums_1.ChainId.Arbitrum).address),
-                        quoteTokenAddress: web3Utils.toChecksumAddress((0, tokens_1.getAssetInfo)('USDC', enums_1.ChainId.Arbitrum).address),
-                        price: '0.00100023',
-                        ratioState: enums_1.RatioState.OVER,
-                    },
-                    ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    (0, chai_1.expect)(triggerService_1.sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing triggerService.curveUsdBorrowRateTrigger', () => {
         describe('encode()', () => {
             const examples = [
@@ -1182,4 +1136,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}`, () => {
+                    (0, chai_1.expect)(triggerService_1.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)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/cjs/services/utils.test.js

@@ -1,37 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
-const web3Utils = __importStar(require("web3-utils"));
-const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
-const strategySubService_1 = require("./strategySubService");
 require("../configuration");
 const utils_1 = require("./utils");
 describe('Feature: utils.ts', () => {
@@ -167,54 +138,6 @@ describe('Feature: utils.ts', () => {
             });
         });
     });
-    describe('When testing utils.compareSubHashes()', () => {
-        const subDataToEncodeOne = [
-            12,
-            false,
-            {
-                baseTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                quoteTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                price: 100,
-                ratioState: 1,
-            },
-            {
-                collAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                collAssetId: 2,
-                debtAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                debtAssetId: 3,
-            },
-        ];
-        const subDataToEncodeTwo = [
-            13,
-            true,
-            {
-                baseTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                quoteTokenAddress: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                price: 100,
-                ratioState: 2,
-            },
-            {
-                collAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                collAssetId: 2,
-                debtAsset: '0xaf88d065e77c8cC2239327C5EDb3A432268e5831',
-                debtAssetId: 3,
-            },
-        ];
-        // @ts-ignore
-        const encodedSubDataOne = strategySubService_1.sparkEncode.closeToAsset(...subDataToEncodeOne);
-        // @ts-ignore
-        const encodedSubDataTwo = strategySubService_1.sparkEncode.closeToAsset(...subDataToEncodeTwo);
-        const encodedParams = web3Utils.keccak256(web3_eth_abi_1.default.encodeParameter('(uint64,bool,bytes[],bytes32[])', encodedSubDataOne));
-        const examples = [
-            [true, [encodedParams, encodedSubDataOne]],
-            [false, [encodedParams, encodedSubDataTwo]],
-        ];
-        examples.forEach(([expected, actual]) => {
-            it(`Given ${actual} should return expected value: ${expected}`, () => {
-                (0, chai_1.expect)((0, utils_1.compareSubHashes)(...actual)).to.equal(expected);
-            });
-        });
-    });
     describe('When testing utils.encodeSubId()', () => {
         const examples = [
             ['00000001', '1'],

package/cjs/types/enums.d.ts

@@ -171,8 +171,6 @@ export declare namespace Bundles {
         LIQUITY_BOOST = 17,
         SPARK_REPAY = 18,
         SPARK_BOOST = 19,
-        SPARK_CLOSE_TO_DEBT = -21231230,
-        SPARK_CLOSE_TO_COLLATERAL = -21231231,
         AAVE_V2_REPAY = 22,
         AAVE_V2_BOOST = 23,
         COMP_V2_REPAY = 20,
@@ -207,7 +205,9 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST = 53,
         AAVE_V3_EOA_REPAY_ON_PRICE = 54,
         AAVE_V3_EOA_BOOST_ON_PRICE = 55,
-        AAVE_V3_EOA_CLOSE = 56
+        AAVE_V3_EOA_CLOSE = 56,
+        SPARK_CLOSE = 57,
+        MORPHO_BLUE_CLOSE = 58
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -248,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,
@@ -278,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

@@ -194,8 +194,6 @@ var Bundles;
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
         MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
         MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = -21231230] = "SPARK_CLOSE_TO_DEBT";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = -21231231] = "SPARK_CLOSE_TO_COLLATERAL";
         MainnetIds[MainnetIds["AAVE_V2_REPAY"] = 22] = "AAVE_V2_REPAY";
         MainnetIds[MainnetIds["AAVE_V2_BOOST"] = 23] = "AAVE_V2_BOOST";
         MainnetIds[MainnetIds["COMP_V2_REPAY"] = 20] = "COMP_V2_REPAY";
@@ -231,6 +229,8 @@ var Bundles;
         MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         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) {
@@ -274,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) {
@@ -305,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

@@ -302,16 +302,6 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.Boost,
         protocol: PROTOCOLS.Spark,
     },
-    [Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT]: {
-        strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-        strategyId: Strategies.Identifiers.CloseToDebt,
-        protocol: PROTOCOLS.Spark,
-    },
-    [Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL]: {
-        strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-        strategyId: Strategies.Identifiers.CloseToCollateral,
-        protocol: PROTOCOLS.Spark,
-    },
     [Bundles.MainnetIds.AAVE_V2_REPAY]: {
         strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_REPAY,
         strategyId: Strategies.Identifiers.Repay,
@@ -467,6 +457,16 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.EoaCloseOnPrice,
         protocol: PROTOCOLS.AaveV3,
     },
+    [Bundles.MainnetIds.SPARK_CLOSE]: {
+        strategyOrBundleId: Bundles.MainnetIds.SPARK_CLOSE,
+        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]: {
@@ -656,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]: {
@@ -798,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/strategiesService.js

@@ -7,9 +7,6 @@ import { getPositionId, getRatioStateInfoForAaveCloseStrategy, getStopLossAndTak
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
 const web3 = new Web3();
-const SPARK_MARKET_ADDRESSES = {
-    [ChainId.Ethereum]: '0x02C3eA4e34C0cBd694D2adFa2c690EECbC1793eE',
-};
 const AAVE_V3_MARKET_ADDRESSES = {
     [ChainId.Ethereum]: '0x2f39d218133AFaB8F2B819B1066c7E434Ad94E9e',
     [ChainId.Optimism]: '0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb',
@@ -590,23 +587,24 @@ function parseSparkLeverageManagement(position, parseData) {
 function parseSparkCloseOnPrice(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.sparkQuotePriceTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.sparkQuotePriceSubData.decode(subStruct.subData);
+    const triggerData = triggerService.sparkQuotePriceRangeTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.sparkCloseGenericSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
-    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, SPARK_MARKET_ADDRESSES[_position.chainId]);
+    _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, subData.marketAddr);
+    const { takeProfitType, stopLossType } = getStopLossAndTakeProfitTypeByCloseStrategyType(+subData.closeType);
     _position.specific = {
         collAsset: subData.collAsset,
         collAssetId: subData.collAssetId,
         debtAsset: subData.debtAsset,
         debtAssetId: subData.debtAssetId,
-        baseToken: triggerData.baseTokenAddress,
-        quoteToken: triggerData.quoteTokenAddress,
-        price: triggerData.price,
-        ratioState: triggerData.ratioState,
+        baseToken: triggerData.collToken,
+        quoteToken: triggerData.debtToken,
+        stopLossPrice: triggerData.lowerPrice,
+        takeProfitPrice: triggerData.upperPrice,
+        stopLossType,
+        takeProfitType,
     };
-    const { ratioState } = getRatioStateInfoForAaveCloseStrategy(_position.specific.ratioState, wethToEthByAddress(_position.specific.collAsset, parseData.chainId), wethToEthByAddress(_position.specific.debtAsset, parseData.chainId), parseData.chainId);
-    _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
     return _position;
 }
 function parseLiquitySavingsLiqProtection(position, parseData) {
@@ -743,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;
@@ -917,8 +944,7 @@ const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.Spark]: {
         [Strategies.Identifiers.Repay]: parseSparkLeverageManagement,
         [Strategies.Identifiers.Boost]: parseSparkLeverageManagement,
-        [Strategies.Identifiers.CloseToDebt]: parseSparkCloseOnPrice,
-        [Strategies.Identifiers.CloseToCollateral]: parseSparkCloseOnPrice,
+        [Strategies.Identifiers.CloseOnPrice]: parseSparkCloseOnPrice,
     },
     [ProtocolIdentifiers.StrategiesAutomation.CrvUSD]: {
         [Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
@@ -931,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/strategySubService.d.ts

@@ -85,17 +85,7 @@ export declare const exchangeEncode: {
 };
 export declare const sparkEncode: {
     leverageManagement(triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean): string;
-    closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
-        baseTokenAddress: EthereumAddress;
-        quoteTokenAddress: EthereumAddress;
-        price: number;
-        ratioState: RatioState;
-    }, subData: {
-        collAsset: EthereumAddress;
-        collAssetId: number;
-        debtAsset: EthereumAddress;
-        debtAssetId: number;
-    }): (number | 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[])[];
 };
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
@@ -104,6 +94,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

@@ -232,11 +232,11 @@ export const sparkEncode = {
         subInput = subInput.concat(boostEnabled ? '01' : '00');
         return subInput;
     },
-    closeToAsset(strategyOrBundleId, isBundle = true, triggerData, subData) {
-        const { collAsset, collAssetId, debtAsset, debtAssetId, } = subData;
-        const subDataEncoded = subDataService.sparkQuotePriceSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId);
-        const { baseTokenAddress, quoteTokenAddress, price, ratioState, } = triggerData;
-        const triggerDataEncoded = triggerService.sparkQuotePriceTrigger.encode(baseTokenAddress, quoteTokenAddress, price, ratioState);
+    closeOnPriceGeneric(strategyOrBundleId, collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, user, stopLossPrice = 0, stopLossType = CloseToAssetType.DEBT, takeProfitPrice = 0, takeProfitType = CloseToAssetType.COLLATERAL) {
+        const isBundle = true;
+        const closeType = getCloseStrategyType(stopLossPrice, stopLossType, takeProfitPrice, takeProfitType);
+        const subDataEncoded = subDataService.sparkCloseGenericSubData.encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user);
+        const triggerDataEncoded = triggerService.sparkQuotePriceRangeTrigger.encode(collAsset, debtAsset, stopLossPrice, takeProfitPrice);
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
@@ -280,6 +280,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) {