@defisaver/automation-sdk 1.2.7 → 1.2.10

package/esm/services/strategiesService.js

@@ -142,7 +142,7 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
     const { subStruct, subId } = parseData.subscriptionEventData;
     const { isEnabled } = parseData.strategiesSubsData;
     const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.morphoLeverageManagementSubData.decode(subStruct.subData);
+    const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     const isRepay = _position.strategy.strategyId === Strategies.Identifiers.Repay;

package/esm/services/strategySubService.d.ts

@@ -31,3 +31,6 @@ export declare const aaveV3Encode: {
 export declare const compoundV3Encode: {
     leverageManagement(market: EthereumAddress, baseToken: EthereumAddress, minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean, isEOA: boolean): string[];
 };
+export declare const morphoAaveV2Encode: {
+    leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+};

package/esm/services/strategySubService.js

@@ -99,3 +99,8 @@ export const compoundV3Encode = {
         return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
     },
 };
+export const morphoAaveV2Encode = {
+    leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        return subDataService.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+    },
+};

package/esm/services/subDataService.d.ts

@@ -34,11 +34,6 @@ export declare const aaveLeverageManagementSubData: {
         targetRatio: number;
     };
 };
-export declare const morphoLeverageManagementSubData: {
-    decode(subData: string[]): {
-        targetRatio: number;
-    };
-};
 export declare const aaveV3QuotePriceSubData: {
     encode(collAsset: EthereumAddress, collAssetId: number, debtAsset: EthereumAddress, debtAssetId: number, nullAddress?: EthereumAddress): string[];
     decode(subData: string[]): {
@@ -54,6 +49,12 @@ export declare const compoundV3LeverageManagementSubData: {
         targetRatio: number;
     };
 };
+export declare const morphoAaveV2LeverageManagementSubData: {
+    encode(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const cBondsRebondSubData: {
     encode(bondId: number | string): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -96,13 +96,6 @@ export const aaveLeverageManagementSubData = {
         return { targetRatio };
     },
 };
-export const morphoLeverageManagementSubData = {
-    decode(subData) {
-        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
-        const targetRatio = weiToRatioPercentage(ratioWei);
-        return { targetRatio };
-    },
-};
 export const aaveV3QuotePriceSubData = {
     encode(collAsset, collAssetId, debtAsset, debtAssetId, nullAddress = ZERO_ADDRESS) {
         const encodedColl = mockedWeb3.eth.abi.encodeParameter('address', collAsset);
@@ -141,6 +134,21 @@ export const compoundV3LeverageManagementSubData = {
         return { targetRatio };
     },
 };
+export const morphoAaveV2LeverageManagementSubData = {
+    encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+        const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minRatio).mul(1e16).toString());
+        const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxRatio).mul(1e16).toString());
+        const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxOptimalRatio).mul(1e16).toString());
+        const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minOptimalRatio).mul(1e16).toString());
+        const encodedBoostEnabled = mockedWeb3.eth.abi.encodeParameter('bool', boostEnabled);
+        return [encodedMinRatio, encodedMaxRatio, encodedMaxOptimalRatio, encodedMinOptimalRatio, encodedBoostEnabled];
+    },
+    decode(subData) {
+        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]);
+        const targetRatio = weiToRatioPercentage(ratioWei);
+        return { targetRatio };
+    },
+};
 export const cBondsRebondSubData = {
     encode(bondId) {
         const bondIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', bondId);

package/esm/services/triggerService.js

@@ -49,15 +49,15 @@ export const aaveV3RatioTrigger = {
 };
 export const morphoAaveV2RatioTrigger = {
     encode(owner, ratioPercentage, ratioState) {
-        const ratioWei = ratioPercentageToWei(ratioPercentage);
-        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+        const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
+        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
     },
     decode(triggerData) {
-        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
         return {
             owner: decodedData[0],
-            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
-            ratioState: Number(decodedData[3]),
+            ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
+            ratioState: Number(decodedData[2]),
         };
     },
 };

package/package.json

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

package/src/services/strategiesService.ts

@@ -198,7 +198,7 @@ function parseMorphoAaveV2LeverageManagement(position: Position.Automated, parse
   const { isEnabled } = parseData.strategiesSubsData;
 
   const triggerData = triggerService.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.morphoLeverageManagementSubData.decode(subStruct.subData);
+  const subData = subDataService.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;

package/src/services/strategySubService.ts

@@ -217,3 +217,15 @@ export const compoundV3Encode = {
     return subDataService.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
   },
 };
+
+export const morphoAaveV2Encode = {
+  leverageManagement(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ) {
+    return subDataService.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+  },
+};

package/src/services/subDataService.ts

@@ -134,15 +134,6 @@ export const aaveLeverageManagementSubData = { // TODO encode?
   },
 };
 
-export const morphoLeverageManagementSubData = {
-  decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]) as any as string;
-    const targetRatio = weiToRatioPercentage(ratioWei);
-
-    return { targetRatio };
-  },
-};
-
 export const aaveV3QuotePriceSubData = {
   encode(
     collAsset: EthereumAddress,
@@ -204,6 +195,30 @@ export const compoundV3LeverageManagementSubData = {
   },
 };
 
+export const morphoAaveV2LeverageManagementSubData = {
+  encode(
+    minRatio: number,
+    maxRatio: number,
+    maxOptimalRatio: number,
+    minOptimalRatio: number,
+    boostEnabled: boolean,
+  ): SubData {
+    const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minRatio).mul(1e16).toString());
+    const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxRatio).mul(1e16).toString());
+    const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxOptimalRatio).mul(1e16).toString());
+    const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minOptimalRatio).mul(1e16).toString());
+    const encodedBoostEnabled = mockedWeb3.eth.abi.encodeParameter('bool', boostEnabled);
+
+    return [encodedMinRatio, encodedMaxRatio, encodedMaxOptimalRatio, encodedMinOptimalRatio, encodedBoostEnabled];
+  },
+  decode(subData: SubData): { targetRatio: number } {
+    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(ratioWei);
+
+    return { targetRatio };
+  },
+};
+
 export const cBondsRebondSubData = {
   encode(bondId: number | string): SubData {
     const bondIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', bondId);

package/src/services/triggerService.ts

@@ -61,15 +61,15 @@ export const aaveV3RatioTrigger = {
 
 export const morphoAaveV2RatioTrigger = {
   encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
-    const ratioWei = ratioPercentageToWei(ratioPercentage);
-    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+    const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData: TriggerData) {
-    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]) as string[];
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]) as string[];
     return {
       owner: decodedData[0],
-      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
-      ratioState: Number(decodedData[3]),
+      ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
+      ratioState: Number(decodedData[2]),
     };
   },
 };

package/umd/index.js

@@ -1561,7 +1561,7 @@ function parseMorphoAaveV2LeverageManagement(position, parseData) {
     isEnabled
   } = parseData.strategiesSubsData;
   var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_5__.morphoAaveV2RatioTrigger.decode(subStruct.triggerData);
-  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_4__.morphoLeverageManagementSubData.decode(subStruct.subData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_4__.morphoAaveV2LeverageManagementSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
   var isRepay = _position.strategy.strategyId === _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.Identifiers.Repay;
@@ -18976,7 +18976,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "makerCloseSubData": () => (/* binding */ makerCloseSubData),
 /* harmony export */   "makerLeverageManagementSubData": () => (/* binding */ makerLeverageManagementSubData),
 /* harmony export */   "makerRepayFromSavingsSubData": () => (/* binding */ makerRepayFromSavingsSubData),
-/* harmony export */   "morphoLeverageManagementSubData": () => (/* binding */ morphoLeverageManagementSubData)
+/* harmony export */   "morphoAaveV2LeverageManagementSubData": () => (/* binding */ morphoAaveV2LeverageManagementSubData)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -19102,15 +19102,6 @@ var aaveLeverageManagementSubData = {
     };
   }
 };
-var morphoLeverageManagementSubData = {
-  decode(subData) {
-    var ratioWei = mockedWeb3.eth.abi.decodeParameter('uint256', subData[0]);
-    var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.weiToRatioPercentage)(ratioWei);
-    return {
-      targetRatio
-    };
-  }
-};
 var aaveV3QuotePriceSubData = {
   encode(collAsset, collAssetId, debtAsset, debtAssetId) {
     var nullAddress = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : _constants__WEBPACK_IMPORTED_MODULE_4__.ZERO_ADDRESS;
@@ -19148,6 +19139,23 @@ var compoundV3LeverageManagementSubData = {
     };
   }
 };
+var morphoAaveV2LeverageManagementSubData = {
+  encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+    var encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minRatio).mul(1e16).toString());
+    var encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxRatio).mul(1e16).toString());
+    var encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(maxOptimalRatio).mul(1e16).toString());
+    var encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(minOptimalRatio).mul(1e16).toString());
+    var encodedBoostEnabled = mockedWeb3.eth.abi.encodeParameter('bool', boostEnabled);
+    return [encodedMinRatio, encodedMaxRatio, encodedMaxOptimalRatio, encodedMinOptimalRatio, encodedBoostEnabled];
+  },
+  decode(subData) {
+    var ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]);
+    var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_5__.weiToRatioPercentage)(ratioWei);
+    return {
+      targetRatio
+    };
+  }
+};
 var cBondsRebondSubData = {
   encode(bondId) {
     var bondIdEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', bondId);
@@ -28768,15 +28776,15 @@ var aaveV3RatioTrigger = {
 };
 var morphoAaveV2RatioTrigger = {
   encode(owner, ratioPercentage, ratioState) {
-    var ratioWei = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.ratioPercentageToWei)(ratioPercentage);
-    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+    var ratioWei = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(ratioPercentage).mul(1e16).toString();
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData) {
-    var decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+    var decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
     return {
       owner: decodedData[0],
-      ratio: new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
-      ratioState: Number(decodedData[3])
+      ratio: new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[1]).div(1e16).toNumber(),
+      ratioState: Number(decodedData[2])
     };
   }
 };
@@ -28943,7 +28951,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "chickenBondsEncode": () => (/* binding */ chickenBondsEncode),
 /* harmony export */   "compoundV3Encode": () => (/* binding */ compoundV3Encode),
 /* harmony export */   "liquityEncode": () => (/* binding */ liquityEncode),
-/* harmony export */   "makerEncode": () => (/* binding */ makerEncode)
+/* harmony export */   "makerEncode": () => (/* binding */ makerEncode),
+/* harmony export */   "morphoAaveV2Encode": () => (/* binding */ morphoAaveV2Encode)
 /* harmony export */ });
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(3);
 /* harmony import */ var decimal_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(decimal_js__WEBPACK_IMPORTED_MODULE_0__);
@@ -29069,6 +29078,11 @@ var compoundV3Encode = {
     return _subDataService__WEBPACK_IMPORTED_MODULE_3__.compoundV3LeverageManagementSubData.encode(market, baseToken, minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled, isEOA);
   }
 };
+var morphoAaveV2Encode = {
+  leverageManagement(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
+    return _subDataService__WEBPACK_IMPORTED_MODULE_3__.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
+  }
+};
 
 /***/ })
 /******/ 	]);