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

package/esm/services/subDataService.d.ts

@@ -71,6 +71,14 @@ export declare const makerLeverageManagementWithoutSubProxy: {
         daiAddr: string;
     };
 };
+export declare const makerLiquidationProtectionSubData: {
+    encode(vaultId: number, targetRatio: number, daiAddr?: EthereumAddress): string[];
+    decode(subData: string[]): {
+        vaultId: number;
+        targetRatio: number;
+        daiAddr: string;
+    };
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -212,6 +220,13 @@ export declare const aaveV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const aaveV3LiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState, market: EthereumAddress, user: EthereumAddress): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const aaveV3LeverageManagementOnPriceGeneric: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, marketAddr: EthereumAddress, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -284,6 +299,15 @@ export declare const aaveV4LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const aaveV4LiquidationProtectionSubData: {
+    encode: (spoke: EthereumAddress, owner: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        spoke: string;
+        owner: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};
 export declare const aaveV4LeverageManagementOnPriceSubData: {
     encode: (spoke: EthereumAddress, owner: EthereumAddress, collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, ratioState: RatioState, targetRatio: number) => string[];
     decode: (subData: string[]) => {
@@ -365,6 +389,18 @@ export declare const compoundV3LeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const compoundV3LiquidationProtectionSubData: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
+export declare const compoundV3L2LiquidationProtectionSubData: {
+    encode(market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean): string;
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const compoundV3LeverageManagementOnPriceSubData: {
     encode(market: EthereumAddress, collToken: EthereumAddress, baseToken: EthereumAddress, targetRatio: number, ratioState: RatioState, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -439,6 +475,13 @@ export declare const sparkLeverageManagementSubDataWithoutSubProxy: {
         ratioState: RatioState;
     };
 };
+export declare const sparkLiquidationProtectionSubData: {
+    encode(targetRatio: number, ratioState: RatioState): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+        ratioState: RatioState;
+    };
+};
 export declare const sparkCloseGenericSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, closeType: CloseStrategyType, marketAddr: EthereumAddress, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -517,6 +560,18 @@ export declare const morphoBlueLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const morphoBlueLiquidationProtectionSubData: {
+    encode: (loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, ratioState: RatioState, targetRatio: number, user: EthereumAddress, isEOA: boolean) => string[];
+    decode: (subData: string[]) => {
+        loanToken: string;
+        collToken: string;
+        oracle: string;
+        irm: string;
+        lltv: string;
+        user: string;
+        targetRatio: number;
+    };
+};
 export declare const morphoBlueLeverageManagementOnPriceSubData: {
     encode(loanToken: EthereumAddress, collToken: EthereumAddress, oracle: EthereumAddress, irm: EthereumAddress, lltv: string, targetRatio: number, user: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -558,3 +613,12 @@ export declare const fluidLeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const fluidLiquidationProtectionSubData: {
+    encode: (nftId: string, vault: EthereumAddress, ratioState: RatioState, targetRatio: number) => string[];
+    decode: (subData: string[]) => {
+        nftId: string;
+        vault: string;
+        ratioState: RatioState;
+        targetRatio: number;
+    };
+};

package/esm/services/subDataService.js

@@ -125,6 +125,8 @@ 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);
@@ -139,6 +141,20 @@ 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 };
+    },
+};
 /**
   __       __    ______      __    __   __  .___________.____    ____    ____    ____  __
 |  |     |  |  /  __  \    |  |  |  | |  | |           |\   \  /   /    \   \  /   / /_ |
@@ -443,6 +459,8 @@ 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));
@@ -462,6 +480,20 @@ 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);
@@ -623,6 +655,8 @@ 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);
@@ -649,6 +683,32 @@ 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);
@@ -807,6 +867,8 @@ export const compoundV2LeverageManagementSubDataWithoutSubProxy = {
 |  `----.|  `--'  | |  |  |  | |  |            \    /     ___) |
  \______| \______/  |__|  |__| | _|             \__/     |____/
  */
+// ! Any change here will PROBABLY require a change in compoundV3LiquidationProtectionSubData as well, since it is copy paste
+// ! Double check before changing
 export const compoundV3LeverageManagementSubData = {
     encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
         return [
@@ -826,6 +888,8 @@ export const compoundV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+// ! Any change here will PROBABLY require a change in compoundV3L2LiquidationProtectionSubData 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);
@@ -844,6 +908,52 @@ export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
         };
     },
 };
+export const compoundV3LiquidationProtectionSubData = {
+    encode(market, baseToken, triggerRepayRatio, 
+    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
+    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 weiRatio = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
+export const compoundV3L2LiquidationProtectionSubData = {
+    encode(market, baseToken, triggerRepayRatio, 
+    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
+    triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA) {
+        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;
+    },
+    decode(subData) {
+        const ratioWei = AbiCoder.decodeParameter('uint256', subData[3]);
+        const targetRatio = weiToRatioPercentage(ratioWei);
+        return { targetRatio };
+    },
+};
 export const compoundV3LeverageManagementOnPriceSubData = {
     encode(market, collToken, baseToken, targetRatio, ratioState, user) {
         const marketEncoded = AbiCoder.encodeParameter('address', market);
@@ -977,6 +1087,8 @@ 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));
@@ -991,6 +1103,20 @@ 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);
@@ -1139,6 +1265,8 @@ 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);
@@ -1172,6 +1300,39 @@ 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);
@@ -1241,6 +1402,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, vault, ratioState, targetRatio) => {
         const nftIdEncoded = AbiCoder.encodeParameter('uint256', nftId);
@@ -1248,9 +1411,40 @@ export const fluidLeverageManagementSubData = {
         const ratioStateEncoded = AbiCoder.encodeParameter('uint8', ratioState);
         const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
         const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
-        const isRepay = ratioState === RatioState.UNDER;
-        const collActionType = isRepay ? CollActionType.WITHDRAW : CollActionType.SUPPLY;
-        const debtActionType = isRepay ? DebtActionType.PAYBACK : DebtActionType.BORROW;
+        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,
+        };
+    },
+};
+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 [

package/esm/services/utils.d.ts

@@ -1,5 +1,5 @@
 import type { EthereumAddress } from '../types';
-import { ChainId, CloseStrategyType, CloseToAssetType, RatioState } from '../types/enums';
+import { Bundles, 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,3 +28,5 @@ export declare function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStr
     stopLossType: CloseToAssetType | undefined;
     takeProfitType: CloseToAssetType | undefined;
 };
+export declare function getBundleIdsByNetwork(network: ChainId): typeof Bundles.MainnetIds | typeof Bundles.OptimismIds | 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 { ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
+import { Bundles, ChainId, CloseStrategyType, CloseToAssetType, RatioState, } from '../types/enums';
 export function isDefined(value) {
     return value !== undefined && value !== null;
 }
@@ -137,3 +137,34 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(closeStrategyTyp
             throw new Error('CloseStrategyType not supported');
     }
 }
+export function getBundleIdsByNetwork(network) {
+    switch (network) {
+        case ChainId.Arbitrum:
+            return Bundles.ArbitrumIds;
+        case ChainId.Base:
+            return Bundles.BaseIds;
+        case ChainId.Optimism:
+            return Bundles.OptimismIds;
+        default:
+            return Bundles.MainnetIds;
+    }
+}
+// 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 { ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
+import { Bundles, ChainId, ProtocolIdentifiers, RatioState } from '../types/enums';
 import '../configuration';
-import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getRatioStateInfoForAaveCloseStrategy, isAddress, isDefined, isEmptyBytes, isRatioStateOver, isRatioStateUnder, isUndefined, ratioPercentageToWei, requireAddress, requireAddresses, weiToRatioPercentage, wethToEth, wethToEthByAddress, getPositionId, } from './utils';
+import { addToArrayIf, addToObjectIf, compareAddresses, encodeSubId, ethToWeth, getCompoundV3LeverageManagementBundleId, 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,4 +294,29 @@ 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);
+        });
+    });
 });

package/esm/types/enums.d.ts

@@ -138,7 +138,9 @@ export declare namespace Strategies {
         EoaBoostOnPrice = "eoa-boost-on-price",
         EoaRepayOnPrice = "eoa-repay-on-price",
         CollateralSwitch = "collateral-switch",
-        EoaCollateralSwitch = "eoa-collateral-switch"
+        EoaCollateralSwitch = "eoa-collateral-switch",
+        LiquidationProtection = "liquidation-protection",
+        EoaLiquidationProtection = "eoa-liquidation-protection"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",
@@ -149,7 +151,9 @@ export declare namespace Strategies {
         LeverageManagement = "leverage-management",
         EoaLeverageManagement = "leverage-management-eoa",
         LeverageManagementOnPrice = "leverage-management-on-price",
-        EoaLeverageManagementOnPrice = "leverage-management-on-price-eoa"
+        EoaLeverageManagementOnPrice = "leverage-management-on-price-eoa",
+        LiquidationProtection = "liquidation-protection",
+        EoaLiquidationProtection = "liquidation-protection-eoa"
     }
 }
 export declare namespace Bundles {
@@ -224,7 +228,15 @@ export declare namespace Bundles {
         AAVE_V4_EOA_BOOST = 67,
         AAVE_V4_EOA_REPAY_ON_PRICE = 68,
         AAVE_V4_EOA_BOOST_ON_PRICE = 69,
-        AAVE_V4_EOA_CLOSE = 70
+        AAVE_V4_EOA_CLOSE = 70,
+        AAVE_V3_LIQUIDATION_PROTECTION = 71,
+        SPARK_LIQUIDATION_PROTECTION = 72,
+        COMP_V3_SW_LIQUIDATION_PROTECTION = 73,
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 74,
+        MAKER_LIQUIDATION_PROTECTION = 75,
+        FLUID_T1_LIQUIDATION_PROTECTION = 76,
+        AAVE_V4_LIQUIDATION_PROTECTION = 77,
+        MORPHO_BLUE_LIQUIDATION_PROTECTION = 78
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,
@@ -237,7 +249,8 @@ export declare namespace Bundles {
         AAVE_V3_EOA_BOOST = 7,
         AAVE_V3_EOA_REPAY_ON_PRICE = 8,
         AAVE_V3_EOA_BOOST_ON_PRICE = 9,
-        AAVE_V3_EOA_CLOSE = 10
+        AAVE_V3_EOA_CLOSE = 10,
+        AAVE_V3_LIQUIDATION_PROTECTION = 11
     }
     enum BaseIds {
         AAVE_V3_REPAY = 0,
@@ -266,7 +279,12 @@ export declare namespace Bundles {
         AAVE_V3_EOA_REPAY_ON_PRICE = 25,
         AAVE_V3_EOA_BOOST_ON_PRICE = 26,
         AAVE_V3_EOA_CLOSE = 27,
-        MORPHO_BLUE_CLOSE = 28
+        MORPHO_BLUE_CLOSE = 28,
+        AAVE_V3_LIQUIDATION_PROTECTION = 29,
+        FLUID_T1_LIQUIDATION_PROTECTION = 30,
+        MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+        COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33
     }
     enum ArbitrumIds {
         AAVE_V3_REPAY = 0,
@@ -297,6 +315,11 @@ export declare namespace Bundles {
         MORPHO_BLUE_BOOST_ON_PRICE = 25,
         MORPHO_BLUE_EOA_REPAY = 26,
         MORPHO_BLUE_EOA_BOOST = 27,
-        MORPHO_BLUE_CLOSE = 28
+        MORPHO_BLUE_CLOSE = 28,
+        AAVE_V3_LIQUIDATION_PROTECTION = 29,
+        FLUID_T1_LIQUIDATION_PROTECTION = 30,
+        MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+        COMP_V3_SW_LIQUIDATION_PROTECTION = 32,
+        COMP_V3_EOA_LIQUIDATION_PROTECTION = 33
     }
 }

package/esm/types/enums.js

@@ -156,6 +156,8 @@ export var Strategies;
         Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
         Identifiers["CollateralSwitch"] = "collateral-switch";
         Identifiers["EoaCollateralSwitch"] = "eoa-collateral-switch";
+        Identifiers["LiquidationProtection"] = "liquidation-protection";
+        Identifiers["EoaLiquidationProtection"] = "eoa-liquidation-protection";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -168,6 +170,8 @@ export var Strategies;
         IdOverrides["EoaLeverageManagement"] = "leverage-management-eoa";
         IdOverrides["LeverageManagementOnPrice"] = "leverage-management-on-price";
         IdOverrides["EoaLeverageManagementOnPrice"] = "leverage-management-on-price-eoa";
+        IdOverrides["LiquidationProtection"] = "liquidation-protection";
+        IdOverrides["EoaLiquidationProtection"] = "liquidation-protection-eoa";
     })(IdOverrides = Strategies.IdOverrides || (Strategies.IdOverrides = {}));
 })(Strategies || (Strategies = {}));
 export var Bundles;
@@ -245,6 +249,14 @@ export var Bundles;
         MainnetIds[MainnetIds["AAVE_V4_EOA_REPAY_ON_PRICE"] = 68] = "AAVE_V4_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V4_EOA_BOOST_ON_PRICE"] = 69] = "AAVE_V4_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["AAVE_V4_EOA_CLOSE"] = 70] = "AAVE_V4_EOA_CLOSE";
+        MainnetIds[MainnetIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 71] = "AAVE_V3_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["SPARK_LIQUIDATION_PROTECTION"] = 72] = "SPARK_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 73] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 74] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["MAKER_LIQUIDATION_PROTECTION"] = 75] = "MAKER_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 76] = "FLUID_T1_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["AAVE_V4_LIQUIDATION_PROTECTION"] = 77] = "AAVE_V4_LIQUIDATION_PROTECTION";
+        MainnetIds[MainnetIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 78] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -259,6 +271,7 @@ export var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 8] = "AAVE_V3_EOA_REPAY_ON_PRICE";
         OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 9] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         OptimismIds[OptimismIds["AAVE_V3_EOA_CLOSE"] = 10] = "AAVE_V3_EOA_CLOSE";
+        OptimismIds[OptimismIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 11] = "AAVE_V3_LIQUIDATION_PROTECTION";
     })(OptimismIds = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -289,6 +302,11 @@ export var Bundles;
         BaseIds[BaseIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 26] = "AAVE_V3_EOA_BOOST_ON_PRICE";
         BaseIds[BaseIds["AAVE_V3_EOA_CLOSE"] = 27] = "AAVE_V3_EOA_CLOSE";
         BaseIds[BaseIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
+        BaseIds[BaseIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 31] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 32] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
+        BaseIds[BaseIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 33] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
     })(BaseIds = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -321,5 +339,10 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_REPAY"] = 26] = "MORPHO_BLUE_EOA_REPAY";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_EOA_BOOST"] = 27] = "MORPHO_BLUE_EOA_BOOST";
         ArbitrumIds[ArbitrumIds["MORPHO_BLUE_CLOSE"] = 28] = "MORPHO_BLUE_CLOSE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_LIQUIDATION_PROTECTION"] = 29] = "AAVE_V3_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["FLUID_T1_LIQUIDATION_PROTECTION"] = 30] = "FLUID_T1_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["MORPHO_BLUE_LIQUIDATION_PROTECTION"] = 31] = "MORPHO_BLUE_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["COMP_V3_SW_LIQUIDATION_PROTECTION"] = 32] = "COMP_V3_SW_LIQUIDATION_PROTECTION";
+        ArbitrumIds[ArbitrumIds["COMP_V3_EOA_LIQUIDATION_PROTECTION"] = 33] = "COMP_V3_EOA_LIQUIDATION_PROTECTION";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.14-strategies-refactor-dev",
+  "version": "3.3.15-liq-prot-dev",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",