@defisaver/automation-sdk 1.2.32 → 1.2.33

package/README.md

@@ -0,0 +1,36 @@
+# SDK for fetching DeFi Saver strategies data from the blockchain.
+
+Fetch strategies data from the blockchain, and parse it into a readable format.
+Use one of the following classes to fetch data for strategies: EthereumStrategies, OptimismStrategies, or ArbitrumStrategies.
+Use one of the following classes to fetch data for legacy automation: LegacyMakerAutomation, LegacyAaveAutomation, or LegacyCompoundAutomation.
+Various services and constants also available for use.
+
+## Usage
+
+```js
+const ethereumStrategies = new EthereumStrategies({
+  provider: WEB3_PROVIDER_HERE,
+});
+
+const subscriptions = await ethereumStrategies.getSubscriptionsFor(
+  // Pass one or multiple owner addresses, or use getSubscriptions method to fetch all subscriptions
+  ['0x000000000000000000000000000000000000dEaD'],
+  { 
+    fromBlock: 0,
+    toBlock: 'latest',
+  }
+);
+
+// Do what you would like with subscriptions
+```
+
+## Development - How to add new strategies?
+
+- Add strategy/bundle ID to `./src/types/enums.ts`, and create `Identifiers` if needed
+- Add strategy/bundle info to `./src/constants/index.ts`
+- Add encoding/decoding to the following files:
+  - `./src/services/strategySubService.ts`
+  - `./src/services/subDataService.ts`
+  - `./src/services/triggerService.ts`
+- Write parsing for the strategy in `./src/services/strategeiesService.ts` and add assign it to `const parsingMethodsMapping`
+- Test it out!

package/esm/constants/index.js

@@ -222,6 +222,26 @@ export const MAINNET_BUNDLES_INFO = {
         strategyId: Strategies.Identifiers.CloseToCollateral,
         protocol: PROTOCOLS.Spark,
     },
+    [Bundles.MainnetIds.AAVE_V2_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.AaveV2,
+    },
+    [Bundles.MainnetIds.AAVE_V2_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.AaveV2,
+    },
+    [Bundles.MainnetIds.COMP_V2_REPAY]: {
+        strategyOrBundleId: Bundles.MainnetIds.COMP_V2_REPAY,
+        strategyId: Strategies.Identifiers.Repay,
+        protocol: PROTOCOLS.CompoundV2,
+    },
+    [Bundles.MainnetIds.COMP_V2_BOOST]: {
+        strategyOrBundleId: Bundles.MainnetIds.COMP_V2_BOOST,
+        strategyId: Strategies.Identifiers.Boost,
+        protocol: PROTOCOLS.CompoundV2,
+    },
 };
 export const OPTIMISM_BUNDLES_INFO = {
     [Bundles.OptimismIds.AAVE_V3_REPAY]: {

package/esm/services/strategiesService.js

@@ -109,12 +109,41 @@ function parseLiquityTrailingStop(position, parseData) {
     };
     return _position;
 }
+function parseAaveV2LeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+    if (isRepay) {
+        _position.specific = {
+            minRatio: triggerData.ratio,
+            minOptimalRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+        };
+    }
+    else {
+        _position.specific = {
+            maxRatio: triggerData.ratio,
+            maxOptimalRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.specific.mergeWithSameId = true;
+    return _position;
+}
 function parseAaveV3LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.aaveLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
@@ -188,6 +217,36 @@ function parseAaveV3CloseOnPrice(position, parseData) {
     _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
     return _position;
 }
+function parseCompoundV2LeverageManagement(position, parseData) {
+    const _position = cloneDeep(position);
+    const { subStruct, subId } = parseData.subscriptionEventData;
+    const { isEnabled } = parseData.strategiesSubsData;
+    const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
+    _position.strategyData.decoded.triggerData = triggerData;
+    _position.strategyData.decoded.subData = subData;
+    _position.owner = triggerData.owner;
+    const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId);
+    if (isRepay) {
+        _position.specific = {
+            minRatio: triggerData.ratio,
+            minOptimalRatio: subData.targetRatio,
+            repayEnabled: true,
+            subId1: Number(subId),
+        };
+    }
+    else {
+        _position.specific = {
+            maxRatio: triggerData.ratio,
+            maxOptimalRatio: subData.targetRatio,
+            boostEnabled: isEnabled,
+            subId2: Number(subId),
+        };
+    }
+    _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+    _position.specific.mergeWithSameId = true;
+    return _position;
+}
 function parseCompoundV3LeverageManagement(position, parseData) {
     const _position = cloneDeep(position);
     const { subStruct, subId } = parseData.subscriptionEventData;
@@ -351,12 +410,20 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.Repay]: parseLiquityLeverageManagement,
         [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
+        [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
+        [Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
+    },
     [ProtocolIdentifiers.StrategiesAutomation.AaveV3]: {
         [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
         [Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
         [Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
         [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
+        [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
+        [Strategies.Identifiers.Boost]: parseCompoundV2LeverageManagement,
+    },
     [ProtocolIdentifiers.StrategiesAutomation.CompoundV3]: {
         [Strategies.Identifiers.Repay]: parseCompoundV3LeverageManagement,
         [Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,

package/esm/services/strategySubService.d.ts

@@ -15,6 +15,9 @@ export declare const liquityEncode: {
 export declare const chickenBondsEncode: {
     rebond(bondId: number): string[];
 };
+export declare const aaveV2Encode: {
+    leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+};
 export declare const aaveV3Encode: {
     leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string;
     closeToAsset(strategyOrBundleId: number, isBundle: boolean | undefined, triggerData: {
@@ -29,6 +32,9 @@ export declare const aaveV3Encode: {
         debtAssetId: number;
     }): (number | boolean | string[])[];
 };
+export declare const compoundV2Encode: {
+    leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+};
 export declare const compoundV3Encode: {
     leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
 };

package/esm/services/strategySubService.js

@@ -81,6 +81,11 @@ export const chickenBondsEncode = {
         return subDataService.cBondsRebondSubData.encode(bondId);
     },
 };
+export const aaveV2Encode = {
+    leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return subDataService.aaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+    },
+};
 export const aaveV3Encode = {
     leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
         let subInput = '0x';
@@ -103,6 +108,11 @@ export const aaveV3Encode = {
         return [strategyOrBundleId, isBundle, triggerDataEncoded, subDataEncoded];
     },
 };
+export const compoundV2Encode = {
+    leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return subDataService.compoundV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+    },
+};
 export const compoundV3Encode = {
     leverageManagement(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
         return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);

package/esm/services/subDataService.d.ts

@@ -34,7 +34,13 @@ export declare const liquityCloseSubData: {
         debtAddr: string;
     };
 };
-export declare const aaveLeverageManagementSubData: {
+export declare const aaveV2LeverageManagementSubData: {
+    encode(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
+export declare const aaveV3LeverageManagementSubData: {
     decode(subData: string[]): {
         targetRatio: number;
     };
@@ -48,6 +54,12 @@ export declare const aaveV3QuotePriceSubData: {
         debtAssetId: number;
     };
 };
+export declare const compoundV2LeverageManagementSubData: {
+    encode(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const compoundV3LeverageManagementSubData: {
     encode(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -96,7 +96,24 @@ export const liquityCloseSubData = {
         return { closeToAssetAddr, debtAddr };
     },
 };
-export const aaveLeverageManagementSubData = {
+export const aaveV2LeverageManagementSubData = {
+    encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return [
+            new Dec(minRatio).mul(1e16).toString(),
+            new Dec(maxRatio).mul(1e16).toString(),
+            new Dec(maxOptimalRatio).mul(1e16).toString(),
+            new Dec(minOptimalRatio).mul(1e16).toString(),
+            // @ts-ignore // TODO
+            boostEnabled,
+        ];
+    },
+    decode(subData) {
+        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]);
+        const targetRatio = weiToRatioPercentage(ratioWei);
+        return { targetRatio };
+    },
+};
+export const aaveV3LeverageManagementSubData = {
     decode(subData) {
         const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
         const targetRatio = weiToRatioPercentage(ratioWei);
@@ -122,6 +139,23 @@ export const aaveV3QuotePriceSubData = {
         };
     },
 };
+export const compoundV2LeverageManagementSubData = {
+    encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return [
+            new Dec(minRatio).mul(1e16).toString(),
+            new Dec(maxRatio).mul(1e16).toString(),
+            new Dec(maxOptimalRatio).mul(1e16).toString(),
+            new Dec(minOptimalRatio).mul(1e16).toString(),
+            // @ts-ignore // TODO
+            boostEnabled,
+        ];
+    },
+    decode(subData) {
+        const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
+        const targetRatio = weiToRatioPercentage(weiRatio);
+        return { targetRatio };
+    },
+};
 export const compoundV3LeverageManagementSubData = {
     encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA) {
         return [

package/esm/services/triggerService.d.ts

@@ -55,7 +55,7 @@ export declare const compoundV2RatioTrigger: {
     decode(triggerData: string[]): {
         owner: EthereumAddress;
         ratioState: RatioState;
-        ratio: string;
+        ratio: number;
     };
 };
 export declare const liquityRatioTrigger: {
@@ -79,7 +79,7 @@ export declare const aaveV2RatioTrigger: {
         owner: EthereumAddress;
         market: EthereumAddress;
         ratioState: RatioState;
-        ratio: string;
+        ratio: number;
     };
 };
 export declare const cBondsRebondTrigger: {

package/esm/services/triggerService.js

@@ -88,7 +88,7 @@ export const compoundV2RatioTrigger = {
         const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
         return {
             owner: decodedData[0],
-            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toString(),
+            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
             ratioState: +decodedData[2],
         };
     },
@@ -129,7 +129,7 @@ export const aaveV2RatioTrigger = {
         return {
             owner: decodedData[0],
             market: decodedData[1],
-            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toString(),
+            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
             ratioState: +decodedData[3],
         };
     },

package/esm/types/enums.d.ts

@@ -24,7 +24,9 @@ export declare namespace ProtocolIdentifiers {
         MakerDAO = "MakerDAO",
         Liquity = "Liquity",
         ChickenBonds = "Chicken Bonds",
+        CompoundV2 = "Compound__V2",
         CompoundV3 = "Compound__V3",
+        AaveV2 = "Aave__V2",
         AaveV3 = "Aave__V3",
         MorphoAaveV2 = "Morpho-Aave__V2",
         Exchange = "Exchange",
@@ -104,8 +106,12 @@ export declare namespace Bundles {
         LIQUITY_BOOST = 17,
         SPARK_REPAY = 18,
         SPARK_BOOST = 19,
-        SPARK_CLOSE_TO_DEBT = 20,
-        SPARK_CLOSE_TO_COLLATERAL = 21
+        SPARK_CLOSE_TO_DEBT = -21231230,
+        SPARK_CLOSE_TO_COLLATERAL = -21231231,
+        AAVE_V2_REPAY = 22,
+        AAVE_V2_BOOST = 23,
+        COMP_V2_REPAY = 20,
+        COMP_V2_BOOST = 21
     }
     enum OptimismIds {
         AAVE_V3_REPAY = 0,

package/esm/types/enums.js

@@ -29,7 +29,9 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["MakerDAO"] = "MakerDAO";
         StrategiesAutomation["Liquity"] = "Liquity";
         StrategiesAutomation["ChickenBonds"] = "Chicken Bonds";
+        StrategiesAutomation["CompoundV2"] = "Compound__V2";
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
+        StrategiesAutomation["AaveV2"] = "Aave__V2";
         StrategiesAutomation["AaveV3"] = "Aave__V3";
         StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
         StrategiesAutomation["Exchange"] = "Exchange";
@@ -118,8 +120,12 @@ export var Bundles;
         MainnetIds[MainnetIds["LIQUITY_BOOST"] = 17] = "LIQUITY_BOOST";
         MainnetIds[MainnetIds["SPARK_REPAY"] = 18] = "SPARK_REPAY";
         MainnetIds[MainnetIds["SPARK_BOOST"] = 19] = "SPARK_BOOST";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = 20] = "SPARK_CLOSE_TO_DEBT";
-        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = 21] = "SPARK_CLOSE_TO_COLLATERAL";
+        MainnetIds[MainnetIds["SPARK_CLOSE_TO_DEBT"] = -21231230] = "SPARK_CLOSE_TO_DEBT";
+        MainnetIds[MainnetIds["SPARK_CLOSE_TO_COLLATERAL"] = -21231231] = "SPARK_CLOSE_TO_COLLATERAL";
+        MainnetIds[MainnetIds["AAVE_V2_REPAY"] = 22] = "AAVE_V2_REPAY";
+        MainnetIds[MainnetIds["AAVE_V2_BOOST"] = 23] = "AAVE_V2_BOOST";
+        MainnetIds[MainnetIds["COMP_V2_REPAY"] = 20] = "COMP_V2_REPAY";
+        MainnetIds[MainnetIds["COMP_V2_BOOST"] = 21] = "COMP_V2_BOOST";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",

package/src/constants/index.ts

@@ -238,6 +238,26 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.CloseToCollateral,
     protocol: PROTOCOLS.Spark,
   },
+  [Bundles.MainnetIds.AAVE_V2_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.AaveV2,
+  },
+  [Bundles.MainnetIds.AAVE_V2_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V2_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.AaveV2,
+  },
+  [Bundles.MainnetIds.COMP_V2_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V2_REPAY,
+    strategyId: Strategies.Identifiers.Repay,
+    protocol: PROTOCOLS.CompoundV2,
+  },
+  [Bundles.MainnetIds.COMP_V2_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.COMP_V2_BOOST,
+    strategyId: Strategies.Identifiers.Boost,
+    protocol: PROTOCOLS.CompoundV2,
+  },
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {

package/src/services/strategiesService.ts

@@ -157,6 +157,42 @@ function parseLiquityTrailingStop(position: Position.Automated, parseData: Parse
   return _position;
 }
 
+function parseAaveV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.aaveV2RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.aaveV2LeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+
+  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+
+  if (isRepay) {
+    _position.specific = {
+      minRatio: triggerData.ratio,
+      minOptimalRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      maxRatio: triggerData.ratio,
+      maxOptimalRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  _position.specific.mergeWithSameId = true;
+
+  return _position;
+}
+
 function parseAaveV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -164,7 +200,7 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.aaveLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.aaveV3LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
@@ -263,6 +299,42 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
   return _position;
 }
 
+function parseCompoundV2LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
+  const _position = cloneDeep(position);
+
+  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { isEnabled } = parseData.strategiesSubsData;
+
+  const triggerData = triggerService.compoundV2RatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.compoundV2LeverageManagementSubData.decode(subStruct.subData);
+
+  _position.strategyData.decoded.triggerData = triggerData;
+  _position.strategyData.decoded.subData = subData;
+  _position.owner = triggerData.owner;
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
+
+  if (isRepay) {
+    _position.specific = {
+      minRatio: triggerData.ratio,
+      minOptimalRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      maxRatio: triggerData.ratio,
+      maxOptimalRatio: subData.targetRatio,
+      boostEnabled: isEnabled,
+      subId2: Number(subId),
+    };
+  }
+
+  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
+  _position.specific.mergeWithSameId = true;
+
+  return _position;
+}
+
 function parseCompoundV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
@@ -475,12 +547,20 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Repay]: parseLiquityLeverageManagement,
     [Strategies.Identifiers.Boost]: parseLiquityLeverageManagement,
   },
+  [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
+    [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
+    [Strategies.Identifiers.Boost]: parseAaveV2LeverageManagement,
+  },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV3]: {
     [Strategies.Identifiers.Repay]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.Boost]: parseAaveV3LeverageManagement,
     [Strategies.Identifiers.CloseToDebt]: parseAaveV3CloseOnPrice,
     [Strategies.Identifiers.CloseToCollateral]: parseAaveV3CloseOnPrice,
   },
+  [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
+    [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,
+    [Strategies.Identifiers.Boost]: parseCompoundV2LeverageManagement,
+  },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV3]: {
     [Strategies.Identifiers.Repay]: parseCompoundV3LeverageManagement,
     [Strategies.Identifiers.Boost]: parseCompoundV3LeverageManagement,

package/src/services/strategySubService.ts

@@ -172,6 +172,18 @@ export const chickenBondsEncode = {
   },
 };
 
+export const aaveV2Encode = {
+  leverageManagement(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ) {
+    return subDataService.aaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+  },
+};
+
 export const aaveV3Encode = {
   leverageManagement(
     minRatio: number,
@@ -218,6 +230,18 @@ export const aaveV3Encode = {
   },
 };
 
+export const compoundV2Encode = {
+  leverageManagement(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ) {
+    return subDataService.compoundV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+  },
+};
+
 export const compoundV3Encode = {
   leverageManagement(
     market: EthereumAddress,

package/src/services/subDataService.ts

@@ -132,7 +132,32 @@ export const liquityCloseSubData = {
   },
 };
 
-export const aaveLeverageManagementSubData = { // TODO encode?
+export const aaveV2LeverageManagementSubData = {
+  encode(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    return [
+      new Dec(minRatio).mul(1e16).toString(),
+      new Dec(maxRatio).mul(1e16).toString(),
+      new Dec(maxOptimalRatio).mul(1e16).toString(),
+      new Dec(minOptimalRatio).mul(1e16).toString(),
+      // @ts-ignore // TODO
+      boostEnabled,
+    ];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+
+export const aaveV3LeverageManagementSubData = { // TODO encode?
   decode(subData: SubData): { targetRatio: number } {
     const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
@@ -172,6 +197,31 @@ export const aaveV3QuotePriceSubData = {
   },
 };
 
+export const compoundV2LeverageManagementSubData = {
+  encode(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    return [
+      new Dec(minRatio).mul(1e16).toString(),
+      new Dec(maxRatio).mul(1e16).toString(),
+      new Dec(maxOptimalRatio).mul(1e16).toString(),
+      new Dec(minOptimalRatio).mul(1e16).toString(),
+      // @ts-ignore // TODO
+      boostEnabled,
+    ];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const weiRatio = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return { targetRatio };
+  },
+};
+
 export const compoundV3LeverageManagementSubData = {
   encode(
     market: EthereumAddress,

package/src/services/triggerService.ts

@@ -105,11 +105,11 @@ export const compoundV2RatioTrigger = {
     const ratioWei = ratioPercentageToWei(ratioPercentage);
     return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
   },
-  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: string } {
+  decode(triggerData: TriggerData): { owner: EthereumAddress, ratioState: RatioState, ratio: number } {
     const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
-      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toString(),
+      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).mul(100).toNumber(),
       ratioState: +decodedData[2],
     };
   },
@@ -148,12 +148,12 @@ export const aaveV2RatioTrigger = {
     const ratioWei = ratioPercentageToWei(ratioPercentage);
     return [mockedWeb3.eth.abi.encodeParameters(['address', 'address', 'uint256', 'uint8'], [owner, market, ratioWei, ratioState])];
   },
-  decode(triggerData: TriggerData): { owner: EthereumAddress, market:EthereumAddress, ratioState: RatioState, ratio: string } {
+  decode(triggerData: TriggerData): { owner: EthereumAddress, market:EthereumAddress, ratioState: RatioState, ratio: number } {
     const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'address', 'uint256', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toString(),
+      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
       ratioState: +decodedData[3],
     };
   },