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

package/src/services/subDataService.ts

@@ -164,9 +164,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: number,
@@ -187,28 +184,6 @@ export const makerLeverageManagementWithoutSubProxy = {
   },
 };
 
-export const makerLiquidationProtectionSubData = {
-  encode(
-    vaultId: number,
-    targetRatio: number,
-    daiAddr?: EthereumAddress,
-  ): SubData {
-    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: SubData): { vaultId: number, targetRatio: number, daiAddr: string } {
-    const vaultId = +AbiCoder.decodeParameter('uint256', subData[0])!.toString();
-    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]) as any as string);
-    const daiAddr = AbiCoder.decodeParameter('address', subData[2])!.toString();
-
-    return { vaultId, targetRatio, daiAddr };
-  },
-};
-
-
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -603,9 +578,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: number,
@@ -633,30 +605,6 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
     return { targetRatio, ratioState };
   },
 };
-
-export const aaveV3LiquidationProtectionSubData = {
-  encode(
-    targetRatio: number,
-    ratioState: RatioState,
-    market: EthereumAddress,
-    user: EthereumAddress,
-  ): SubData {
-    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: SubData): { targetRatio: number, ratioState: RatioState } {
-    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
-
-    return { targetRatio, ratioState };
-  },
-};
-
-
 export const aaveV3LeverageManagementOnPriceGeneric = {
   encode(
     collAsset: EthereumAddress,
@@ -903,9 +851,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: EthereumAddress,
@@ -937,39 +882,6 @@ export const aaveV4LeverageManagementSubData = {
     };
   },
 };
-
-export const aaveV4LiquidationProtectionSubData = {
-  encode: (
-    spoke: EthereumAddress,
-    owner: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-  ) => {
-    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: SubData) => {
-    const spoke = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const owner = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
-    const ratioState = Number(AbiCoder.decodeParameter('uint8', subData[2])) as RatioState;
-    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]) as any as string);
-    return {
-      spoke, owner, ratioState, targetRatio,
-    };
-  },
-};
-
 export const aaveV4LeverageManagementOnPriceSubData = {
   encode: (
     spoke: EthereumAddress,
@@ -1169,35 +1081,36 @@ 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 = {
+export const compoundV3LeverageManagementSubData = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    targetRatio: number,
-    ratioState: RatioState,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+    isEOA: boolean,
   ): SubData {
-    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];
+    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: SubData): { market: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState } {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as any as EthereumAddress;
-    const baseToken = AbiCoder.decodeParameter('address', subData[1]) as any as EthereumAddress;
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[2]) as any as RatioState;
-    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[3]) as any as string);
+  decode(subData: SubData): { targetRatio: number } {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
 
-    return {
-      market, baseToken, targetRatio, ratioState,
-    };
+    return { targetRatio };
   },
 };
-
-export const compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
+export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
@@ -1221,7 +1134,6 @@ export const compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
     };
   },
 };
-
 export const compoundV3LeverageManagementOnPriceSubData = {
   encode(
     market: EthereumAddress,
@@ -1389,9 +1301,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: number,
@@ -1411,28 +1320,6 @@ export const sparkLeverageManagementSubDataWithoutSubProxy = {
     return { targetRatio, ratioState };
   },
 };
-
-export const sparkLiquidationProtectionSubData = {
-  encode(
-    targetRatio: number,
-    ratioState: RatioState,
-  ): SubData {
-    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: SubData): { targetRatio: number, ratioState: RatioState } {
-    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[0]) as any as string);
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[1]) as any as RatioState;
-
-    return { targetRatio, ratioState };
-  },
-};
-
-
 export const sparkCloseGenericSubData = {
   encode(
     collAsset: EthereumAddress,
@@ -1647,9 +1534,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: EthereumAddress,
@@ -1694,53 +1578,6 @@ export const morphoBlueLeverageManagementSubData = {
     };
   },
 };
-
-export const morphoBlueLiquidationProtectionSubData = {
-  encode: (
-    loanToken: EthereumAddress,
-    collToken: EthereumAddress,
-    oracle: EthereumAddress,
-    irm: EthereumAddress,
-    lltv: string,
-    ratioState: RatioState,
-    targetRatio: number,
-    user: EthereumAddress,
-    isEOA: boolean,
-  ) => {
-    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: 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 weiRatio = AbiCoder.decodeParameter('uint256', subData[6]) as any as EthereumAddress;
-    const user = AbiCoder.decodeParameter('address', subData[7]) as any as EthereumAddress;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      loanToken,
-      collToken,
-      oracle,
-      irm,
-      lltv,
-      user,
-      targetRatio,
-    };
-  },
-};
-
-
 export const morphoBlueLeverageManagementOnPriceSubData = {
   encode(
     loanToken: EthereumAddress,
@@ -1829,8 +1666,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: string,
@@ -1873,45 +1708,3 @@ export const fluidLeverageManagementSubData = {
     };
   },
 };
-
-export const fluidLiquidationProtectionSubData = {
-  encode: (
-    nftId: string,
-    vault: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-  ) => {
-    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: SubData) => {
-    const nftId = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
-    const vault = AbiCoder.decodeParameter('address', subData[1]) as unknown as EthereumAddress;
-    const ratioState = AbiCoder.decodeParameter('uint8', subData[2]) as any as RatioState;
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return {
-      nftId, vault, ratioState, targetRatio,
-    };
-  },
-};

package/src/services/triggerService.test.ts

@@ -32,6 +32,7 @@ import {
   compoundV3PriceRangeTrigger,
   aaveV3QuotePriceRangeTrigger,
   morphoBluePriceRangeTrigger,
+  morphoBluePriceTrigger,
   sparkQuotePriceTrigger,
   aaveV4RatioTrigger,
   aaveV4QuotePriceTrigger,
@@ -1287,6 +1288,74 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+
+  describe('When testing triggerService.morphoBluePriceTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, price: number, priceState: RatioState]]> = [
+        [
+          ['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: Array<[
+        { oracle: EthereumAddress, collateralToken: EthereumAddress, loanToken: EthereumAddress, price: string, priceState: RatioState },
+        TriggerData,
+      ]> = [
+        [
+          {
+            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: Array<[[string], [owner: EthereumAddress, spoke: EthereumAddress, ratioPercentage: number, ratioState: RatioState]]> = [

package/src/services/utils.test.ts

@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
-import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
+import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 
 import '../configuration';
 import {
@@ -11,7 +11,6 @@ import {
   compareAddresses,
   encodeSubId,
   ethToWeth,
-  getCompoundV3LeverageManagementBundleId,
   getRatioStateInfoForAaveCloseStrategy,
   isAddress,
   isDefined,
@@ -370,34 +369,4 @@ describe('Feature: utils.ts', () => {
       });
     });
   });
-
-  describe('When testing utils.getCompoundV3LeverageManagementBundleId()', () => {
-    // Mainnet uses the V2 bundle ids; L2s use the original bundle ids.
-    const examples: Array<[number, [network: ChainId, isEOA: boolean, isBoost: boolean]]> = [
-      [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);
-    });
-  });
 });

package/src/services/utils.ts

@@ -5,7 +5,6 @@ import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
 import {
-  Bundles,
   ChainId, CloseStrategyType, CloseToAssetType, RatioState,
 } from '../types/enums';
 
@@ -172,34 +171,4 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(
     default:
       throw new Error('CloseStrategyType not supported');
   }
-}
-
-export function getBundleIdsByNetwork(network: ChainId) {
-  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: ChainId, isEOA: boolean, isBoost: boolean): number {
-  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/src/types/enums.ts

@@ -153,8 +153,6 @@ export namespace Strategies {
     EoaRepayOnPrice = 'eoa-repay-on-price',
     CollateralSwitch = 'collateral-switch',
     EoaCollateralSwitch = 'eoa-collateral-switch',
-    LiquidationProtection = 'liquidation-protection',
-    EoaLiquidationProtection = 'liquidation-protection-eoa',
   }
   export enum IdOverrides {
     TakeProfit = 'take-profit',
@@ -166,8 +164,6 @@ export namespace Strategies {
     EoaLeverageManagement = 'leverage-management-eoa',
     LeverageManagementOnPrice = 'leverage-management-on-price',
     EoaLeverageManagementOnPrice = 'leverage-management-on-price-eoa',
-    LiquidationProtection = 'liquidation-protection',
-    EoaLiquidationProtection = 'liquidation-protection-eoa',
   }
 }
 
@@ -244,17 +240,7 @@ export namespace Bundles {
     AAVE_V4_EOA_REPAY_ON_PRICE = 68,
     AAVE_V4_EOA_BOOST_ON_PRICE = 69,
     AAVE_V4_EOA_CLOSE = 70,
-    AAVE_V3_SW_LIQUIDATION_PROTECTION = 71,
-    SPARK_SW_LIQUIDATION_PROTECTION = 72,
-    MAKER_SW_LIQUIDATION_PROTECTION = 75,
-    FLUID_T1_SW_LIQUIDATION_PROTECTION = 76,
-    AAVE_V4_SW_LIQUIDATION_PROTECTION = 77,
-    MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 78,
-    AAVE_V3_EOA_LIQUIDATION_PROTECTION = 79,
-    AAVE_V4_EOA_LIQUIDATION_PROTECTION = 80,
-    MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 81,
-    COMP_V3_SW_LIQUIDATION_PROTECTION = 82,
-    COMP_V3_EOA_LIQUIDATION_PROTECTION = 83,
+    MORPHO_BLUE_REPAY_ON_PRICE = 84,
   }
 
   export enum OptimismIds {
@@ -269,8 +255,6 @@ export namespace Bundles {
     AAVE_V3_EOA_REPAY_ON_PRICE = 8,
     AAVE_V3_EOA_BOOST_ON_PRICE = 9,
     AAVE_V3_EOA_CLOSE = 10,
-    AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
-    AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
   }
 
   export enum BaseIds {
@@ -301,12 +285,7 @@ export namespace Bundles {
     AAVE_V3_EOA_BOOST_ON_PRICE = 26,
     AAVE_V3_EOA_CLOSE = 27,
     MORPHO_BLUE_CLOSE = 28,
-    AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
-    FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
-    COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
-    COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
-    AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
-    MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 35,
+    MORPHO_BLUE_REPAY_ON_PRICE = 36,
   }
 
   export enum ArbitrumIds {
@@ -339,12 +318,8 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_REPAY = 26,
     MORPHO_BLUE_EOA_BOOST = 27,
     MORPHO_BLUE_CLOSE = 28,
-    AAVE_V3_SW_LIQUIDATION_PROTECTION = 29,
-    FLUID_T1_SW_LIQUIDATION_PROTECTION = 30,
-    MORPHO_BLUE_SW_LIQUIDATION_PROTECTION = 31,
-    COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
-    COMP_V3_EOA_LIQUIDATION_PROTECTION = 33,
-    AAVE_V3_EOA_LIQUIDATION_PROTECTION = 34,
-    MORPHO_BLUE_EOA_LIQUIDATION_PROTECTION = 35,
+    MORPHO_BLUE_REPAY_ON_PRICE = 36,
   }
 }
+
+