@defisaver/automation-sdk 3.0.0 → 3.0.2-dev

package/esm/constants/index.js

@@ -283,6 +283,16 @@ exports.MAINNET_BUNDLES_INFO = {
         strategyId: enums_1.Strategies.Identifiers.Boost,
         protocol: exports.PROTOCOLS.CrvUSD,
     },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY,
+        strategyId: enums_1.Strategies.Identifiers.Repay,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
+    [enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST]: {
+        strategyOrBundleId: enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST,
+        strategyId: enums_1.Strategies.Identifiers.Boost,
+        protocol: exports.PROTOCOLS.MorphoBlue,
+    },
 };
 exports.OPTIMISM_BUNDLES_INFO = {
     [enums_1.Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/ethereumService.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/ethereumService.test.js

@@ -16,6 +16,7 @@ const web3_1 = __importDefault(require("web3"));
 const chai_1 = require("chai");
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
+require("../configuration");
 const ethereumService_1 = require("./ethereumService");
 const contractService_1 = require("./contractService");
 require('dotenv').config({ path: '.env' });

package/esm/services/strategiesService.js

@@ -545,6 +545,39 @@ function parseCrvUSDLeverageManagement(position, parseData) {
     _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
     return _position;
 }
+function parseMorphoBlueLeverageManagement(position, parseData) {
+    const _position = (0, lodash_1.cloneDeep)(position);
+    const { subStruct, subId, subHash } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.morphoBlueRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.morphoBlueLeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    const isRepay = _position.strategy.strategyId === enums_1.Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            triggerRepayRatio: triggerData.ratio,
+            targetRepayRatio: subData.targetRatio,
+            repayEnabled: isEnabled,
+            subId1: Number(subId),
+            subHashRepay: subHash,
+            mergeWithId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    else {
+        _position.specific = {
+            triggerBoostRatio: triggerData.ratio,
+            targetBoostRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+            subHashBoost: subHash,
+            mergeId: enums_1.Strategies.Identifiers.Boost,
+        };
+    }
+    _position.positionId = (0, utils_1.getPositionId)(_position.chainId, _position.protocol.id, _position.owner, triggerData.marketId);
+    _position.strategy.strategyId = enums_1.Strategies.IdOverrides.LeverageManagement;
+    return _position;
+}
 const parsingMethodsMapping = {
     [enums_1.ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [enums_1.Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -608,6 +641,10 @@ const parsingMethodsMapping = {
         [enums_1.Strategies.Identifiers.Repay]: parseCrvUSDLeverageManagement,
         [enums_1.Strategies.Identifiers.Boost]: parseCrvUSDLeverageManagement,
     },
+    [enums_1.ProtocolIdentifiers.StrategiesAutomation.MorphoBlue]: {
+        [enums_1.Strategies.Identifiers.Repay]: parseMorphoBlueLeverageManagement,
+        [enums_1.Strategies.Identifiers.Boost]: parseMorphoBlueLeverageManagement,
+    },
 };
 function getParsingMethod(id, strategy) {
     return parsingMethodsMapping[id][strategy.strategyId];

package/esm/services/strategiesService.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/strategiesService.test.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const enums_1 = require("../types/enums");
+require("../configuration");
 const strategiesService_1 = require("./strategiesService");
 describe('Feature: strategiesService.ts', () => {
     describe('When testing strategiesService.parseStrategiesAutomatedPosition', () => __awaiter(void 0, void 0, void 0, function* () {

package/esm/services/strategySubService.d.ts

@@ -81,3 +81,6 @@ export declare const sparkEncode: {
 export declare const crvUSDEncode: {
     leverageManagement(owner: EthereumAddress, controllerAddr: EthereumAddress, ratioState: RatioState, targetRatio: number, triggerRatio: number, collTokenAddr: EthereumAddress, crvUSDAddr: EthereumAddress): (boolean | string[] | Bundles.MainnetIds)[];
 };
+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): (boolean | string[] | Bundles.MainnetIds)[];
+};

package/esm/services/strategySubService.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.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
+exports.morphoBlueEncode = exports.crvUSDEncode = exports.sparkEncode = exports.exchangeEncode = exports.morphoAaveV2Encode = exports.compoundV3L2Encode = exports.compoundV3Encode = exports.compoundV2Encode = exports.aaveV3Encode = exports.aaveV2Encode = exports.chickenBondsEncode = exports.liquityEncode = exports.makerEncode = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const enums_1 = require("../types/enums");
@@ -233,3 +233,13 @@ exports.crvUSDEncode = {
         return [strategyOrBundleId, isBundle, triggerData, subData];
     },
 };
+exports.morphoBlueEncode = {
+    leverageManagement(marketId, loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, triggerRatio, user) {
+        const subData = subDataService.morphoBlueLeverageManagementSubData.encode(loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user);
+        const triggerData = triggerService.morphoBlueRatioTrigger.encode(marketId, user, triggerRatio, ratioState);
+        // over is boost, under is repay
+        const strategyOrBundleId = ratioState === enums_1.RatioState.OVER ? enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST : enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY;
+        const isBundle = true;
+        return [strategyOrBundleId, isBundle, triggerData, subData];
+    },
+};

package/esm/services/strategySubService.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/strategySubService.test.js

@@ -32,6 +32,7 @@ const sdk_1 = require("@defisaver/sdk");
 const tokens_1 = require("@defisaver/tokens");
 const web3Utils = __importStar(require("web3-utils"));
 const enums_1 = require("../types/enums");
+require("../configuration");
 const strategySubService_1 = require("./strategySubService");
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
@@ -750,6 +751,79 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
+    describe('When testing strategySubService.morphoBlueEncode', () => {
+        describe('leverageManagement()', () => {
+            const examples = [
+                [
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_REPAY,
+                        true,
+                        [
+                            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001',
+                        ],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000001',
+                            '0x000000000000000000000000000000000000000000000000136dcc951d8c0000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        '945000000000000000',
+                        enums_1.RatioState.UNDER,
+                        140,
+                        120,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+                    ]
+                ],
+                [
+                    [
+                        enums_1.Bundles.MainnetIds.MORPHO_BLUE_BOOST,
+                        true,
+                        [
+                            '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'
+                        ],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        ],
+                    ],
+                    [
+                        '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41',
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        '945000000000000000',
+                        enums_1.RatioState.OVER,
+                        160,
+                        200,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(strategySubService_1.morphoBlueEncode.leverageManagement(...actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing strategySubService.compoundV3L2Encode', () => {
         describe('leverageManagement()', () => {
             const examples = [

package/esm/services/subDataService.d.ts

@@ -158,3 +158,15 @@ export declare const crvUSDLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const morphoBlueLeverageManagementSubData: {
+    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress) => string[];
+    decode: (subData: string[]) => {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.morphoBlueLeverageManagementSubData = exports.crvUSDLeverageManagementSubData = exports.liquityDebtInFrontRepaySubData = exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3L2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const tokens_1 = require("@defisaver/tokens");
@@ -378,3 +378,35 @@ exports.crvUSDLeverageManagementSubData = {
         return { controller, targetRatio };
     },
 };
+exports.morphoBlueLeverageManagementSubData = {
+    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user) => {
+        const loanTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', loanToken);
+        const collTokenEncoded = web3_eth_abi_1.default.encodeParameter('address', collToken);
+        const oracleEncoded = web3_eth_abi_1.default.encodeParameter('address', oracle);
+        const irmEncoded = web3_eth_abi_1.default.encodeParameter('address', irm);
+        const lltvEncoded = web3_eth_abi_1.default.encodeParameter('uint256', lltv);
+        const ratioStateEncoded = web3_eth_abi_1.default.encodeParameter('uint8', ratioState);
+        const targetRatioEncoded = web3_eth_abi_1.default.encodeParameter('uint256', (0, utils_1.ratioPercentageToWei)(targetRatio));
+        const userEncoded = web3_eth_abi_1.default.encodeParameter('address', user);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded];
+    },
+    decode: (subData) => {
+        const loanToken = web3_eth_abi_1.default.decodeParameter('address', subData[0]);
+        const collToken = web3_eth_abi_1.default.decodeParameter('address', subData[1]);
+        const oracle = web3_eth_abi_1.default.decodeParameter('address', subData[2]);
+        const irm = web3_eth_abi_1.default.decodeParameter('address', subData[3]);
+        const lltv = web3_eth_abi_1.default.decodeParameter('uint256', subData[4]);
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[6]);
+        const user = web3_eth_abi_1.default.decodeParameter('address', subData[7]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            targetRatio,
+        };
+    },
+};

package/esm/services/subDataService.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/subDataService.test.js

@@ -31,6 +31,7 @@ const chai_1 = require("chai");
 const tokens_1 = require("@defisaver/tokens");
 const web3Utils = __importStar(require("web3-utils"));
 const enums_1 = require("../types/enums");
+require("../configuration");
 const subDataService_1 = require("./subDataService");
 describe('Feature: subDataService.ts', () => {
     describe('When testing subDataService.makerRepayFromSavingsSubData', () => {
@@ -1086,4 +1087,92 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000000000000000000000000000010a741a462780000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x2a01eb9496094da03c4e364def50f5ad1280ad72'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '945000000000000000', enums_1.RatioState.UNDER, 120, web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c')]
+                ],
+                [
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x00000000000000000000000048f7e36eb6b826b2df4b2e630b62cd25e89e40e2',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000bef55718ad60000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c',
+                    ],
+                    [web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), '860000000000000000', enums_1.RatioState.OVER, 200, web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c')]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    (0, chai_1.expect)(subDataService_1.morphoBlueLeverageManagementSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        'collToken': '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        'irm': '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        'lltv': '945000000000000000',
+                        'loanToken': '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        'oracle': '0x2a01EB9496094dA03c4E364Def50f5aD1280AD72',
+                        'targetRatio': 120,
+                        'user': '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x0000000000000000000000002a01eb9496094da03c4e364def50f5ad1280ad72',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000001',
+                        '0x00000000000000000000000000000000000000000000000010a741a462780000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                ],
+                [
+                    {
+                        'collToken': '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        'irm': '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        'lltv': '860000000000000000',
+                        'loanToken': '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
+                        'oracle': '0x48F7E36EB6B826B2dF4B2E630B62Cd25e89E40e2',
+                        'targetRatio': 200,
+                        'user': '0x0043d218133aFaB8F2b829B106633E434aD94e2C',
+                    },
+                    [
+                        '0x000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x00000000000000000000000048f7e36eb6b826b2df4b2e630b62cd25e89e40e2',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000bef55718ad60000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(subDataService_1.morphoBlueLeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/services/triggerService.d.ts

@@ -172,3 +172,12 @@ export declare const crvUSDRatioTrigger: {
         ratioState: number;
     };
 };
+export declare const morphoBlueRatioTrigger: {
+    encode(marketId: string, owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState): string[];
+    decode(triggerData: string[]): {
+        marketId: string;
+        owner: string;
+        ratio: number;
+        ratioState: number;
+    };
+};

package/esm/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.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = 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.morphoBlueRatioTrigger = exports.crvUSDRatioTrigger = exports.curveUsdSoftLiquidationTrigger = exports.curveUsdBorrowRateTrigger = exports.sparkQuotePriceTrigger = exports.sparkRatioTrigger = exports.exchangeOffchainPriceTrigger = exports.exchangeTimestampTrigger = exports.compoundV3RatioTrigger = exports.cBondsRebondTrigger = exports.aaveV2RatioTrigger = 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"));
@@ -335,3 +335,19 @@ exports.crvUSDRatioTrigger = {
         };
     },
 };
+exports.morphoBlueRatioTrigger = {
+    encode(marketId, // bytes32
+    owner, ratioPercentage, ratioState) {
+        const ratioWei = (0, utils_1.ratioPercentageToWei)(ratioPercentage);
+        return [web3_eth_abi_1.default.encodeParameters(['bytes32', 'address', 'uint256', 'uint8'], [marketId, owner, ratioWei, ratioState])];
+    },
+    decode(triggerData) {
+        const decodedData = web3_eth_abi_1.default.decodeParameters(['bytes32', 'address', 'uint256', 'uint8'], triggerData[0]);
+        return {
+            marketId: decodedData[0],
+            owner: decodedData[1],
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
+            ratioState: Number(decodedData[3]),
+        };
+    },
+};

package/esm/services/triggerService.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/triggerService.test.js

@@ -27,6 +27,7 @@ const chai_1 = require("chai");
 const tokens_1 = require("@defisaver/tokens");
 const web3Utils = __importStar(require("web3-utils"));
 const enums_1 = require("../types/enums");
+require("../configuration");
 const triggerService_1 = require("./triggerService");
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
@@ -858,4 +859,40 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.morphoBlueRatioTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+                    ['0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41', web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), 120, enums_1.RatioState.UNDER]
+                ],
+                [
+                    ['0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                    ['0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc', web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), 200, enums_1.RatioState.OVER]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.morphoBlueRatioTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { marketId: '0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec41', owner: web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), ratio: 120, ratioState: enums_1.RatioState.UNDER },
+                    ['0xc54d7acf14de29e0e5527cabd7a576506870346a78a11a6762e2cca66322ec410000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c00000000000000000000000000000000000000000000000010a741a4627800000000000000000000000000000000000000000000000000000000000000000001'],
+                ],
+                [
+                    { marketId: '0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc', owner: web3Utils.toChecksumAddress('0x0043d218133AFaB8F2B829B106633E434Ad94E2c'), ratio: 200, ratioState: enums_1.RatioState.OVER },
+                    ['0xb323495f7e4148be5643a4ea4a8221eef163e4bccfdedc2a6f4696baacbc86cc0000000000000000000000000043d218133afab8f2b829b106633e434ad94e2c0000000000000000000000000000000000000000000000001bc16d674ec800000000000000000000000000000000000000000000000000000000000000000000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    (0, chai_1.expect)(triggerService_1.morphoBlueRatioTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });

package/esm/services/utils.test.d.ts

@@ -1 +1 @@
-export {};
+import '../configuration';

package/esm/services/utils.test.js

@@ -32,6 +32,7 @@ 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', () => {
     describe('When testing utils.isDefined()', () => {

package/esm/types/enums.d.ts

@@ -35,7 +35,8 @@ export declare namespace ProtocolIdentifiers {
         MorphoAaveV2 = "Morpho-Aave__V2",
         Exchange = "Exchange",
         Spark = "Spark",
-        CrvUSD = "CurveUSD"
+        CrvUSD = "CurveUSD",
+        MorphoBlue = "MorphoBlue"
     }
     enum LegacyAutomation {
         MakerDAO = "MakerDAO",
@@ -130,7 +131,9 @@ export declare namespace Bundles {
         COMP_V2_REPAY = 20,
         COMP_V2_BOOST = 21,
         CRVUSD_REPAY = 26,
-        CRVUSD_BOOST = 27
+        CRVUSD_BOOST = 27,
+        MORPHO_BLUE_REPAY = 32,
+        MORPHO_BLUE_BOOST = 33
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -45,6 +45,7 @@ var ProtocolIdentifiers;
         StrategiesAutomation["Exchange"] = "Exchange";
         StrategiesAutomation["Spark"] = "Spark";
         StrategiesAutomation["CrvUSD"] = "CurveUSD";
+        StrategiesAutomation["MorphoBlue"] = "MorphoBlue";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -149,6 +150,8 @@ var Bundles;
         MainnetIds[MainnetIds["COMP_V2_BOOST"] = 21] = "COMP_V2_BOOST";
         MainnetIds[MainnetIds["CRVUSD_REPAY"] = 26] = "CRVUSD_REPAY";
         MainnetIds[MainnetIds["CRVUSD_BOOST"] = 27] = "CRVUSD_BOOST";
+        MainnetIds[MainnetIds["MORPHO_BLUE_REPAY"] = 32] = "MORPHO_BLUE_REPAY";
+        MainnetIds[MainnetIds["MORPHO_BLUE_BOOST"] = 33] = "MORPHO_BLUE_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/esm/types/index.d.ts

@@ -48,7 +48,7 @@ export declare namespace Multicall {
 interface _SubscriptionOptions {
     toBlock: BlockNumber;
     fromBlock: BlockNumber;
-    mergeWithSameId: boolean;
+    mergeSubs: boolean;
     enabledOnly: boolean;
     unexpiredOnly: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.0.0",
+  "version": "3.0.2-dev",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -36,7 +36,7 @@
     "@babel/eslint-parser": "^7.12.17",
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-typescript": "^7.12.7",
-    "@typechain/web3-v1": "https://gitpkg.now.sh/mihai9-lab/TypeChain/packages/target-web3-v1?temp",
+    "typechain-target-web3-v1-3mihai3": "^6.0.1",
     "@types/chai": "^4.3.6",
     "@types/lodash": "^4.14.191",
     "@types/mocha": "^10.0.1",

package/scripts/generateContractTypes.js

@@ -28,7 +28,7 @@ async function main() {
       filesToProcess: allFiles,
       allFiles,
       outDir: '.',
-      target: 'web3-v1',
+      target: 'web3-v1-3mihai3',
     });
   } catch (err) {
     console.error(err);

package/src/automation/private/LegacyAutomation.ts

@@ -101,12 +101,12 @@ export default class LegacyAutomation extends Automation {
   }
 
   protected async getParsedSubscriptions(addresses?: EthereumAddress[], options?: SubscriptionOptions): Promise<Position.LegacyAutomated[]> {
-    // Legacy automation was disabled on block 18213086
+    const legacyAutomationSunset = 18213086;
     if (
       !options?.fromBlock
       || options?.fromBlock === 'latest'
       || options?.fromBlock === 'pending'
-      || (options?.fromBlock && new Dec(options?.fromBlock.toString()).lt(18213086))
+      || (options?.fromBlock && new Dec(options?.fromBlock.toString()).gte(legacyAutomationSunset))
     ) {
       return [];
     }