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

package/esm/services/strategySubService.test.js

@@ -5,7 +5,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { Bundles, ChainId, CloseToAssetType, OrderType, RatioState, Strategies } from '../types/enums';
 import '../configuration';
-import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, sparkEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, } from './strategySubService';
+import { aaveV2Encode, chickenBondsEncode, liquityEncode, makerEncode, aaveV3Encode, compoundV2Encode, compoundV3Encode, morphoAaveV2Encode, exchangeEncode, crvUSDEncode, compoundV3L2Encode, morphoBlueEncode, } from './strategySubService';
 describe('Feature: strategySubService.ts', () => {
     describe('When testing strategySubService.makerEncode', () => {
         // @ts-ignore // TODO - this requires change in @defisaver/tokens
@@ -1163,78 +1163,6 @@ describe('Feature: strategySubService.ts', () => {
             });
         });
     });
-    describe('When testing strategySubService.sparkEncode', () => {
-        describe('leverageManagement()', () => {
-            const examples = [
-                [
-                    '0x000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e000001',
-                    [160, 220, 180, 190, true]
-                ],
-                [
-                    '0x000000000000000016345785d8a0000000000000000000001bc16d674ec80000000000000000000018fae27693b4000000000000000000001a5e27eef13e000000',
-                    [160, 200, 180, 190, false]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkEncode.leverageManagement(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('closeToAsset()', () => {
-            const examples = [
-                [
-                    [
-                        Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-                        true,
-                        ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000026e1f9c6000000000000000000000000000000000000000000000000000000000000000000'],
-                        [
-                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000015',
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000020',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                        ],
-                    ],
-                    [
-                        Bundles.MainnetIds.SPARK_CLOSE_TO_COLLATERAL,
-                        true,
-                        {
-                            baseTokenAddress: getAssetInfo('WETH').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 1670, ratioState: RatioState.OVER
-                        },
-                        {
-                            collAsset: getAssetInfo('WETH').address, collAssetId: 21, debtAsset: getAssetInfo('DAI').address, debtAssetId: 32,
-                        },
-                    ]
-                ],
-                [
-                    [
-                        Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-                        true,
-                        ['0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000000000000084d000000000000000000000000000000000000000000000000000000000000000001'],
-                        [
-                            '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000015',
-                            '0x000000000000000000000000514910771af9ca656af840dff83e8264ecf986ca', '0x0000000000000000000000000000000000000000000000000000000000000020',
-                            '0x0000000000000000000000000000000000000000000000000000000000000000',
-                        ],
-                    ],
-                    [
-                        Bundles.MainnetIds.SPARK_CLOSE_TO_DEBT,
-                        true,
-                        {
-                            baseTokenAddress: getAssetInfo('LINK').address, quoteTokenAddress: getAssetInfo('DAI').address, price: 0.00544, ratioState: RatioState.UNDER
-                        },
-                        {
-                            collAsset: getAssetInfo('DAI').address, collAssetId: 21, debtAsset: getAssetInfo('LINK').address, debtAssetId: 32,
-                        },
-                    ]
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkEncode.closeToAsset(...actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing strategySubService.crvUSDEncode', () => {
         describe('leverageManagement()', () => {
             const examples = [
@@ -1408,6 +1336,44 @@ describe('Feature: strategySubService.ts', () => {
                 });
             });
         });
+        describe('closeOnPrice()', () => {
+            const examples = [
+                [
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+                        true,
+                        ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                        [
+                            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                            '0x0000000000000000000000000000000000000000000000000000000000000000',
+                            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                            '0x0000000000000000000000000000000000000000000000000000000000000005',
+                        ],
+                    ],
+                    [
+                        Bundles.MainnetIds.MORPHO_BLUE_CLOSE,
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                        1500,
+                        CloseToAssetType.DEBT,
+                        4000,
+                        CloseToAssetType.COLLATERAL
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${JSON.stringify(actual)} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBlueEncode.closeOnPrice(...actual)).to.eql(expected);
+                });
+            });
+        });
     });
     describe('When testing strategySubService.compoundV3L2Encode', () => {
         describe('leverageManagement()', () => {

package/esm/services/subDataService.d.ts

@@ -166,15 +166,6 @@ export declare const sparkLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const sparkQuotePriceSubData: {
-    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
-    decode(subData: string[]): {
-        collAsset: EthereumAddress;
-        collAssetId: number;
-        debtAsset: EthereumAddress;
-        debtAssetId: number;
-    };
-};
 export declare const liquityDsrPaybackSubData: {
     encode: (targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -315,3 +306,27 @@ export declare const compoundV3CloseSubData: {
         owner: EthereumAddress;
     };
 };
+export declare const sparkCloseGenericSubData: {
+    encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        collAsset: EthereumAddress;
+        collAssetId: number;
+        debtAsset: EthereumAddress;
+        debtAssetId: number;
+        closeType: CloseStrategyType;
+        marketAddr: EthereumAddress;
+        owner: EthereumAddress;
+    };
+};
+export declare const morphoBlueCloseOnPriceSubData: {
+    encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType): string[];
+    decode(subData: string[]): {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        closeType: CloseStrategyType;
+    };
+};

package/esm/services/subDataService.js

@@ -411,25 +411,6 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const sparkQuotePriceSubData = {
-    encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
-        const encodedColl = AbiCoder.encodeParameter('address', collAsset);
-        const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
-        const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
-        const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
-        const encodedNullAddress = AbiCoder.encodeParameter('address', nullAddress);
-        return [encodedColl, encodedCollId, encodedDebt, encodedDebtId, encodedNullAddress];
-    },
-    decode(subData) {
-        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
-        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
-        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-        return {
-            collAsset, collAssetId, debtAsset, debtAssetId,
-        };
-    },
-};
 export const liquityDsrPaybackSubData = {
     encode: (targetRatio) => {
         const daiAddress = getAssetInfo('DAI').address;
@@ -839,3 +820,65 @@ export const compoundV3CloseSubData = {
         };
     },
 };
+export const sparkCloseGenericSubData = {
+    encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
+        const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+        const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+        const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+        const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+        const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+        const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+        const userEncoded = AbiCoder.encodeParameter('address', user);
+        return [
+            encodedColl,
+            encodedCollId,
+            encodedDebt,
+            encodedDebtId,
+            encodedCloseType,
+            encodedMarket,
+            userEncoded,
+        ];
+    },
+    decode(subData) {
+        const collAsset = AbiCoder.decodeParameter('address', subData[0]);
+        const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+        const debtAsset = AbiCoder.decodeParameter('address', subData[2]);
+        const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4]));
+        const marketAddr = AbiCoder.decodeParameter('address', subData[5]);
+        const owner = AbiCoder.decodeParameter('address', subData[6]);
+        return {
+            collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+        };
+    },
+};
+export const morphoBlueCloseOnPriceSubData = {
+    encode(loanToken, collToken, oracle, irm, lltv, user, closeType) {
+        const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
+        const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+        const oracleEncoded = AbiCoder.encodeParameter('address', oracle);
+        const irmEncoded = AbiCoder.encodeParameter('address', irm);
+        const lltvEncoded = AbiCoder.encodeParameter('uint256', lltv);
+        const userEncoded = AbiCoder.encodeParameter('address', user);
+        const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, userEncoded, closeTypeEncoded];
+    },
+    decode(subData) {
+        const loanToken = AbiCoder.decodeParameter('address', subData[0]);
+        const collToken = AbiCoder.decodeParameter('address', subData[1]);
+        const oracle = AbiCoder.decodeParameter('address', subData[2]);
+        const irm = AbiCoder.decodeParameter('address', subData[3]);
+        const lltv = AbiCoder.decodeParameter('uint256', subData[4]);
+        const user = AbiCoder.decodeParameter('address', subData[5]);
+        const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6]));
+        return {
+            loanToken,
+            collToken,
+            oracle,
+            irm,
+            lltv,
+            user,
+            closeType,
+        };
+    },
+};

package/esm/services/subDataService.test.js

@@ -873,78 +873,6 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
-    describe('When testing subDataService.sparkQuotePriceSubData', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        2,
-                        web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        4,
-                    ]
-                ],
-                [
-                    [
-                        '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-                        '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    ],
-                    [
-                        web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-                        6,
-                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-                        2,
-                    ]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(subDataService.sparkQuotePriceSubData.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
-                        collAssetId: 2,
-                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        debtAssetId: 4,
-                    },
-                    [
-                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f', '0x0000000000000000000000000000000000000000000000000000000000000004',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    ],
-                ],
-                [
-                    {
-                        collAsset: web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Arbitrum).address),
-                        collAssetId: 6,
-                        debtAsset: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-                        debtAssetId: 2,
-                    },
-                    [
-                        '0x0000000000000000000000005979d7b546e38e414f7e9822514be443a4800529', '0x0000000000000000000000000000000000000000000000000000000000000006',
-                        '0x000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e5831', '0x0000000000000000000000000000000000000000000000000000000000000002',
-                        '0x0000000000000000000000000000000000000000000000000000000000000000',
-                    ],
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(subDataService.sparkQuotePriceSubData.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing subDataService.liquityDsrPaybackSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1336,6 +1264,58 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.morphoBlueCloseOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                    [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'), '945000000000000000', web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                        closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                        '0x0000000000000000000000000000000000000000000000000000000000000006',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.morphoBlueCloseOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/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/esm/services/triggerService.js

@@ -261,24 +261,6 @@ export const sparkRatioTrigger = {
         };
     },
 };
-export const sparkQuotePriceTrigger = {
-    encode(baseTokenAddress, quoteTokenAddress, price, ratioState) {
-        // Price is always in 8 decimals
-        const _price = new Dec(price.toString()).mul(Math.pow(10, 8)).floor().toString();
-        return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
-    },
-    decode(triggerData) {
-        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
-        // Price is always in 8 decimals
-        const price = new Dec(decodedData[2]).div(Math.pow(10, 8)).toDP(8).toString();
-        return {
-            price,
-            baseTokenAddress: decodedData[0],
-            quoteTokenAddress: decodedData[1],
-            ratioState: +decodedData[3],
-        };
-    },
-};
 export const curveUsdBorrowRateTrigger = {
     encode(market, targetRate, rateState) {
         // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
@@ -497,3 +479,42 @@ export const aaveV3QuotePriceRangeTrigger = {
         };
     },
 };
+export const sparkQuotePriceRangeTrigger = {
+    encode(collToken, debtToken, 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', 'uint256', 'uint256'], [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+        ];
+    },
+    decode(triggerData) {
+        const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+        return {
+            collToken: decodedData[0],
+            debtToken: decodedData[1],
+            lowerPrice: new Dec(decodedData[2]).div(1e8).toString(),
+            upperPrice: new Dec(decodedData[3]).div(1e8).toString(),
+        };
+    },
+};
+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, sparkQuotePriceTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, } from './triggerService';
+import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, morphoBluePriceRangeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -781,52 +781,6 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
-    describe('When testing triggerService.sparkQuotePriceTrigger', () => {
-        describe('encode()', () => {
-            const examples = [
-                [
-                    ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-                    [getAssetInfo('DAI', ChainId.Ethereum).address, getAssetInfo('wstETH', ChainId.Ethereum).address, 0.0004321, RatioState.UNDER]
-                ],
-                [
-                    ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-                    [getAssetInfo('WBTC', ChainId.Arbitrum).address, getAssetInfo('USDC', ChainId.Arbitrum).address, 0.00100023, RatioState.OVER]
-                ],
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${expected}`, () => {
-                    expect(sparkQuotePriceTrigger.encode(...actual)).to.eql(expected);
-                });
-            });
-        });
-        describe('decode()', () => {
-            const examples = [
-                [
-                    {
-                        baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('DAI', ChainId.Ethereum).address),
-                        quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('wstETH', ChainId.Ethereum).address),
-                        price: '0.0004321',
-                        ratioState: RatioState.UNDER,
-                    },
-                    ['0x0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000000000000000000000000000000000000000a8ca0000000000000000000000000000000000000000000000000000000000000001'],
-                ],
-                [
-                    {
-                        baseTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('WBTC', ChainId.Arbitrum).address),
-                        quoteTokenAddress: web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Arbitrum).address),
-                        price: '0.00100023',
-                        ratioState: RatioState.OVER,
-                    },
-                    ['0x0000000000000000000000002f2a2543b76a4166549f7aab2e75bef0aefc5b0f000000000000000000000000af88d065e77c8cc2239327c5edb3a432268e583100000000000000000000000000000000000000000000000000000000000186b70000000000000000000000000000000000000000000000000000000000000000'],
-                ]
-            ];
-            examples.forEach(([expected, actual]) => {
-                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
-                    expect(sparkQuotePriceTrigger.decode(actual)).to.eql(expected);
-                });
-            });
-        });
-    });
     describe('When testing triggerService.curveUsdBorrowRateTrigger', () => {
         describe('encode()', () => {
             const examples = [
@@ -1157,4 +1111,52 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+                ],
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                    [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(morphoBluePriceRangeTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '1500',
+                        upperPrice: '4000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+                ],
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+                        lowerPrice: '0',
+                        upperPrice: '5000',
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8dA6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
 });