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

package/src/services/subDataService.test.ts

@@ -4,12 +4,11 @@ import { getAssetInfo } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { MAXUINT } from '@defisaver/tokens';
 
-import { ChainId, CloseStrategyType, CloseToAssetType, OrderType, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, OrderType, RatioState } from '../types/enums';
 import type { EthereumAddress, SubData } from '../types';
 
 import '../configuration';
 import * as subDataService from './subDataService';
-import { AAVE_V3_VARIABLE_BORROW_RATE } from '../constants';
 
 describe('Feature: subDataService.ts', () => {
 
@@ -941,82 +940,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.sparkQuotePriceSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress]]> = [
-        [
-          [
-            '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: Array<[{ collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number }, SubData]> = [
-        [
-          {
-            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: Array<[SubData, [targetRatio: number]]> = [
@@ -1445,6 +1368,65 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.morphoBlueCloseOnPriceSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        SubData,
+        [loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType],
+      ]> = [
+        [
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            '0x0000000000000000000000000000000000000000000000000000000000000006',
+          ],
+          [web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'), '945000000000000000', web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'), CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(subDataService.morphoBlueCloseOnPriceSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, user: EthereumAddress, closeType: CloseStrategyType }, SubData]> = [
+        [
+          {
+            loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+            collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+            oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+            irm: '0x0000000000000000000000000000000000000000',
+            lltv: '945000000000000000',
+            user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+            closeType: CloseStrategyType.TAKE_PROFIT_AND_STOP_LOSS_IN_DEBT,
+          },
+          [
+            '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+            '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+            '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+            '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+            '0x0000000000000000000000000000000000000000000000000000000000000006',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.morphoBlueCloseOnPriceSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
     describe('encode()', () => {
       const examples: Array<[SubData, [collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number]]> = [

package/src/services/subDataService.ts

@@ -593,37 +593,6 @@ export const sparkLeverageManagementSubData = { // TODO encode?
   },
 };
 
-export const sparkQuotePriceSubData = {
-  encode(
-    collAsset: EthereumAddress,
-    collAssetId: number,
-    debtAsset: EthereumAddress,
-    debtAssetId: number,
-    nullAddress: EthereumAddress = ZERO_ADDRESS,
-  ): SubData {
-    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: SubData): { collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number } {
-    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
-
-    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
-    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
-
-    return {
-      collAsset, collAssetId, debtAsset, debtAssetId,
-    };
-  },
-};
-
 export const liquityDsrPaybackSubData = {
   encode: (targetRatio: number) => {
     const daiAddress = getAssetInfo('DAI').address;
@@ -1191,3 +1160,95 @@ export const compoundV3CloseSubData = {
     };
   },
 };
+
+export const sparkCloseGenericSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+  ): SubData {
+    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: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    owner: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const owner = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, owner,
+    };
+  },
+};
+
+export const morphoBlueCloseOnPriceSubData = {
+  encode(
+    loanToken: EthereumAddress,
+    collToken: EthereumAddress,
+    oracle: EthereumAddress,
+    irm: EthereumAddress,
+    lltv: string,
+    user: EthereumAddress,
+    closeType: CloseStrategyType,
+  ): SubData {
+    const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
+    const collTokenEncoded = AbiCoder.encodeParameter('address', collToken);
+    const oracleEncoded = AbiCoder.encodeParameter('address', oracle);
+    const irmEncoded = AbiCoder.encodeParameter('address', irm);
+    const lltvEncoded = AbiCoder.encodeParameter('uint256', lltv);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+    const closeTypeEncoded = AbiCoder.encodeParameter('uint8', closeType);
+    return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, userEncoded, closeTypeEncoded];
+  },
+  decode(subData: SubData) {
+    const loanToken = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collToken = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
+    const oracle = AbiCoder.decodeParameter('address', subData[2]) as any as EthereumAddress;
+    const irm = AbiCoder.decodeParameter('address', subData[3]) as any as EthereumAddress;
+    const lltv = AbiCoder.decodeParameter('uint256', subData[4]) as any as EthereumAddress;
+    const user = AbiCoder.decodeParameter('address', subData[5]) as any as EthereumAddress;
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[6])) as CloseStrategyType;
+
+    return {
+      loanToken,
+      collToken,
+      oracle,
+      irm,
+      lltv,
+      user,
+      closeType,
+    };
+  },
+};

package/src/services/triggerService.test.ts

@@ -23,7 +23,6 @@ import {
   liquityDebtInFrontTrigger,
   makerRatioTrigger,
   morphoAaveV2RatioTrigger,
-  sparkQuotePriceTrigger,
   sparkRatioTrigger,
   trailingStopTrigger,
   liquityDebtInFrontWithLimitTrigger,
@@ -32,6 +31,7 @@ import {
   crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger,
   compoundV3PriceRangeTrigger,
   aaveV3QuotePriceRangeTrigger,
+  morphoBluePriceRangeTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -879,56 +879,6 @@ describe('Feature: triggerService.ts', () => {
     });
   });
 
-  describe('When testing triggerService.sparkQuotePriceTrigger', () => {
-    describe('encode()', () => {
-      const examples: Array<[[string], [baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: number, ratioState: RatioState]]> = [
-        [
-          ['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: Array<[{ baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState }, TriggerData]> = [
-        [
-          {
-            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: Array<[[string], [market: EthereumAddress, targetRate: string, rateState: RatioState]]> = [
@@ -1281,4 +1231,56 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+
+  describe('When testing triggerService.morphoBluePriceRangeTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: number, upperPrice: number]]> = [
+        [
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+          [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 1500, 4000]
+        ],
+        [
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+          [web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'), web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'), web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), 0, 5000]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(morphoBluePriceRangeTrigger.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, lowerPrice: string, upperPrice: string }, TriggerData]> = [
+        [
+          {
+            oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            lowerPrice: '1500',
+            upperPrice: '4000',
+          },
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+        ],
+        [
+          {
+            oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+            collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+            loanToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            lowerPrice: '0',
+            upperPrice: '5000',
+          },
+          ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8dA6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(morphoBluePriceRangeTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/triggerService.ts

@@ -328,32 +328,6 @@ export const sparkRatioTrigger = {
   },
 };
 
-export const sparkQuotePriceTrigger = {
-  encode(
-    baseTokenAddress: EthereumAddress,
-    quoteTokenAddress: EthereumAddress,
-    price: number,
-    ratioState: RatioState,
-  ) {
-    // Price is always in 8 decimals
-    const _price = new Dec(price.toString()).mul(10 ** 8).floor().toString();
-    return [AbiCoder.encodeParameters(['address', 'address', 'uint256', 'uint8'], [baseTokenAddress, quoteTokenAddress, _price, ratioState])];
-  },
-  decode(
-    triggerData: TriggerData,
-  ): { baseTokenAddress: EthereumAddress, quoteTokenAddress: EthereumAddress, price: string, ratioState: RatioState } {
-    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
-    // Price is always in 8 decimals
-    const price = new Dec(decodedData[2] as string).div(10 ** 8).toDP(8).toString();
-    return {
-      price,
-      baseTokenAddress: decodedData[0] as EthereumAddress,
-      quoteTokenAddress: decodedData[1] as EthereumAddress,
-      ratioState: +decodedData[3]!,
-    };
-  },
-};
-
 export const curveUsdBorrowRateTrigger = {
   encode(
     market: EthereumAddress,
@@ -685,4 +659,65 @@ export const aaveV3QuotePriceRangeTrigger = {
       upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
     };
   },
+};
+
+export const sparkQuotePriceRangeTrigger = {
+  encode(
+    collToken: EthereumAddress,
+    debtToken: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    // Price is scaled to 1e8
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'uint256', 'uint256'],
+        [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      collToken: decodedData[0] as EthereumAddress,
+      debtToken: decodedData[1] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
+    };
+  },
+};
+
+export const morphoBluePriceRangeTrigger = {
+  encode(
+    oracle: EthereumAddress,
+    collateralToken: EthereumAddress,
+    loanToken: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
+  ) {
+    // Price is scaled to 1e8
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'address', 'uint256', 'uint256'],
+        [oracle, collateralToken, loanToken, lowerPriceFormatted, upperPriceFormatted],
+      ),
+    ];
+  },
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'address', 'uint256', 'uint256'], triggerData[0]);
+    return {
+      oracle: decodedData[0] as EthereumAddress,
+      collateralToken: decodedData[1] as EthereumAddress,
+      loanToken: decodedData[2] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[4] as string).div(1e8).toString(),
+    };
+  },
 };

package/src/services/utils.test.ts

@@ -1,19 +1,14 @@
 import { expect } from 'chai';
-import * as web3Utils from 'web3-utils';
-import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
 import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 
-import { sparkEncode } from './strategySubService';
-
 import '../configuration';
 import {
   addToArrayIf,
   addToObjectIf,
   compareAddresses,
-  compareSubHashes,
   encodeSubId,
   ethToWeth,
   getRatioStateInfoForAaveCloseStrategy,
@@ -199,60 +194,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 = sparkEncode.closeToAsset(...subDataToEncodeOne);
-    // @ts-ignore
-    const encodedSubDataTwo = sparkEncode.closeToAsset(...subDataToEncodeTwo);
-    const encodedParams = web3Utils.keccak256(AbiCoder.encodeParameter('(uint64,bool,bytes[],bytes32[])', encodedSubDataOne));
-
-    const examples: Array<[boolean, [string, any[]]]> = [
-      [true, [encodedParams, encodedSubDataOne]],
-      [false, [encodedParams, encodedSubDataTwo]],
-    ];
-
-    examples.forEach(([expected, actual]) => {
-      it(`Given ${actual} should return expected value: ${expected}`, () => {
-        expect(compareSubHashes(...actual)).to.equal(expected);
-      });
-    });
-  });
-
   describe('When testing utils.encodeSubId()', () => {
     const examples: Array<[string, string]> = [
       ['00000001', '1'],

package/src/types/enums.ts

@@ -186,8 +186,6 @@ export namespace Bundles {
     LIQUITY_BOOST = 17,
     SPARK_REPAY = 18,
     SPARK_BOOST = 19,
-    SPARK_CLOSE_TO_DEBT = -21231230, // @dev This was never deployed
-    SPARK_CLOSE_TO_COLLATERAL = -21231231, // @dev This was never deployed
     AAVE_V2_REPAY = 22,
     AAVE_V2_BOOST = 23,
     COMP_V2_REPAY = 20,
@@ -223,6 +221,8 @@ export namespace Bundles {
     AAVE_V3_EOA_REPAY_ON_PRICE = 54,
     AAVE_V3_EOA_BOOST_ON_PRICE = 55,
     AAVE_V3_EOA_CLOSE = 56,
+    SPARK_CLOSE = 57,
+    MORPHO_BLUE_CLOSE = 58,
   }
 
   export enum OptimismIds {
@@ -266,6 +266,7 @@ export namespace Bundles {
     AAVE_V3_EOA_REPAY_ON_PRICE = 25,
     AAVE_V3_EOA_BOOST_ON_PRICE = 26,
     AAVE_V3_EOA_CLOSE = 27,
+    MORPHO_BLUE_CLOSE = 28,
   }
 
   export enum ArbitrumIds {
@@ -297,6 +298,7 @@ export namespace Bundles {
     MORPHO_BLUE_BOOST_ON_PRICE = 25,
     MORPHO_BLUE_EOA_REPAY = 26,
     MORPHO_BLUE_EOA_BOOST = 27,
+    MORPHO_BLUE_CLOSE = 28,
   }
 }