@defisaver/automation-sdk 3.3.15-liq-prot-2-dev → 3.3.16

package/esm/services/subDataService.js

@@ -125,8 +125,6 @@ export const makerLeverageManagementSubData = {
         return { vaultId, targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in makerLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 export const makerLeverageManagementWithoutSubProxy = {
     encode(vaultId, targetRatio, daiAddr) {
         const encodedVaultId = AbiCoder.encodeParameter('uint256', vaultId);
@@ -141,20 +139,6 @@ export const makerLeverageManagementWithoutSubProxy = {
         return { vaultId, targetRatio, daiAddr };
     },
 };
-export const makerLiquidationProtectionSubData = {
-    encode(vaultId, targetRatio, daiAddr) {
-        const encodedVaultId = AbiCoder.encodeParameter('uint256', vaultId);
-        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        const encodedDaiAddr = AbiCoder.encodeParameter('address', daiAddr || getAssetInfo('DAI', 1).address);
-        return [encodedVaultId, encodedTargetRatio, encodedDaiAddr];
-    },
-    decode(subData) {
-        const vaultId = +AbiCoder.decodeParameter('uint256', subData[0]).toString();
-        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]));
-        const daiAddr = AbiCoder.decodeParameter('address', subData[2]).toString();
-        return { vaultId, targetRatio, daiAddr };
-    },
-};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -459,8 +443,6 @@ export const aaveV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in aaveV3LiquidationProtectionSubData as well
-// ! Double check before changing. Liquidation protection is using Generic encoding for both - EOA and SW
 export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState, market, user, isGeneric) {
         const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
@@ -480,20 +462,6 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
-export const aaveV3LiquidationProtectionSubData = {
-    encode(targetRatio, ratioState, market, user) {
-        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
-        const encodedMarket = AbiCoder.encodeParameter('address', market);
-        const encodedUser = AbiCoder.encodeParameter('address', user);
-        return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
-    },
-    decode(subData) {
-        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
-        return { targetRatio, ratioState };
-    },
-};
 export const aaveV3LeverageManagementOnPriceGeneric = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, marketAddr, targetRatio, user) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);
@@ -655,8 +623,6 @@ export const aaveV3LeverageManagementOnPriceSubData = {
  /  _____  \   /  _____  \  \    /    |  |____       \    /       | |
 /__/     \__\ /__/     \__\  \__/     |_______|       \__/        |_|
  */
-// ! Any change here will PROBABLY require a change in aaveV4LiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 export const aaveV4LeverageManagementSubData = {
     encode: (spoke, owner, ratioState, targetRatio) => {
         const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
@@ -683,32 +649,6 @@ export const aaveV4LeverageManagementSubData = {
         };
     },
 };
-export const aaveV4LiquidationProtectionSubData = {
-    encode: (spoke, owner, ratioState, targetRatio) => {
-        const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
-        const ownerEncoded = AbiCoder.encodeParameter('address', owner);
-        const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        // Add two empty slots for future addons (e.g tsi or slippage settings)
-        return [
-            spokeEncoded,
-            ownerEncoded,
-            ratioStateEncoded,
-            targetRatioEncoded,
-            EMPTY_SLOT,
-            EMPTY_SLOT,
-        ];
-    },
-    decode: (subData) => {
-        const spoke = AbiCoder.decodeParameter('address', subData[0]);
-        const owner = AbiCoder.decodeParameter('address', subData[1]);
-        const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[2]));
-        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]));
-        return {
-            spoke, owner, ratioState, targetRatio,
-        };
-    },
-};
 export const aaveV4LeverageManagementOnPriceSubData = {
     encode: (spoke, owner, collAsset, collAssetId, debtAsset, debtAssetId, ratioState, targetRatio) => {
         const spokeEncoded = AbiCoder.encodeParameter('address', spoke);
@@ -867,27 +807,26 @@ export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubDataWithoutSubProxy as well, since it is copy paste
-// ! Double check before changing
-export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
-    encode(market, baseToken, targetRatio, ratioState) {
-        const encodedMarket = AbiCoder.encodeParameter('address', market);
-        const encodedBaseToken = AbiCoder.encodeParameter('address', baseToken);
-        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
-        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        return [encodedMarket, encodedBaseToken, encodedRatioState, encodedTargetRatio];
+export const compoundV3LeverageManagementSubData = {
+    encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        return [
+            market,
+            baseToken,
+            new Dec(triggerRepayRatio).mul(1e16).toString(),
+            new Dec(triggerBoostRatio).mul(1e16).toString(),
+            new Dec(targetBoostRatio).mul(1e16).toString(),
+            new Dec(targetRepayRatio).mul(1e16).toString(),
+            // @ts-ignore // TODO
+            boostEnabled, isEOA,
+        ];
     },
     decode(subData) {
-        const market = AbiCoder.decodeParameter('address', subData[0]);
-        const baseToken = AbiCoder.decodeParameter('address', subData[1]);
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
-        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]));
-        return {
-            market, baseToken, targetRatio, ratioState,
-        };
+        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
     },
 };
-export const compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
+export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
     encode(market, baseToken, targetRatio, ratioState) {
         const encodedMarket = AbiCoder.encodeParameter('address', market);
         const encodedBaseToken = AbiCoder.encodeParameter('address', baseToken);
@@ -1038,8 +977,6 @@ export const sparkLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-// ! Any change here will PROBABLY require a change in sparkLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 export const sparkLeverageManagementSubDataWithoutSubProxy = {
     encode(targetRatio, ratioState) {
         const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
@@ -1054,20 +991,6 @@ export const sparkLeverageManagementSubDataWithoutSubProxy = {
         return { targetRatio, ratioState };
     },
 };
-export const sparkLiquidationProtectionSubData = {
-    encode(targetRatio, ratioState) {
-        const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
-        const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
-        const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
-        return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
-    },
-    decode(subData) {
-        const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]));
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[1]);
-        return { targetRatio, ratioState };
-    },
-};
 export const sparkCloseGenericSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user) {
         const encodedColl = AbiCoder.encodeParameter('address', collAsset);
@@ -1216,8 +1139,6 @@ export const crvUSDPaybackSubData = {
 |  |  |  | |  `--'  | |  |\  \----.|  |      |  |  |  | |  `--'  |
 |__|  |__|  \______/  | _| `._____|| _|      |__|  |__|  \______/
  */
-// ! Any change here will PROBABLY require a change in morphoBlueLiquidationProtectionSubData as well, since it is copy paste
-// ! Double check before changing
 export const morphoBlueLeverageManagementSubData = {
     encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -1251,39 +1172,6 @@ export const morphoBlueLeverageManagementSubData = {
         };
     },
 };
-export const morphoBlueLiquidationProtectionSubData = {
-    encode: (loanToken, collToken, oracle, irm, lltv, ratioState, targetRatio, user, isEOA) => {
-        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 ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        const userEncoded = AbiCoder.encodeParameter('address', user);
-        const isEOAEncoded = AbiCoder.encodeParameter('bool', isEOA);
-        return [loanTokenEncoded, collTokenEncoded, oracleEncoded, irmEncoded, lltvEncoded, ratioStateEncoded, targetRatioEncoded, userEncoded, isEOAEncoded];
-    },
-    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 weiRatio = AbiCoder.decodeParameter('uint256', subData[6]);
-        const user = AbiCoder.decodeParameter('address', subData[7]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return {
-            loanToken,
-            collToken,
-            oracle,
-            irm,
-            lltv,
-            user,
-            targetRatio,
-        };
-    },
-};
 export const morphoBlueLeverageManagementOnPriceSubData = {
     encode(loanToken, collToken, oracle, irm, lltv, targetRatio, user) {
         const loanTokenEncoded = AbiCoder.encodeParameter('address', loanToken);
@@ -1353,8 +1241,6 @@ _______  __       __    __   __   _______
 |  |     |  `----.|  `--'  | |  | |  '--'  |
 |__|     |_______| \______/  |__| |_______/
  */
-// ! Any change here will PROBABLY require a change in fluidLeverageManagementSubData as well, since it is copy paste
-// ! Double check before changing
 export const fluidLeverageManagementSubData = {
     encode: (nftId, vault, ratioState, targetRatio) => {
         const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
@@ -1388,35 +1274,3 @@ export const fluidLeverageManagementSubData = {
         };
     },
 };
-export const fluidLiquidationProtectionSubData = {
-    encode: (nftId, vault, ratioState, targetRatio) => {
-        const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
-        const vaultEncoded = AbiCoder.encodeParameter('address', vault);
-        const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
-        const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
-        const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
-        const collActionType = CollActionType.WITHDRAW;
-        const debtActionType = DebtActionType.PAYBACK;
-        const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
-        const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
-        return [
-            nftIdEncoded,
-            vaultEncoded,
-            ratioStateEncoded,
-            targetRatioEncoded,
-            wrapEthEncoded,
-            collActionTypeEncoded,
-            debtActionTypeEncoded,
-        ];
-    },
-    decode: (subData) => {
-        const nftId = AbiCoder.decodeParameter('uint256', subData[0]);
-        const vault = AbiCoder.decodeParameter('address', subData[1]);
-        const ratioState = AbiCoder.decodeParameter('uint8', subData[2]);
-        const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
-        const targetRatio = weiToRatioPercentage(weiRatio);
-        return {
-            nftId, vault, ratioState, targetRatio,
-        };
-    },
-};

package/esm/services/subDataService.test.js

@@ -685,6 +685,74 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        new Dec(160).mul(1e16).toString(),
+                        new Dec(220).mul(1e16).toString(),
+                        new Dec(180).mul(1e16).toString(),
+                        new Dec(190).mul(1e16).toString(),
+                        true, false,
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0x1C0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress(getAssetInfo('USDC', ChainId.Ethereum).address),
+                        160, 220, 180, 190,
+                        true, false,
+                    ]
+                ],
+                [
+                    [
+                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        new Dec(160).mul(1e16).toString(),
+                        new Dec(210).mul(1e16).toString(),
+                        new Dec(180).mul(1e16).toString(),
+                        new Dec(190).mul(1e16).toString(),
+                        false, true,
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xaC0F620155e85491f8D35440eb17538Ca5c55212'),
+                        web3Utils.toChecksumAddress(getAssetInfo('WETH', ChainId.Ethereum).address),
+                        160, 210, 180, 190,
+                        false, true,
+                    ]
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.compoundV3LeverageManagementSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    { targetRatio: 123 },
+                    [
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+                    ],
+                ],
+                [
+                    { targetRatio: 200 },
+                    [
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.compoundV3LeverageManagementSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.morphoAaveV2LeverageManagementSubData', () => {
         describe('encode()', () => {
             const examples = [
@@ -1383,6 +1451,106 @@ describe('Feature: subDataService.ts', () => {
             });
         });
     });
+    describe('When testing subDataService.morphoBlueLeverageManagementOnPriceSubData', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        200,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                    ],
+                ],
+                [
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                    [
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x0000000000000000000000000000000000000000'),
+                        '945000000000000000',
+                        160,
+                        web3Utils.toChecksumAddress('0x1031d218133AFaB8c2B819B1366c7E434Ad91E9c'),
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(subDataService.morphoBlueLeverageManagementOnPriceSubData.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        targetRatio: 200,
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                ],
+                [
+                    {
+                        loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                        collToken: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0',
+                        oracle: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
+                        irm: '0x0000000000000000000000000000000000000000',
+                        lltv: '945000000000000000',
+                        targetRatio: 160,
+                        user: '0x1031d218133AFaB8C2B819B1366c7e434Ad91e9c',
+                    },
+                    [
+                        '0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+                        '0x0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
+                        '0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc',
+                        '0x0000000000000000000000000000000000000000000000000000000000000000',
+                        '0x0000000000000000000000000000000000000000000000000d1d507e40be8000',
+                        '0x00000000000000000000000000000000000000000000000016345785d8a00000',
+                        '0x0000000000000000000000001031d218133afab8c2b819b1366c7e434ad91e9c',
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(subDataService.morphoBlueLeverageManagementOnPriceSubData.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing subDataService.aaveV3LeverageManagementOnPriceSubData', () => {
         describe('encode()', () => {
             const examples = [

package/esm/services/triggerService.test.js

@@ -3,7 +3,7 @@ import { getAssetInfo, MAXUINT } from '@defisaver/tokens';
 import * as web3Utils from 'web3-utils';
 import { ChainId, OrderType, RatioState } from '../types/enums';
 import '../configuration';
-import { aaveV2RatioTrigger, aaveV3QuotePriceTrigger, aaveV3QuotePriceWithMaximumGasPriceTrigger, aaveV3RatioTrigger, cBondsRebondTrigger, chainlinkPriceTrigger, compoundV2RatioTrigger, compoundV3RatioTrigger, compoundV3PriceTrigger, curveUsdBorrowRateTrigger, curveUsdSoftLiquidationTrigger, exchangeOffchainPriceTrigger, exchangeTimestampTrigger, liquityDebtInFrontTrigger, makerRatioTrigger, morphoAaveV2RatioTrigger, sparkRatioTrigger, trailingStopTrigger, liquityDebtInFrontWithLimitTrigger, crvUSDRatioTrigger, morphoBlueRatioTrigger, crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger, compoundV3PriceRangeTrigger, aaveV3QuotePriceRangeTrigger, morphoBluePriceRangeTrigger, sparkQuotePriceTrigger, aaveV4RatioTrigger, aaveV4QuotePriceTrigger, aaveV4QuotePriceRangeTrigger, } 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, morphoBluePriceTrigger, sparkQuotePriceTrigger, aaveV4RatioTrigger, aaveV4QuotePriceTrigger, aaveV4QuotePriceRangeTrigger, } from './triggerService';
 describe('Feature: triggerService.ts', () => {
     describe('When testing triggerService.chainlinkPriceTrigger', () => {
         describe('encode()', () => {
@@ -1159,6 +1159,66 @@ describe('Feature: triggerService.ts', () => {
             });
         });
     });
+    describe('When testing triggerService.morphoBluePriceTrigger', () => {
+        describe('encode()', () => {
+            const examples = [
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                    [
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        2500,
+                        RatioState.UNDER,
+                    ],
+                ],
+                [
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+                    [
+                        web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        4000,
+                        RatioState.OVER,
+                    ],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${expected}`, () => {
+                    expect(morphoBluePriceTrigger.encode(...actual)).to.eql(expected);
+                });
+            });
+        });
+        describe('decode()', () => {
+            const examples = [
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        price: '2500',
+                        priceState: RatioState.UNDER,
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000003a352944000000000000000000000000000000000000000000000000000000000000000001'],
+                ],
+                [
+                    {
+                        oracle: web3Utils.toChecksumAddress('0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC'),
+                        collateralToken: web3Utils.toChecksumAddress('0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0'),
+                        loanToken: web3Utils.toChecksumAddress('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'),
+                        price: '4000',
+                        priceState: RatioState.OVER,
+                    },
+                    ['0x000000000000000000000000870ac11d48b15db9a138cf899d20f13f79ba00bc0000000000000000000000007f39c581f595b53c5cb19bd0b3f8da6c935e2ca0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000005d21dba0000000000000000000000000000000000000000000000000000000000000000000'],
+                ],
+            ];
+            examples.forEach(([expected, actual]) => {
+                it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+                    expect(morphoBluePriceTrigger.decode(actual)).to.eql(expected);
+                });
+            });
+        });
+    });
     describe('When testing triggerService.aaveV4RatioTrigger', () => {
         describe('encode()', () => {
             const examples = [

package/esm/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
 export declare function isDefined<T>(value: T): value is NonNullable<T>;
 export declare function isUndefined(value: unknown): boolean;
 export declare function compareAddresses(firstAddress: EthereumAddress, secondAddress: EthereumAddress): boolean;
@@ -28,5 +28,3 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;
 };
-export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.ArbitrumIds | typeof Bundles.BaseIds;
-export declare function getCompoundV3LeverageManagementBundleId(network: ChainId, isEOA: boolean, isBoost: boolean): number;

package/esm/services/utils.js

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import * as web3Utils from 'web3-utils';
 import AbiCoder from 'web3-eth-abi';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
-import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
+import { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -137,34 +137,3 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyTyp
             throw new Error('CloseStrategyType not supported');
     }
 }
-export function getBundleIdsByNetwork(network) {
-    switch (Number(network)) {
-        case ChainId.Ethereum:
-            return Bundles.MainnetIds;
-        case ChainId.Arbitrum:
-            return Bundles.ArbitrumIds;
-        case ChainId.Base:
-            return Bundles.BaseIds;
-        default:
-            throw new Error(`Unsupported network ${network}`);
-    }
-}
-// Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
-export function getCompoundV3LeverageManagementBundleId(network, isEOA, isBoost) {
-    switch (Number(network)) {
-        case ChainId.Ethereum:
-            if (isEOA)
-                return isBoost ? Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE;
-            return isBoost ? Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE : Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE;
-        case ChainId.Base:
-            if (isEOA)
-                return isBoost ? Bundles.BaseIds.COMP_V3_EOA_BOOST : Bundles.BaseIds.COMP_V3_EOA_REPAY;
-            return isBoost ? Bundles.BaseIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.BaseIds.COMP_V3_SW_REPAY_BUNDLE;
-        case ChainId.Arbitrum:
-            if (isEOA)
-                return isBoost ? Bundles.ArbitrumIds.COMP_V3_EOA_BOOST : Bundles.ArbitrumIds.COMP_V3_EOA_REPAY;
-            return isBoost ? Bundles.ArbitrumIds.COMP_V3_SW_BOOST_BUNDLE : Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE;
-        default:
-            throw new Error(`Compound V3 leverage management is not supported on network ${network}`);
-    }
-}

package/esm/services/utils.test.js

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
-import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 import '../configuration';
-import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getCompoundV3LeverageManagementBundleId, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
+import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
 describe('Feature: utils.ts', () => {
     describe('When testing utils.isDefined()', () => {
         const examples = [
@@ -294,29 +294,4 @@ describe('Feature: utils.ts', () => {
             });
         });
     });
-    describe('When testing utils.getCompoundV3LeverageManagementBundleId()', () => {
-        // Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
-        const examples = [
-            [Bundles.MainnetIds.COMP_V3_SW_REPAY_V2_BUNDLE, [ChainId.Ethereum, false, false]],
-            [Bundles.MainnetIds.COMP_V3_SW_BOOST_V2_BUNDLE, [ChainId.Ethereum, false, true]],
-            [Bundles.MainnetIds.COMP_V3_EOA_REPAY_V2_BUNDLE, [ChainId.Ethereum, true, false]],
-            [Bundles.MainnetIds.COMP_V3_EOA_BOOST_V2_BUNDLE, [ChainId.Ethereum, true, true]],
-            [Bundles.BaseIds.COMP_V3_SW_REPAY_BUNDLE, [ChainId.Base, false, false]],
-            [Bundles.BaseIds.COMP_V3_SW_BOOST_BUNDLE, [ChainId.Base, false, true]],
-            [Bundles.BaseIds.COMP_V3_EOA_REPAY, [ChainId.Base, true, false]],
-            [Bundles.BaseIds.COMP_V3_EOA_BOOST, [ChainId.Base, true, true]],
-            [Bundles.ArbitrumIds.COMP_V3_SW_REPAY_BUNDLE, [ChainId.Arbitrum, false, false]],
-            [Bundles.ArbitrumIds.COMP_V3_SW_BOOST_BUNDLE, [ChainId.Arbitrum, false, true]],
-            [Bundles.ArbitrumIds.COMP_V3_EOA_REPAY, [ChainId.Arbitrum, true, false]],
-            [Bundles.ArbitrumIds.COMP_V3_EOA_BOOST, [ChainId.Arbitrum, true, true]],
-        ];
-        examples.forEach(([expected, actual]) => {
-            it(`Given ${actual} should return expected value: ${expected}`, () => {
-                expect(getCompoundV3LeverageManagementBundleId(...actual)).to.equal(expected);
-            });
-        });
-        it(`Given ${ChainId.Optimism} (unsupported) should throw an error`, () => {
-            expect(() => getCompoundV3LeverageManagementBundleId(ChainId.Optimism, false, false)).to.throw(Error);
-        });
-    });
 });