@defisaver/automation-sdk 1.2.32 → 2.0.0

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

@@ -24,8 +24,8 @@ function parseMakerSavingsLiqProtection(position: Position.Automated, parseData:
   _position.strategyData.decoded.subData = subData;
 
   _position.specific = {
-    minRatio: Number(triggerData.ratio),
-    minOptimalRatio: Number(subData.targetRatio),
+    triggerRepayRatio: Number(triggerData.ratio),
+    targetRepayRatio: Number(subData.targetRatio),
     repayEnabled: true,
     boostEnabled: false,
   };
@@ -93,15 +93,15 @@ function parseMakerLeverageManagement(position: Position.Automated, parseData: P
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -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 = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: 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;
@@ -173,15 +209,15 @@ function parseAaveV3LeverageManagement(position: Position.Automated, parseData:
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -209,15 +245,15 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -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 = {
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
+      repayEnabled: true,
+      subId1: Number(subId),
+    };
+  } else {
+    _position.specific = {
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: 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);
 
@@ -279,15 +351,15 @@ function parseCompoundV3LeverageManagement(position: Position.Automated, parseDa
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -323,8 +395,8 @@ function parseLiquityBondProtection(position: Position.Automated, parseData: Par
   _position.strategyData.decoded.triggerData = triggerData;
 
   _position.specific = {
-    minRatio: Number(triggerData.ratio),
-    minOptimalRatio: Infinity, // Unknown minOptimalRatio, uses all assets from chicken bond until trove min debt (2000LUSD)
+    triggerRepayRatio: Number(triggerData.ratio),
+    targetRepayRatio: Infinity, // Unknown targetRepayRatio, uses all assets from chicken bond until trove min debt (2000LUSD)
     repayEnabled: true,
   };
   return _position;
@@ -368,15 +440,15 @@ function parseLiquityLeverageManagement(position: Position.Automated, parseData:
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -404,15 +476,15 @@ function parseSparkLeverageManagement(position: Position.Automated, parseData: P
 
   if (isRepay) {
     _position.specific = {
-      minRatio: triggerData.ratio,
-      minOptimalRatio: subData.targetRatio,
+      triggerRepayRatio: triggerData.ratio,
+      targetRepayRatio: subData.targetRatio,
       repayEnabled: true,
       subId1: Number(subId),
     };
   } else {
     _position.specific = {
-      maxRatio: triggerData.ratio,
-      maxOptimalRatio: subData.targetRatio,
+      triggerBoostRatio: triggerData.ratio,
+      targetBoostRatio: subData.targetRatio,
       boostEnabled: isEnabled,
       subId2: Number(subId),
     };
@@ -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

@@ -14,15 +14,15 @@ export const makerEncode = {
   repayFromSavings(
     bundleId: StrategyOrBundleIds,
     vaultId: number,
-    minRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    targetRepayRatio: number,
     isBundle: boolean = true,
     chainId: ChainId = ChainId.Ethereum,
     daiAddr?: EthereumAddress,
     mcdCdpManagerAddr?: EthereumAddress,
   ) {
-    const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, minOptimalRatio, chainId, daiAddr, mcdCdpManagerAddr);
-    const triggerData = triggerService.makerRatioTrigger.encode(vaultId, minRatio, RatioState.UNDER);
+    const subData = subDataService.makerRepayFromSavingsSubData.encode(vaultId, targetRepayRatio, chainId, daiAddr, mcdCdpManagerAddr);
+    const triggerData = triggerService.makerRatioTrigger.encode(vaultId, triggerRepayRatio, RatioState.UNDER);
 
     return [bundleId, isBundle, triggerData, subData];
   },
@@ -74,18 +74,18 @@ export const makerEncode = {
   },
   leverageManagement(
     vaultId:number,
-    minRatio:string,
-    maxRatio:string,
-    maxOptimalRatio:string,
-    minOptimalRatio:string,
+    triggerRepayRatio:string,
+    triggerBoostRatio:string,
+    targetBoostRatio:string,
+    targetRepayRatio:string,
     boostEnabled:boolean,
   ) {
     return [
       vaultId,
-      new Dec(minRatio).mul(1e16).toString(),
-      new Dec(maxRatio).mul(1e16).toString(),
-      new Dec(maxOptimalRatio).mul(1e16).toString(),
-      new Dec(minOptimalRatio).mul(1e16).toString(),
+      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,
     ];
   },
@@ -150,17 +150,17 @@ export const liquityEncode = {
     return [strategyId, isBundle, triggerData, subData];
   },
   leverageManagement(
-    minRatio:string,
-    maxRatio:string,
-    maxOptimalRatio:string,
-    minOptimalRatio:string,
+    triggerRepayRatio:string,
+    triggerBoostRatio:string,
+    targetBoostRatio:string,
+    targetRepayRatio:string,
     boostEnabled:boolean,
   ) {
     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(),
+      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,
     ];
   },
@@ -172,23 +172,35 @@ export const chickenBondsEncode = {
   },
 };
 
+export const aaveV2Encode = {
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ) {
+    return subDataService.aaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+  },
+};
+
 export const aaveV3Encode = {
   leverageManagement(
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
   ) {
     let subInput = '0x';
 
-    subInput = subInput.concat(new Dec(minRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(maxRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(maxOptimalRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(minOptimalRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
     subInput = subInput.concat(boostEnabled ? '01' : '00');
 
@@ -218,30 +230,42 @@ export const aaveV3Encode = {
   },
 };
 
+export const compoundV2Encode = {
+  leverageManagement(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ) {
+    return subDataService.compoundV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
+  },
+};
+
 export const compoundV3Encode = {
   leverageManagement(
     market: EthereumAddress,
     baseToken: EthereumAddress,
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
     isEOA: boolean,
   ) {
-    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
+    return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled, isEOA);
   },
 };
 
 export const morphoAaveV2Encode = {
   leverageManagement(
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
   ) {
-    return subDataService.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+    return subDataService.morphoAaveV2LeverageManagementSubData.encode(triggerRepayRatio, triggerBoostRatio, targetBoostRatio, targetRepayRatio, boostEnabled);
   },
 };
 
@@ -281,21 +305,21 @@ export const exchangeEncode = {
 
 export const sparkEncode = {
   leverageManagement(
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
   ) {
     let subInput = '0x';
 
-    subInput = subInput.concat(new Dec(minRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(triggerRepayRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(maxRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(triggerBoostRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(maxOptimalRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(targetBoostRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
-    subInput = subInput.concat(new Dec(minOptimalRatio).mul(1e16).toHex().slice(2)
+    subInput = subInput.concat(new Dec(targetRepayRatio).mul(1e16).toHex().slice(2)
       .padStart(32, '0'));
     subInput = subInput.concat(boostEnabled ? '01' : '00');
 

package/src/services/subDataService.ts

@@ -132,7 +132,32 @@ export const liquityCloseSubData = {
   },
 };
 
-export const aaveLeverageManagementSubData = { // TODO encode?
+export const aaveV2LeverageManagementSubData = {
+  encode(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ): 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(),
+      // @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,24 +197,49 @@ export const aaveV3QuotePriceSubData = {
   },
 };
 
+export const compoundV2LeverageManagementSubData = {
+  encode(
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
+    boostEnabled: boolean,
+  ): 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(),
+      // @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,
     baseToken: EthereumAddress,
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
     isEOA: boolean,
   ): SubData {
     return [
       market,
       baseToken,
-      new Dec(minRatio).mul(1e16).toString(),
-      new Dec(maxRatio).mul(1e16).toString(),
-      new Dec(maxOptimalRatio).mul(1e16).toString(),
-      new Dec(minOptimalRatio).mul(1e16).toString(),
+      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,
     ];
@@ -204,17 +254,17 @@ export const compoundV3LeverageManagementSubData = {
 
 export const morphoAaveV2LeverageManagementSubData = {
   encode(
-    minRatio: number,
-    maxRatio: number,
-    maxOptimalRatio: number,
-    minOptimalRatio: number,
+    triggerRepayRatio: number,
+    triggerBoostRatio: number,
+    targetBoostRatio: number,
+    targetRepayRatio: number,
     boostEnabled: boolean,
   ): SubData {
     return [
-      ratioPercentageToWei(minRatio),
-      ratioPercentageToWei(maxRatio),
-      ratioPercentageToWei(maxOptimalRatio),
-      ratioPercentageToWei(minOptimalRatio),
+      ratioPercentageToWei(triggerRepayRatio),
+      ratioPercentageToWei(triggerBoostRatio),
+      ratioPercentageToWei(targetBoostRatio),
+      ratioPercentageToWei(targetRepayRatio),
       // @ts-ignore
       boostEnabled,
     ];

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],
     };
   },

package/src/types/contracts/generated/Legacy_AaveV2Subscriptions.ts

@@ -33,8 +33,8 @@ export declare namespace AaveSubscriptionsV2 {
       ]
     | {
         user: string;
-        minRatio: number | string | BN;
-        maxRatio: number | string | BN;
+        triggerRepayRatio: number | string | BN;
+        triggerBoostRatio: number | string | BN;
         optimalRatioBoost: number | string | BN;
         optimalRatioRepay: number | string | BN;
         boostEnabled: boolean;
@@ -50,8 +50,8 @@ export declare namespace AaveSubscriptionsV2 {
   ];
   export type AaveHolderStructOutputStruct = {
     user: string;
-    minRatio: string;
-    maxRatio: string;
+    triggerRepayRatio: string;
+    triggerBoostRatio: string;
     optimalRatioBoost: string;
     optimalRatioRepay: string;
     boostEnabled: boolean;
@@ -124,8 +124,8 @@ export interface Legacy_AaveV2Subscriptions extends BaseContract {
     setOwnerByAdmin(_owner: string): NonPayableTransactionObject<void>;
 
     subscribe(
-      _minRatio: number | string | BN,
-      _maxRatio: number | string | BN,
+      _triggerRepayRatio: number | string | BN,
+      _triggerBoostRatio: number | string | BN,
       _optimalBoost: number | string | BN,
       _optimalRepay: number | string | BN,
       _boostEnabled: boolean
@@ -136,8 +136,8 @@ export interface Legacy_AaveV2Subscriptions extends BaseContract {
     ): NonPayableTransactionObject<
       [string, string, string, string, string, boolean] & {
         user: string;
-        minRatio: string;
-        maxRatio: string;
+        triggerRepayRatio: string;
+        triggerBoostRatio: string;
         optimalRatioBoost: string;
         optimalRatioRepay: string;
         boostEnabled: boolean;