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

package/esm/types/enums.js

@@ -99,7 +99,6 @@ export var Strategies;
         MainnetIds[MainnetIds["LIQUITY_DEBT_IN_FRONT_REPAY"] = 75] = "LIQUITY_DEBT_IN_FRONT_REPAY";
         MainnetIds[MainnetIds["CURVEUSD_PAYBACK"] = 92] = "CURVEUSD_PAYBACK";
         MainnetIds[MainnetIds["LIQUITY_V2_PAYBACK"] = 113] = "LIQUITY_V2_PAYBACK";
-        MainnetIds[MainnetIds["LIQUITY_V2_INTEREST_RATE_ADJUSTMENT"] = 124] = "LIQUITY_V2_INTEREST_RATE_ADJUSTMENT";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -147,7 +146,6 @@ export var Strategies;
         Identifiers["RepayOnPrice"] = "repay-on-price";
         Identifiers["EoaBoostOnPrice"] = "eoa-boost-on-price";
         Identifiers["EoaRepayOnPrice"] = "eoa-repay-on-price";
-        Identifiers["InterestRateAdjustment"] = "interest-rate-adjustment";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {
@@ -220,6 +218,12 @@ export var Bundles;
         MainnetIds[MainnetIds["COMP_V3_EOA_REPAY_ON_PRICE"] = 49] = "COMP_V3_EOA_REPAY_ON_PRICE";
         MainnetIds[MainnetIds["COMP_V3_EOA_BOOST_ON_PRICE"] = 50] = "COMP_V3_EOA_BOOST_ON_PRICE";
         MainnetIds[MainnetIds["COMP_V3_EOA_CLOSE"] = 51] = "COMP_V3_EOA_CLOSE";
+        // TODO -> Watch out for Liquity V2 Strategy deploy, should change IDs or here or there !!!
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY"] = 52] = "AAVE_V3_EOA_REPAY";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST"] = 53] = "AAVE_V3_EOA_BOOST";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 54] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 55] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        MainnetIds[MainnetIds["AAVE_V3_EOA_CLOSE"] = 56] = "AAVE_V3_EOA_CLOSE";
     })(MainnetIds = Bundles.MainnetIds || (Bundles.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
@@ -229,6 +233,11 @@ export var Bundles;
         OptimismIds[OptimismIds["AAVE_V3_CLOSE_TO_COLLATERAL"] = 3] = "AAVE_V3_CLOSE_TO_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_OPEN_ORDER_FROM_COLLATERAL"] = 4] = "AAVE_V3_OPEN_ORDER_FROM_COLLATERAL";
         OptimismIds[OptimismIds["AAVE_V3_REPAY_ON_PRICE"] = 5] = "AAVE_V3_REPAY_ON_PRICE";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_REPAY"] = 6] = "AAVE_V3_EOA_REPAY";
+        OptimismIds[OptimismIds["AAVE_V3_EOA_BOOST"] = 7] = "AAVE_V3_EOA_BOOST";
+        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 = Bundles.OptimismIds || (Bundles.OptimismIds = {}));
     let BaseIds;
     (function (BaseIds) {
@@ -253,6 +262,11 @@ export var Bundles;
         BaseIds[BaseIds["COMP_V3_EOA_CLOSE"] = 20] = "COMP_V3_EOA_CLOSE";
         BaseIds[BaseIds["COMP_V3_EOA_REPAY"] = 21] = "COMP_V3_EOA_REPAY";
         BaseIds[BaseIds["COMP_V3_EOA_BOOST"] = 22] = "COMP_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY"] = 23] = "AAVE_V3_EOA_REPAY";
+        BaseIds[BaseIds["AAVE_V3_EOA_BOOST"] = 24] = "AAVE_V3_EOA_BOOST";
+        BaseIds[BaseIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 25] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        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 = Bundles.BaseIds || (Bundles.BaseIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
@@ -274,5 +288,10 @@ export var Bundles;
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_CLOSE"] = 15] = "COMP_V3_EOA_CLOSE";
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_REPAY"] = 16] = "COMP_V3_EOA_REPAY";
         ArbitrumIds[ArbitrumIds["COMP_V3_EOA_BOOST"] = 17] = "COMP_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY"] = 18] = "AAVE_V3_EOA_REPAY";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST"] = 19] = "AAVE_V3_EOA_BOOST";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_REPAY_ON_PRICE"] = 20] = "AAVE_V3_EOA_REPAY_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_BOOST_ON_PRICE"] = 21] = "AAVE_V3_EOA_BOOST_ON_PRICE";
+        ArbitrumIds[ArbitrumIds["AAVE_V3_EOA_CLOSE"] = 22] = "AAVE_V3_EOA_CLOSE";
     })(ArbitrumIds = Bundles.ArbitrumIds || (Bundles.ArbitrumIds = {}));
 })(Bundles || (Bundles = {}));

package/esm/types/index.d.ts

@@ -158,13 +158,6 @@ export declare namespace Position {
             targetRatio: number;
             triggerRatio: number;
         }
-        interface InterestRateAdjustmentLiquityV2 extends Base {
-            market: EthereumAddress;
-            troveId: string;
-            criticalDebtInFrontLimit: string;
-            nonCriticalDebtInFrontLimit: string;
-            interestRateChange: string;
-        }
         interface TrailingStop extends Base {
             roundId: number;
             triggerPercentage: number;
@@ -195,7 +188,7 @@ export declare namespace Position {
             takeProfitType: CloseToAssetType | undefined;
         }
     }
-    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.InterestRateAdjustmentLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice;
+    type SpecificAny = Specific.CloseOnPrice | Specific.TrailingStop | Specific.RatioProtection | Specific.CloseOnPriceAave | Specific.BoostOnPriceAave | Specific.CloseOnPriceWithMaximumGasPriceAave | Specific.DebtInFrontRepay | Specific.LeverageManagementCrvUSD | Specific.CloseOnPriceLiquityV2 | Specific.BoostOnPriceMorpho | Specific.BoostOnPriceLiquityV2 | Specific.PaybackLiquityV2 | Specific.CompoundV3LeverageManagementOnPrice | Specific.CompoundV3CloseOnPrice;
     interface Automated {
         chainId: ChainId;
         positionId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/automation-sdk",
-  "version": "3.3.2-dev",
+  "version": "3.3.2-dev.1",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,7 +23,7 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/sdk": "^1.3.2",
+    "@defisaver/sdk": "1.3.5-dev.0",
     "@defisaver/tokens": "^1.6.19",
     "@ethersproject/address": "^5.0.10",
     "@ethersproject/solidity": "^5.0.9",

package/src/constants/index.ts

@@ -118,11 +118,6 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.Payback,
     protocol: PROTOCOLS.LiquityV2,
   },
-  [Strategies.MainnetIds.LIQUITY_V2_INTEREST_RATE_ADJUSTMENT]: {
-    strategyOrBundleId: Strategies.MainnetIds.LIQUITY_V2_INTEREST_RATE_ADJUSTMENT,
-    strategyId: Strategies.Identifiers.InterestRateAdjustment,
-    protocol: PROTOCOLS.LiquityV2,
-  },
 };
 
 export const OPTIMISM_STRATEGIES_INFO: OptimismStrategiesInfo = {
@@ -456,6 +451,32 @@ export const MAINNET_BUNDLES_INFO: MainnetBundleInfo = {
     strategyId: Strategies.Identifiers.EoaCloseOnPrice,
     protocol: PROTOCOLS.CompoundV3,
   },
+  [Bundles.MainnetIds.AAVE_V3_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V3_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.MainnetIds.AAVE_V3_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.MainnetIds.AAVE_V3_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+
 };
 
 export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
@@ -489,6 +510,32 @@ export const OPTIMISM_BUNDLES_INFO: OptimismBundleInfo = {
     strategyId: Strategies.Identifiers.RepayOnPrice,
     protocol: PROTOCOLS.AaveV3,
   },
+  [Bundles.OptimismIds.AAVE_V3_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.OptimismIds.AAVE_V3_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.OptimismIds.AAVE_V3_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.OptimismIds.AAVE_V3_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+
 };
 
 export const BASE_BUNDLES_INFO: BaseBundleInfo = {
@@ -597,6 +644,32 @@ export const BASE_BUNDLES_INFO: BaseBundleInfo = {
     strategyId: Strategies.Identifiers.EoaBoost,
     protocol: PROTOCOLS.CompoundV3,
   },
+  [Bundles.BaseIds.AAVE_V3_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.BaseIds.AAVE_V3_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.BaseIds.AAVE_V3_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.BaseIds.AAVE_V3_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+
 };
 
 export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
@@ -690,6 +763,31 @@ export const ARBITRUM_BUNDLES_INFO: ArbitrumBundleInfo = {
     strategyId: Strategies.Identifiers.EoaBoost,
     protocol: PROTOCOLS.CompoundV3,
   },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY,
+    strategyId: Strategies.Identifiers.EoaRepay,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST,
+    strategyId: Strategies.Identifiers.EoaBoost,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_REPAY_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaRepayOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_BOOST_ON_PRICE,
+    strategyId: Strategies.Identifiers.EoaBoostOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
+  [Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE]: {
+    strategyOrBundleId: Bundles.ArbitrumIds.AAVE_V3_EOA_CLOSE,
+    strategyId: Strategies.Identifiers.EoaCloseOnPrice,
+    protocol: PROTOCOLS.AaveV3,
+  },
 };
 
 export const BUNDLES_INFO: BundlesInfo = {

package/src/index.ts

@@ -23,10 +23,12 @@ import * as constants from './constants';
 import * as enums from './types/enums';
 import type * as types from './types';
 
-import { getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId } from './services/utils';
+import {
+  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType,
+} from './services/utils';
 
 const utils = {
-  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId,
+  getRatioStateInfoForAaveCloseStrategy, compareSubHashes, encodeSubId, getCloseStrategyType,
 };
 
 export {

package/src/services/strategiesService.ts

@@ -231,7 +231,7 @@ function parseAaveV2LeverageManagement(position: Position.Automated, parseData:
 function parseAaveV3LeverageManagement(position: Position.Automated, parseData: ParseData): Position.Automated {
   const _position = cloneDeep(position);
 
-  const { subStruct, subId } = parseData.subscriptionEventData;
+  const { subStruct, subId, subHash } = parseData.subscriptionEventData;
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.aaveV3RatioTrigger.decode(subStruct.triggerData);
@@ -242,7 +242,11 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
 
   _position.positionId = getPositionId(_position.chainId, _position.protocol.id, _position.owner, triggerData.market);
 
-  const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;
+  // TODO -> check if this change breaks something?
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
+  // TODO -> check if this change breaks something?
+  const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
   if (isRepay) {
     _position.specific = {
@@ -250,7 +254,8 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      subHashRepay: subHash,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -258,12 +263,12 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      subHashBoost: subHash,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   }
 
-  _position.strategy.strategyId = Strategies.IdOverrides.LeverageManagement;
-
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
   return _position;
 }
 
@@ -337,7 +342,13 @@ function parseAaveV3CloseOnPrice(position: Position.Automated, parseData: ParseD
     parseData.chainId,
   );
 
-  _position.strategy.strategyId = isRatioStateOver(ratioState) ? Strategies.IdOverrides.TakeProfit : Strategies.IdOverrides.StopLoss;
+  // TODO -> Check if those changes break something?
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA
+    ? Strategies.Identifiers.EoaCloseOnPrice
+    : (_position.strategy.strategyId = isRatioStateOver(ratioState)
+      ? Strategies.IdOverrides.TakeProfit
+      : Strategies.IdOverrides.StopLoss);
 
   return _position;
 }
@@ -442,13 +453,15 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
 
   const isRepay = [Strategies.Identifiers.Repay, Strategies.Identifiers.EoaRepay].includes(_position.strategy.strategyId as Strategies.Identifiers);
 
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+
   if (isRepay) {
     _position.specific = {
       triggerRepayRatio: triggerData.ratio,
       targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
-      mergeWithId: Strategies.Identifiers.Boost,
+      mergeWithId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   } else {
     _position.specific = {
@@ -456,11 +469,10 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
       targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
-      mergeId: Strategies.Identifiers.Boost,
+      mergeId: isEOA ? Strategies.Identifiers.EoaBoost : Strategies.Identifiers.Boost,
     };
   }
 
-  const isEOA = _position.strategy.strategyId.includes('eoa');
   _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagement : Strategies.IdOverrides.LeverageManagement;
 
   return _position;
@@ -938,6 +950,10 @@ function parseAaveV3LeverageManagementOnPrice(position: Position.Automated, pars
     ratio: subData.targetRatio,
   };
 
+  // TODO -> check if this change breaks something?
+  const isEOA = _position.strategy.strategyId.includes('eoa');
+  _position.strategy.strategyId = isEOA ? Strategies.IdOverrides.EoaLeverageManagementOnPrice : Strategies.IdOverrides.LeverageManagementOnPrice;
+
   return _position;
 }
 
@@ -1068,32 +1084,6 @@ function parseFluidT1LeverageManagement(position: Position.Automated, parseData:
   return _position;
 }
 
-function parseLiquityV2InterestRateAdjustment(position: Position.Automated, parseData: ParseData): Position.Automated {
-  const _position = cloneDeep(position);
-
-  const { subStruct } = parseData.subscriptionEventData;
-
-  const triggerData = triggerService.liquityV2InterestRateAdjustmentTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.liquityV2InterestRateAdjustmentSubData.decode(subStruct.subData);
-
-  _position.strategyData.decoded.triggerData = triggerData;
-  _position.strategyData.decoded.subData = subData;
-
-  _position.positionId = getPositionId(
-    _position.chainId, _position.protocol.id, _position.owner, triggerData.troveId, triggerData.market,
-  );
-
-  _position.specific = {
-    market: subData.market,
-    troveId: subData.troveId,
-    criticalDebtInFrontLimit: triggerData.criticalDebtInFrontLimit,
-    nonCriticalDebtInFrontLimit: triggerData.nonCriticalDebtInFrontLimit,
-    interestRateChange: subData.interestRateChange,
-  };
-
-  return _position;
-}
-
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -1121,7 +1111,6 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.BoostOnPrice]: parseLiquityV2LeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseLiquityV2LeverageManagementOnPrice,
     [Strategies.Identifiers.Payback]: parseLiquityV2Payback,
-    [Strategies.Identifiers.InterestRateAdjustment]: parseLiquityV2InterestRateAdjustment,
   },
   [ProtocolIdentifiers.StrategiesAutomation.AaveV2]: {
     [Strategies.Identifiers.Repay]: parseAaveV2LeverageManagement,
@@ -1136,6 +1125,11 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.CloseToCollateralWithGasPrice]: parseAaveV3CloseOnPriceWithMaximumGasPrice,
     [Strategies.Identifiers.OpenOrderFromCollateral]: parseAaveV3LeverageManagementOnPrice,
     [Strategies.Identifiers.RepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaRepay]: parseAaveV3LeverageManagement,
+    [Strategies.Identifiers.EoaBoost]: parseAaveV3LeverageManagement,
+    [Strategies.Identifiers.EoaRepayOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaBoostOnPrice]: parseAaveV3LeverageManagementOnPrice,
+    [Strategies.Identifiers.EoaCloseOnPrice]: parseAaveV3CloseOnPrice,
   },
   [ProtocolIdentifiers.StrategiesAutomation.CompoundV2]: {
     [Strategies.Identifiers.Repay]: parseCompoundV2LeverageManagement,