@defisaver/automation-sdk 3.3.14 → 3.3.15-liq-prot-1-dev

package/src/services/subDataService.ts

@@ -164,6 +164,9 @@ 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,
@@ -184,6 +187,28 @@ 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 };
+  },
+};
+
+
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -207,6 +232,30 @@ export const liquityLeverageManagementSubData = {
     return { targetRatio };
   },
 };
+export const liquityLeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+
+    const isRepay = ratioState === RatioState.UNDER;
+    const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
+    const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+
+    const collActionTypeEncoded = AbiCoder.encodeParameter('uint8', collActionType);
+    const debtActionTypeEncoded = AbiCoder.encodeParameter('uint8', debtActionType);
+
+    return [encodedRatioState, encodedTargetRatio, collActionTypeEncoded, debtActionTypeEncoded];
+  },
+  decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[0]) as any as RatioState;
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]) as any as string);
+
+    return { targetRatio, ratioState };
+  },
+};
 export const liquityCloseSubData = {
   encode(
     closeToAssetAddr: EthereumAddress,
@@ -510,6 +559,33 @@ export const aaveV2LeverageManagementSubData = {
     return { targetRatio };
   },
 };
+export const aaveV2LeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    market: EthereumAddress,
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedMarket = AbiCoder.encodeParameter('address', market);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    const isBoost = ratioState === RatioState.OVER;
+
+    if (isBoost) {
+      const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+      return [encodedMarket, encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+    }
+
+    return [encodedMarket, encodedTargetRatio, encodedRatioState];
+  },
+  decode(subData: SubData): { market: EthereumAddress, targetRatio: number, ratioState: RatioState } {
+    const market = AbiCoder.decodeParameter('address', subData[0]) as any as EthereumAddress;
+    const targetRatio = weiToRatioPercentage(AbiCoder.decodeParameter('uint256', subData[1]) as any as string);
+    const ratioState = AbiCoder.decodeParameter('uint8', subData[2]) as any as RatioState;
+
+    return { market, targetRatio, ratioState };
+  },
+};
 
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
@@ -527,6 +603,9 @@ 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,
@@ -554,6 +633,30 @@ 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,
@@ -800,6 +903,9 @@ 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,
@@ -831,6 +937,39 @@ 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,
@@ -997,6 +1136,30 @@ export const compoundV2LeverageManagementSubData = {
     return { targetRatio };
   },
 };
+export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
+  encode(
+    targetRatio: number,
+    ratioState: RatioState,
+  ): SubData {
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    const isBoost = ratioState === RatioState.OVER;
+
+    if (isBoost) {
+      const enableAsCollEncoded = AbiCoder.encodeParameter('uint256', 1);
+      return [encodedTargetRatio, encodedRatioState, enableAsCollEncoded];
+    }
+
+    return [encodedTargetRatio, encodedRatioState];
+  },
+  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 };
+  },
+};
 
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
@@ -1006,70 +1169,59 @@ export const compoundV2LeverageManagementSubData = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
-export const compoundV3LeverageManagementSubData = {
+
+// ! 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: EthereumAddress,
     baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
+    targetRatio: number,
+    ratioState: RatioState,
   ): SubData {
-    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,
-    ];
+    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];
   },
-  decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
+  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);
 
-    return { targetRatio };
+    return {
+      market, baseToken, targetRatio, ratioState,
+    };
   },
 };
-export const compoundV3L2LeverageManagementSubData = {
+
+export const compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
-  ): string {
-    let subInput = '0x';
-
-    subInput = subInput.concat(market.slice(2));
-    subInput = subInput.concat(baseToken.slice(2));
-    subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
-      .padStart(32, '0'));
-    subInput = subInput.concat(boostEnabled ? '01' : '00');
-    subInput = subInput.concat(isEOA ? '01' : '00');
-
-    return subInput;
+    targetRatio: number,
+    ratioState: RatioState,
+  ): 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];
   },
-  decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(ratioWei);
+  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);
 
-    return { targetRatio };
+    return {
+      market, baseToken, targetRatio, ratioState,
+    };
   },
 };
+
 export const compoundV3LeverageManagementOnPriceSubData = {
   encode(
     market: EthereumAddress,
@@ -1205,6 +1357,21 @@ export const exchangeLimitOrderSubData = {
     return { fromToken, toToken, amount };
   },
 };
+export const exchangeLimitOrderSubDataWithoutSubProxy = {
+  encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string): SubData {
+    return [
+      AbiCoder.encodeParameter('address', fromToken),
+      AbiCoder.encodeParameter('address', toToken),
+      AbiCoder.encodeParameter('uint256', amount),
+    ];
+  },
+  decode: (subData: SubData, chainId: ChainId) => {
+    const fromToken = AbiCoder.decodeParameter('address', subData[0])!.toString();
+    const toToken = AbiCoder.decodeParameter('address', subData[1])!.toString();
+    const amount = assetAmountInEth(AbiCoder.decodeParameter('uint256', subData[2])!.toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
+    return { fromToken, toToken, amount };
+  },
+};
 
 /**
      _______..______      ___      .______       __  ___
@@ -1222,6 +1389,9 @@ 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,
@@ -1241,6 +1411,28 @@ 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,
@@ -1455,6 +1647,9 @@ 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,
@@ -1499,6 +1694,53 @@ 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,
@@ -1587,6 +1829,8 @@ _______  __       __    __   __   _______
 |  |     |  `----.|  `--'  | |  | |  '--'  |
 |__|     |_______| \______/  |__| |_______/
  */
+// ! 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,
@@ -1629,3 +1873,45 @@ 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/utils.test.ts

@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { getAssetInfo } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
-import { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
+import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 
 import '../configuration';
 import {
@@ -11,6 +11,7 @@ import {
   compareAddresses,
   encodeSubId,
   ethToWeth,
+  getCompoundV3LeverageManagementBundleId,
   getRatioStateInfoForAaveCloseStrategy,
   isAddress,
   isDefined,
@@ -369,4 +370,34 @@ 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,6 +5,7 @@ import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 
 import type { EthereumAddress } from '../types';
 import {
+  Bundles,
   ChainId, CloseStrategyType, CloseToAssetType, RatioState,
 } from '../types/enums';
 
@@ -171,4 +172,34 @@ 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,6 +153,8 @@ export namespace Strategies {
     EoaRepayOnPrice = 'eoa-repay-on-price',
     CollateralSwitch = 'collateral-switch',
     EoaCollateralSwitch = 'eoa-collateral-switch',
+    LiquidationProtection = 'liquidation-protection',
+    EoaLiquidationProtection = 'eoa-liquidation-protection',
   }
   export enum IdOverrides {
     TakeProfit = 'take-profit',
@@ -164,6 +166,8 @@ 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',
   }
 }
 
@@ -240,6 +244,17 @@ 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,
   }
 
   export enum OptimismIds {
@@ -254,6 +269,8 @@ 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 {
@@ -284,6 +301,12 @@ 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,
   }
 
   export enum ArbitrumIds {
@@ -316,7 +339,12 @@ 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,
   }
 }
-
-