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

package/src/services/subDataService.test.ts

@@ -734,78 +734,6 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
-  describe('When testing subDataService.compoundV3LeverageManagementSubData', () => {
-    describe('encode()', () => {
-      const examples: Array<[[EthereumAddress, EthereumAddress, string, string, string, string, boolean, boolean], [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean]]> = [
-        [
-          [
-            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: Array<[{ targetRatio: number }, SubData]> = [
-        [
-          { 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: Array<[[string, string, string, string, boolean], [triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean]]> = [

package/src/services/subDataService.ts

@@ -1170,39 +1170,7 @@ 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: EthereumAddress,
-    baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    triggerBoostRatio: number,
-    targetBoostRatio: number,
-    targetRepayRatio: number,
-    boostEnabled: boolean,
-    isEOA: boolean,
-  ): 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,
-    ];
-  },
-  decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return { targetRatio };
-  },
-};
-
-// ! Any change here will PROBABLY require a change in compoundV3L2LiquidationProtectionSubData as well, since it is copy paste
+// ! 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(
@@ -1229,70 +1197,28 @@ export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
   },
 };
 
-export const compoundV3LiquidationProtectionSubData = {
+export const compoundV3LiquidationProtectionSubDataWithoutSubProxy = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
-    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,
-    ];
-  },
-  decode(subData: SubData): { targetRatio: number } {
-    const weiRatio = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
-    const targetRatio = weiToRatioPercentage(weiRatio);
-
-    return { targetRatio };
-  },
-};
-export const compoundV3L2LiquidationProtectionSubData = {
-  encode(
-    market: EthereumAddress,
-    baseToken: EthereumAddress,
-    triggerRepayRatio: number,
-    // TODO -> can remove boost stuff ? Not sure if want it to be compatible or not.
-    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;
+    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,
+    };
   },
 };
 
@@ -1918,8 +1844,9 @@ export const fluidLeverageManagementSubData = {
     const targetRatioEncoded = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
     const wrapEthEncoded = AbiCoder.encodeParameter('bool', true);
 
-    const collActionType = CollActionType.WITHDRAW;
-    const debtActionType = DebtActionType.PAYBACK;
+    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);

package/src/services/utils.ts

@@ -175,15 +175,15 @@ export function getStopLossAndTakeProfitTypeByCloseStrategyType(
 }
 
 export function getBundleIdsByNetwork(network: ChainId) {
-  switch (network) {
+  switch (Number(network)) {
+    case ChainId.Ethereum:
+      return Bundles.MainnetIds;
     case ChainId.Arbitrum:
       return Bundles.ArbitrumIds;
     case ChainId.Base:
       return Bundles.BaseIds;
-    case ChainId.Optimism:
-      return Bundles.OptimismIds;
     default:
-      return Bundles.MainnetIds;
+      throw new Error(`Unsupported network ${network}`);
   }
 }
 

package/src/types/enums.ts

@@ -244,14 +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_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,
+    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 {
@@ -266,7 +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_LIQUIDATION_PROTECTION = 11,
+    AAVE_V3_SW_LIQUIDATION_PROTECTION = 11,
+    AAVE_V3_EOA_LIQUIDATION_PROTECTION = 12,
   }
 
   export enum BaseIds {
@@ -297,11 +301,12 @@ export namespace Bundles {
     AAVE_V3_EOA_BOOST_ON_PRICE = 26,
     AAVE_V3_EOA_CLOSE = 27,
     MORPHO_BLUE_CLOSE = 28,
-    AAVE_V3_LIQUIDATION_PROTECTION = 29,
-    FLUID_T1_LIQUIDATION_PROTECTION = 30,
-    MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+    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 {
@@ -334,12 +339,12 @@ export namespace Bundles {
     MORPHO_BLUE_EOA_REPAY = 26,
     MORPHO_BLUE_EOA_BOOST = 27,
     MORPHO_BLUE_CLOSE = 28,
-    AAVE_V3_LIQUIDATION_PROTECTION = 29,
-    FLUID_T1_LIQUIDATION_PROTECTION = 30,
-    MORPHO_BLUE_LIQUIDATION_PROTECTION = 31,
+    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,
   }
 }
-
-