@defisaver/automation-sdk 3.3.13-strategies-refactor-dev → 3.3.14

package/src/services/strategySubService.ts

@@ -81,6 +81,23 @@ export const makerEncode = {
 
     return [strategyOrBundleId, isBundle, triggerData, subData];
   },
+  leverageManagement(
+    vaultId: number,
+    triggerRepayRatio: string,
+    triggerBoostRatio: string,
+    targetBoostRatio: string,
+    targetRepayRatio: string,
+    boostEnabled: boolean,
+  ) {
+    return [
+      vaultId,
+      new Dec(triggerRepayRatio).mul(1e16).toString(),
+      new Dec(triggerBoostRatio).mul(1e16).toString(),
+      new Dec(targetBoostRatio).mul(1e16).toString(),
+      new Dec(targetRepayRatio).mul(1e16).toString(),
+      boostEnabled,
+    ];
+  },
   leverageManagementWithoutSubProxy(
     vaultId: number,
     triggerRatio: number,
@@ -162,19 +179,20 @@ export const liquityEncode = {
 
     return [strategyId, isBundle, triggerData, subData];
   },
-  leverageManagementWithoutSubProxy(
-    strategyOrBundleId: number,
-    user: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
+  leverageManagement(
+    triggerRepayRatio:string,
+    triggerBoostRatio:string,
+    targetBoostRatio:string,
+    targetRepayRatio:string,
+    boostEnabled:boolean,
   ) {
-    const isBundle = true;
-
-    const subData = subDataService.liquityLeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
-    const triggerData = triggerService.liquityRatioTrigger.encode(user, triggerRatio, ratioState);
-
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return [
+      new Dec(triggerRepayRatio).mul(1e16).toString(),
+      new Dec(triggerBoostRatio).mul(1e16).toString(),
+      new Dec(targetBoostRatio).mul(1e16).toString(),
+      new Dec(targetRepayRatio).mul(1e16).toString(),
+      boostEnabled,
+    ];
   },
   dsrPayback(
     proxyAddress: EthereumAddress,
@@ -230,24 +248,39 @@ export const chickenBondsEncode = {
 };
 
 export const aaveV2Encode = {
-  leverageManagementWithoutSubProxy(
-    strategyOrBundleId: number,
-    market: EthereumAddress,
-    user: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
   ) {
-    const isBundle = true;
-
-    const subData = subDataService.aaveV2LeverageManagementSubDataWithoutSubProxy.encode(market, targetRatio, ratioState);
-    const triggerData = triggerService.aaveV2RatioTrigger.encode(user, market, triggerRatio, ratioState);
-
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
   },
 };
 
 export const aaveV3Encode = {
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ) {
+    let subInput = '0x';
+
+    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');
+
+    return subInput;
+  },
   closeToAsset(
     strategyOrBundleId: number,
     isBundle: boolean = true,
@@ -408,38 +441,29 @@ export const aaveV3Encode = {
 };
 
 export const compoundV2Encode = {
-  leverageManagementWithoutSubProxy(
-    strategyOrBundleId: number,
-    user: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
   ) {
-    const isBundle = true;
-
-    const subData = subDataService.compoundV2LeverageManagementSubDataWithoutSubProxy.encode(targetRatio, ratioState);
-    const triggerData = triggerService.compoundV2RatioTrigger.encode(user, triggerRatio, ratioState);
-
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
   },
 };
 
 export const compoundV3Encode = {
-  leverageManagementWithoutSubProxy(
-    strategyOrBundleId: number,
+  leverageManagement(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    user: EthereumAddress,
-    ratioState: RatioState,
-    targetRatio: number,
-    triggerRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+    isEOA: boolean,
   ) {
-    const isBundle = true;
-
-    const subData = subDataService.compoundV3LeverageManagementSubDataWithoutSubProxy.encode(market, baseToken, targetRatio, ratioState);
-    const triggerData = triggerService.compoundV3RatioTrigger.encode(user, market, triggerRatio, ratioState);
-
-    return [strategyOrBundleId, isBundle, triggerData, subData];
+    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
   },
   leverageManagementOnPrice(
     strategyOrBundleId: number,
@@ -479,6 +503,21 @@ export const compoundV3Encode = {
   },
 };
 
+export const compoundV3L2Encode = {
+  leverageManagement(
+    market: EthereumAddress,
+    baseToken: EthereumAddress,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+    isEOA: boolean = false,
+  ) {
+    return subDataService.compoundV3L2LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
+  },
+};
+
 export const morphoAaveV2Encode = {
   leverageManagement(
     triggerRepayRatio: number,
@@ -508,28 +547,40 @@ export const exchangeEncode = {
 
     return [strategyId, false, triggerData, subData];
   },
-  limitOrderWithoutSubProxy(
+  limitOrder(
     fromToken: EthereumAddress,
     toToken: EthereumAddress,
     amount: string,
     targetPrice: string,
     goodUntil: string | number,
     orderType: OrderType,
-    fromTokenDecimals: number,
-    toTokenDecimals: number,
-    network: ChainId,
   ) {
-    requireAddresses([fromToken, toToken]);
-    const subData = subDataService.exchangeLimitOrderSubDataWithoutSubProxy.encode(fromToken, toToken, amount);
-    const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, Number(goodUntil), orderType, fromTokenDecimals, toTokenDecimals);
-
-    const strategyId = STRATEGY_IDS[network].EXCHANGE_LIMIT_ORDER;
-
-    return [strategyId, false, triggerData, subData];
+    return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
   },
 };
 
 export const sparkEncode = {
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ) {
+    let subInput = '0x';
+
+    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');
+
+    return subInput;
+  },
   leverageManagementOnPrice(
     strategyOrBundleId: number,
     isBundle: boolean = true,

package/src/services/subDataService.test.ts

@@ -1408,6 +1408,54 @@ describe('Feature: subDataService.ts', () => {
     });
   });
 
+  describe('When testing subDataService.compoundV3L2LeverageManagementSubData', () => {
+    describe('encode()', () => {
+      const examples: Array<[
+        string,
+        [market: EthereumAddress, baseToken: EthereumAddress, triggerRepayRatio: number, triggerBoostRatio: number, targetBoostRatio: number, targetRepayRatio: number, boostEnabled: boolean, isEOA: boolean],
+      ]> = [
+        [
+          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0213D212133AfaB8F2b829B1066C7E43cAD94E2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000001a5e27eef13e00000100',
+          [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0213d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 190, true, false]
+        ],
+        [
+          '0x0313D212133AFab8F2b829B1066c7e43caD94e2c0413d212133afAb8F2B829b1066C7e43cAd94e2c000000000000000016345785d8a0000000000000000000001e87f85809dc0000000000000000000018fae27693b4000000000000000000000f43fc2c04ee00000000',
+          [web3Utils.toChecksumAddress('0x0313d212133AFaB8F2B829B1066c7E43cAd94E2c'), web3Utils.toChecksumAddress('0x0413d212133AFaB8F2B829B1066c7E43cAd94E2c'), 160, 220, 180, 110, false, false]
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${expected}`, () => {
+          expect(subDataService.compoundV3L2LeverageManagementSubData.encode(...actual)).to.eql(expected);
+        });
+      });
+    });
+    describe('decode()', () => {
+      const examples: Array<[{ targetRatio: number }, SubData]> = [
+        [
+          { targetRatio: 200 },
+          [
+            '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000213d212133AFaB8F2B829B1066c7E43cAd94E2c',
+           '0x0000000000000000000000000000000000000000000000000000000000000001', '0x0000000000000000000000000000000000000000000000001bc16d674ec80000',
+          ],
+        ],
+        [
+          { targetRatio: 123 },
+          [
+            '0x0000000000000000000000000313d212133AFaB8F2B829B1066c7E43cAd94E2c', '0x0000000000000000000000000413d212133AFaB8F2B829B1066c7E43cAd94E2c',
+            '0x0000000000000000000000000000000000000000000000000000000000000000', '0x0000000000000000000000000000000000000000000000001111d67bb1bb0000',
+          ],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(subDataService.compoundV3L2LeverageManagementSubData.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
+
   describe('When testing subDataService.morphoBlueLeverageManagementSubData', () => {
     describe('encode()', () => {
       const examples: Array<[

package/src/services/subDataService.ts

@@ -207,30 +207,6 @@ 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,
@@ -534,33 +510,6 @@ 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 };
-  },
-};
 
 /**
      ___           ___   ____    ____  _______    ____    ____  ____
@@ -1048,30 +997,6 @@ 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 };
-  },
-};
 
 /**
   ______   ______   .___  ___. .______      ____    ____  ____
@@ -1110,28 +1035,39 @@ export const compoundV3LeverageManagementSubData = {
     return { targetRatio };
   },
 };
-export const compoundV3LeverageManagementSubDataWithoutSubProxy = {
+export const compoundV3L2LeverageManagementSubData = {
   encode(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    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];
+    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;
   },
-  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 ratioWei = AbiCoder.decodeParameter('uint256', subData[3]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
 
-    return {
-      market, baseToken, targetRatio, ratioState,
-    };
+    return { targetRatio };
   },
 };
 export const compoundV3LeverageManagementOnPriceSubData = {
@@ -1269,21 +1205,6 @@ 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 };
-  },
-};
 
 /**
      _______..______      ___      .______       __  ___