@defisaver/automation-sdk 3.3.2-dev → 3.3.2-dev.1

package/src/services/subDataService.ts

@@ -164,7 +164,7 @@ export const aaveV2LeverageManagementSubData = {
   },
 };
 
-export const aaveV3LeverageManagementSubData = { // TODO encode?
+export const aaveV3LeverageManagementSubData = {
   decode(subData: SubData): { targetRatio: number } {
     const ratioWei = AbiCoder.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
@@ -177,12 +177,20 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
   encode(
     targetRatio: number,
     ratioState: RatioState,
+    market: EthereumAddress,
+    user: EthereumAddress,
+    isGeneric: boolean,
   ): SubData {
     const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
     const encodedRatioState = AbiCoder.encodeParameter('uint8', ratioState);
+
+    if (isGeneric) {
+      const encodedMarket = AbiCoder.encodeParameter('address', market);
+      const encodedUser = AbiCoder.encodeParameter('address', user);
+      return [encodedTargetRatio, encodedRatioState, encodedMarket, encodedUser];
+    }
     const encodedUseDefaultMarket = AbiCoder.encodeParameter('bool', true);
     const encodedUseOnBehalf = AbiCoder.encodeParameter('bool', false);
-
     return [encodedTargetRatio, encodedRatioState, encodedUseDefaultMarket, encodedUseOnBehalf];
   },
   decode(subData: SubData): { targetRatio: number, ratioState: RatioState } {
@@ -193,6 +201,118 @@ export const aaveV3LeverageManagementSubDataWithoutSubProxy = {
   },
 };
 
+export const aaveV3LeverageManagementOnPriceGeneric = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+    user: EthereumAddress,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const encodedTargetRatio = AbiCoder.encodeParameter('uint256', ratioPercentageToWei(targetRatio));
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedMarket,
+      encodedTargetRatio,
+      userEncoded,
+    ];
+  },
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    marketAddr: EthereumAddress,
+    targetRatio: number,
+    user: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const marketAddr = AbiCoder.decodeParameter('address', subData[4]) as unknown as EthereumAddress;
+
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[5]) as unknown as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset,
+      collAssetId,
+      debtAsset,
+      debtAssetId,
+      marketAddr,
+      targetRatio,
+      user,
+    };
+  },
+};
+
+export const aaveV3CloseGenericSubData = {
+  encode(
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+  ): SubData {
+    const encodedColl = AbiCoder.encodeParameter('address', collAsset);
+    const encodedCollId = AbiCoder.encodeParameter('uint8', collAssetId);
+    const encodedDebt = AbiCoder.encodeParameter('address', debtAsset);
+    const encodedDebtId = AbiCoder.encodeParameter('uint8', debtAssetId);
+    const encodedCloseType = AbiCoder.encodeParameter('uint8', closeType);
+    const encodedMarket = AbiCoder.encodeParameter('address', marketAddr);
+    const userEncoded = AbiCoder.encodeParameter('address', user);
+
+    return [
+      encodedColl,
+      encodedCollId,
+      encodedDebt,
+      encodedDebtId,
+      encodedCloseType,
+      encodedMarket,
+      userEncoded,
+    ];
+  },
+
+  decode(subData: SubData): {
+    collAsset: EthereumAddress,
+    collAssetId: number,
+    debtAsset: EthereumAddress,
+    debtAssetId: number,
+    closeType: CloseStrategyType,
+    marketAddr: EthereumAddress,
+    user: EthereumAddress,
+  } {
+    const collAsset = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
+    const collAssetId = Number(AbiCoder.decodeParameter('uint8', subData[1]));
+    const debtAsset = AbiCoder.decodeParameter('address', subData[2]) as unknown as EthereumAddress;
+    const debtAssetId = Number(AbiCoder.decodeParameter('uint8', subData[3]));
+    const closeType = Number(AbiCoder.decodeParameter('uint8', subData[4])) as CloseStrategyType;
+    const marketAddr = AbiCoder.decodeParameter('address', subData[5]) as unknown as EthereumAddress;
+    const user = AbiCoder.decodeParameter('address', subData[6]) as unknown as EthereumAddress;
+
+    return {
+      collAsset, collAssetId, debtAsset, debtAssetId, closeType, marketAddr, user,
+    };
+  },
+};
+
 export const aaveV3QuotePriceSubData = {
   encode(
     collAsset: EthereumAddress,
@@ -1022,34 +1142,3 @@ export const compoundV3CloseSubData = {
     };
   },
 };
-
-export const liquityV2InterestRateAdjustmentSubData = {
-  encode: (
-    market: EthereumAddress,
-    troveId: string,
-    interestRateChange: string,
-  ) => {
-    const marketEncoded = AbiCoder.encodeParameter('address', market);
-    const troveIdEncoded = AbiCoder.encodeParameter('uint256', troveId);
-    const interestRateChangeWei = new Dec(interestRateChange).mul(1e16).toString();
-    const interestRateChangeEncoded = AbiCoder.encodeParameter('uint256', interestRateChangeWei.toString());
-
-    return [
-      marketEncoded,
-      troveIdEncoded,
-      interestRateChangeEncoded,
-    ];
-  },
-  decode: (subData: SubData) => {
-    const market = AbiCoder.decodeParameter('address', subData[0]) as unknown as EthereumAddress;
-    const troveId = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
-    const interestRateChangeWei = AbiCoder.decodeParameter('uint256', subData[2]) as any as string;
-    const interestRateChange = new Dec(interestRateChangeWei).div(10 ** 16).toString();
-
-    return {
-      market,
-      troveId,
-      interestRateChange,
-    };
-  },
-};

package/src/services/triggerService.test.ts

@@ -31,6 +31,7 @@ import {
   morphoBlueRatioTrigger,
   crvUsdHealthRatioTrigger, liquityV2DebtInFrontTrigger, liquityV2AdjustTimeTrigger,
   compoundV3PriceRangeTrigger,
+  aaveV3QuotePriceRangeTrigger,
 } from './triggerService';
 
 describe('Feature: triggerService.ts', () => {
@@ -1231,4 +1232,53 @@ describe('Feature: triggerService.ts', () => {
       });
     });
   });
+  describe('When testing triggerService.aaveV3PriceRangeTrigger', () => {
+    describe('encode()', () => {
+      const examples: Array<[[string], [collToken: EthereumAddress, debtToken: EthereumAddress, lowerPrice: number, upperPrice: number]]> = [
+        [
+          ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+          [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 1500, 4000]
+        ],
+        [
+          ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+          [web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'), web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'), 0, 5000]
+        ],
+      ];
+
+        examples.forEach(([expected, actual]) => {
+          it(`Given ${actual} should return expected value: ${expected}`, () => {
+            expect(aaveV3QuotePriceRangeTrigger.encode(...actual)).to.eql(expected);
+          });
+      });
+    });
+
+    describe('decode()', () => {
+      const examples: Array<[{ collToken: EthereumAddress, debtToken: EthereumAddress, lowerPrice: string, upperPrice: string }, TriggerData]> = [
+        [
+          {
+            collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            lowerPrice: '1500',
+            upperPrice: '4000',
+          },
+          ['0x000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000022ecb25c000000000000000000000000000000000000000000000000000000005d21dba000'],
+        ],
+        [
+          {
+            collToken: web3Utils.toChecksumAddress('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'),
+            debtToken: web3Utils.toChecksumAddress('0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'),
+            lowerPrice: '0',
+            upperPrice: '5000',
+          },
+          ['000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000746a528800'],
+        ],
+      ];
+
+      examples.forEach(([expected, actual]) => {
+        it(`Given ${actual} should return expected value: ${JSON.stringify(expected)}`, () => {
+          expect(aaveV3QuotePriceRangeTrigger.decode(actual)).to.eql(expected);
+        });
+      });
+    });
+  });
 });

package/src/services/triggerService.ts

@@ -658,24 +658,31 @@ export const compoundV3PriceRangeTrigger = {
   },
 };
 
-export const liquityV2InterestRateAdjustmentTrigger = {
+export const aaveV3QuotePriceRangeTrigger = {
   encode(
-    market: EthereumAddress,
-    troveId: string,
-    criticalDebtInFrontLimit: string,
-    nonCriticalDebtInFrontLimit: string,
+    collToken: EthereumAddress,
+    debtToken: EthereumAddress,
+    lowerPrice: number,
+    upperPrice: number,
   ) {
-    const criticalDebtInFrontLimitWei = web3Utils.toWei(new Dec(criticalDebtInFrontLimit).toString(), 'ether');
-    const nonCriticalDebtInFrontLimitWei = web3Utils.toWei(new Dec(nonCriticalDebtInFrontLimit).toString(), 'ether');
-    return [AbiCoder.encodeParameters(['address', 'uint256', 'uint256', 'uint256'], [market, troveId, criticalDebtInFrontLimitWei, nonCriticalDebtInFrontLimitWei])];
+    // Price is scaled to 1e8
+    const lowerPriceFormatted = new Dec(lowerPrice).mul(1e8).floor().toString();
+    const upperPriceFormatted = new Dec(upperPrice).mul(1e8).floor().toString();
+    return [
+      AbiCoder.encodeParameters(
+        ['address', 'address', 'uint256', 'uint256'],
+        [collToken, debtToken, lowerPriceFormatted, upperPriceFormatted]),
+    ];
   },
-  decode(triggerData: TriggerData): { market: EthereumAddress, troveId: string, criticalDebtInFrontLimit: string, nonCriticalDebtInFrontLimit: string } {
-    const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint256', 'uint256'], triggerData[0]);
+  decode(
+    triggerData: TriggerData,
+  ) {
+    const decodedData = AbiCoder.decodeParameters(['address', 'address', 'uint256', 'uint256'], triggerData[0]);
     return {
-      market: decodedData[0] as EthereumAddress,
-      troveId: decodedData[1] as string,
-      criticalDebtInFrontLimit: new Dec(decodedData[2] as string).div(10 ** 18).toString(),
-      nonCriticalDebtInFrontLimit: new Dec(decodedData[3] as string).div(10 ** 18).toString(),
+      collToken: decodedData[0] as EthereumAddress,
+      debtToken: decodedData[1] as EthereumAddress,
+      lowerPrice: new Dec(decodedData[2] as string).div(1e8).toString(),
+      upperPrice: new Dec(decodedData[3] as string).div(1e8).toString(),
     };
   },
 };

package/src/types/enums.ts

@@ -96,7 +96,6 @@ export namespace Strategies {
     LIQUITY_DEBT_IN_FRONT_REPAY = 75,
     CURVEUSD_PAYBACK = 92,
     LIQUITY_V2_PAYBACK = 113,
-    LIQUITY_V2_INTEREST_RATE_ADJUSTMENT = 124,
   }
 
   export enum OptimismIds {
@@ -144,7 +143,6 @@ export namespace Strategies {
     RepayOnPrice = 'repay-on-price',
     EoaBoostOnPrice = 'eoa-boost-on-price',
     EoaRepayOnPrice = 'eoa-repay-on-price',
-    InterestRateAdjustment = 'interest-rate-adjustment',
   }
   export enum IdOverrides {
     TakeProfit = 'take-profit',
@@ -215,6 +213,12 @@ export namespace Bundles {
     COMP_V3_EOA_REPAY_ON_PRICE = 49,
     COMP_V3_EOA_BOOST_ON_PRICE = 50,
     COMP_V3_EOA_CLOSE = 51,
+    // TODO -> Watch out for Liquity V2 Strategy deploy, should change IDs or here or there !!!
+    AAVE_V3_EOA_REPAY = 52,
+    AAVE_V3_EOA_BOOST = 53,
+    AAVE_V3_EOA_REPAY_ON_PRICE = 54,
+    AAVE_V3_EOA_BOOST_ON_PRICE = 55,
+    AAVE_V3_EOA_CLOSE = 56,
   }
 
   export enum OptimismIds {
@@ -224,6 +228,11 @@ export namespace Bundles {
     AAVE_V3_CLOSE_TO_COLLATERAL = 3,
     AAVE_V3_OPEN_ORDER_FROM_COLLATERAL = 4,
     AAVE_V3_REPAY_ON_PRICE = 5,
+    AAVE_V3_EOA_REPAY = 6,
+    AAVE_V3_EOA_BOOST = 7,
+    AAVE_V3_EOA_REPAY_ON_PRICE = 8,
+    AAVE_V3_EOA_BOOST_ON_PRICE = 9,
+    AAVE_V3_EOA_CLOSE = 10,
   }
 
   export enum BaseIds {
@@ -248,6 +257,11 @@ export namespace Bundles {
     COMP_V3_EOA_CLOSE = 20,
     COMP_V3_EOA_REPAY = 21,
     COMP_V3_EOA_BOOST = 22,
+    AAVE_V3_EOA_REPAY = 23,
+    AAVE_V3_EOA_BOOST = 24,
+    AAVE_V3_EOA_REPAY_ON_PRICE = 25,
+    AAVE_V3_EOA_BOOST_ON_PRICE = 26,
+    AAVE_V3_EOA_CLOSE = 27,
   }
 
   export enum ArbitrumIds {
@@ -269,6 +283,11 @@ export namespace Bundles {
     COMP_V3_EOA_CLOSE = 15,
     COMP_V3_EOA_REPAY = 16,
     COMP_V3_EOA_BOOST = 17,
+    AAVE_V3_EOA_REPAY = 18,
+    AAVE_V3_EOA_BOOST = 19,
+    AAVE_V3_EOA_REPAY_ON_PRICE = 20,
+    AAVE_V3_EOA_BOOST_ON_PRICE = 21,
+    AAVE_V3_EOA_CLOSE = 22,
   }
 }
 

package/src/types/index.ts

@@ -124,6 +124,26 @@ export declare namespace Position {
       mergeWithId?: Strategies.Identifiers,
       mergeId?: Strategies.Identifiers
     }
+    // TODO -> Prob should be better to type it something like this
+    // type RatioProtection =
+    // | (Base & {
+    //   triggerRepayRatio: number
+    //   targetRepayRatio: number
+    //   repayEnabled: boolean
+
+    //   triggerBoostRatio?: never
+    //   targetBoostRatio?: never
+    //   boostEnabled?: never
+    // })
+    // | (Base & {
+    //   triggerBoostRatio: number
+    //   targetBoostRatio: number
+    //   boostEnabled: boolean
+
+    //   triggerRepayRatio?: never
+    //   targetRepayRatio?: never
+    //   repayEnabled?: never
+    // });
     interface RatioProtection extends Base {
       triggerRepayRatio?: number,
       targetRepayRatio?: number,
@@ -190,14 +210,6 @@ export declare namespace Position {
       triggerRatio: number;
     }
 
-    interface InterestRateAdjustmentLiquityV2 extends Base {
-      market: EthereumAddress,
-      troveId: string,
-      criticalDebtInFrontLimit: string,
-      nonCriticalDebtInFrontLimit: string,
-      interestRateChange: string,
-    }
-
     interface TrailingStop extends Base {
       roundId: number,
       triggerPercentage: number,
@@ -247,7 +259,6 @@ export declare namespace Position {
     | Specific.BoostOnPriceMorpho
     | Specific.BoostOnPriceLiquityV2
     | Specific.PaybackLiquityV2
-    | Specific.InterestRateAdjustmentLiquityV2
     | Specific.CompoundV3LeverageManagementOnPrice
     | Specific.CompoundV3CloseOnPrice;