@defisaver/automation-sdk 2.0.3 → 2.0.4

package/esm/services/strategiesService.js

@@ -422,8 +422,8 @@ function parseSparkCloseOnPrice(position, parseData) {
 function parseLiquitySavingsLiqProtection(position, parseData) {
     const _position = (0, lodash_1.cloneDeep)(position);
     const { subStruct } = parseData.subscriptionEventData;
-    const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-    const subData = subDataService.makerRepayFromSavingsSubData.decode(subStruct.subData);
+    const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
+    const subData = subDataService.liquityRepayFromSavingsSubData.decode(subStruct.subData);
     _position.strategyData.decoded.triggerData = triggerData;
     _position.strategyData.decoded.subData = subData;
     _position.specific = {

package/esm/services/subDataService.d.ts

@@ -9,6 +9,11 @@ export declare const makerRepayFromSavingsSubData: {
         targetRatio: number;
     };
 };
+export declare const liquityRepayFromSavingsSubData: {
+    decode(subData: string[]): {
+        targetRatio: number;
+    };
+};
 export declare const makerCloseSubData: {
     encode(vaultId: number, closeToAssetAddr: EthereumAddress, chainId: ChainId, daiAddr?: EthereumAddress, mcdCdpManagerAddr?: EthereumAddress): string[];
     decode(subData: string[]): {

package/esm/services/subDataService.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.makerRepayFromSavingsSubData = void 0;
+exports.liquityDsrSupplySubData = exports.liquityDsrPaybackSubData = exports.sparkQuotePriceSubData = exports.sparkLeverageManagementSubData = exports.exchangeLimitOrderSubData = exports.exchangeDcaSubData = exports.liquityPaybackUsingChickenBondSubData = exports.cBondsRebondSubData = exports.morphoAaveV2LeverageManagementSubData = exports.compoundV3LeverageManagementSubData = exports.compoundV2LeverageManagementSubData = exports.aaveV3QuotePriceSubData = exports.aaveV3LeverageManagementSubData = exports.aaveV2LeverageManagementSubData = exports.liquityCloseSubData = exports.liquityLeverageManagementSubData = exports.makerLeverageManagementSubData = exports.makerCloseSubData = exports.liquityRepayFromSavingsSubData = exports.makerRepayFromSavingsSubData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const web3_eth_abi_1 = __importDefault(require("web3-eth-abi"));
 const tokens_1 = require("@defisaver/tokens");
@@ -34,6 +34,13 @@ exports.makerRepayFromSavingsSubData = {
         };
     },
 };
+exports.liquityRepayFromSavingsSubData = {
+    decode(subData) {
+        const weiRatio = web3_eth_abi_1.default.decodeParameter('uint256', subData[1]);
+        const targetRatio = (0, utils_1.weiToRatioPercentage)(weiRatio);
+        return { targetRatio };
+    },
+};
 exports.makerCloseSubData = {
     encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr) {
         const _daiAddr = daiAddr || (0, tokens_1.getAssetInfo)('DAI', chainId).address;

package/esm/services/triggerService.js

@@ -159,7 +159,7 @@ exports.aaveV2RatioTrigger = {
         return {
             owner: decodedData[0],
             market: decodedData[1],
-            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[1]),
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
             ratioState: +decodedData[3],
         };
     },
@@ -183,7 +183,7 @@ exports.compoundV3RatioTrigger = {
         return {
             owner: decodedData[0],
             market: decodedData[1],
-            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[1]),
+            ratio: (0, utils_1.weiToRatioPercentage)(decodedData[2]),
             ratioState: +decodedData[3],
         };
     },

package/package.json

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

package/src/services/strategiesService.ts

@@ -535,8 +535,8 @@ function parseLiquitySavingsLiqProtection(position: Position.Automated, parseDat
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  const triggerData = triggerService.makerRatioTrigger.decode(subStruct.triggerData);
-  const subData = subDataService.makerRepayFromSavingsSubData.decode(subStruct.subData);
+  const triggerData = triggerService.liquityRatioTrigger.decode(subStruct.triggerData);
+  const subData = subDataService.liquityRepayFromSavingsSubData.decode(subStruct.subData);
 
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;

package/src/services/subDataService.ts

@@ -45,6 +45,15 @@ export const makerRepayFromSavingsSubData = {
   },
 };
 
+export const liquityRepayFromSavingsSubData = {
+  decode(subData: SubData): { targetRatio: number } {
+    const weiRatio = AbiCoder.decodeParameter('uint256', subData[1]) as any as string;
+    const targetRatio = weiToRatioPercentage(weiRatio);
+
+    return { targetRatio };
+  },
+};
+
 export const makerCloseSubData = {
   encode(
     vaultId: number,

package/src/services/triggerService.ts

@@ -153,7 +153,7 @@ export const aaveV2RatioTrigger = {
     return {
       owner: decodedData[0] as EthereumAddress,
       market: decodedData[1] as EthereumAddress,
-      ratio: weiToRatioPercentage(decodedData[1] as string),
+      ratio: weiToRatioPercentage(decodedData[2] as string),
       ratioState: +decodedData[3]!,
     };
   },
@@ -186,7 +186,7 @@ export const compoundV3RatioTrigger = {
     return {
       owner: decodedData[0] as EthereumAddress,
       market: decodedData[1] as EthereumAddress,
-      ratio: weiToRatioPercentage(decodedData[1] as string),
+      ratio: weiToRatioPercentage(decodedData[2] as string),
       ratioState: +decodedData[3]!,
     };
   },

package/umd/index.js

@@ -1990,8 +1990,8 @@ function parseLiquitySavingsLiqProtection(position, parseData) {
   var {
     subStruct
   } = parseData.subscriptionEventData;
-  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.makerRatioTrigger.decode(subStruct.triggerData);
-  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.makerRepayFromSavingsSubData.decode(subStruct.subData);
+  var triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.liquityRatioTrigger.decode(subStruct.triggerData);
+  var subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.liquityRepayFromSavingsSubData.decode(subStruct.subData);
   _position.strategyData.decoded.triggerData = triggerData;
   _position.strategyData.decoded.subData = subData;
   _position.specific = {
@@ -19335,6 +19335,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   liquityDsrSupplySubData: () => (/* binding */ liquityDsrSupplySubData),
 /* harmony export */   liquityLeverageManagementSubData: () => (/* binding */ liquityLeverageManagementSubData),
 /* harmony export */   liquityPaybackUsingChickenBondSubData: () => (/* binding */ liquityPaybackUsingChickenBondSubData),
+/* harmony export */   liquityRepayFromSavingsSubData: () => (/* binding */ liquityRepayFromSavingsSubData),
 /* harmony export */   makerCloseSubData: () => (/* binding */ makerCloseSubData),
 /* harmony export */   makerLeverageManagementSubData: () => (/* binding */ makerLeverageManagementSubData),
 /* harmony export */   makerRepayFromSavingsSubData: () => (/* binding */ makerRepayFromSavingsSubData),
@@ -19385,6 +19386,15 @@ var makerRepayFromSavingsSubData = {
     };
   }
 };
+var liquityRepayFromSavingsSubData = {
+  decode(subData) {
+    var weiRatio = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameter('uint256', subData[1]);
+    var targetRatio = (0,_utils__WEBPACK_IMPORTED_MODULE_6__.weiToRatioPercentage)(weiRatio);
+    return {
+      targetRatio
+    };
+  }
+};
 var makerCloseSubData = {
   encode(vaultId, closeToAssetAddr, chainId, daiAddr, mcdCdpManagerAddr) {
     var _daiAddr = daiAddr || (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_2__.getAssetInfo)('DAI', chainId).address;
@@ -32486,7 +32496,7 @@ var aaveV2RatioTrigger = {
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
       ratioState: +decodedData[3]
     };
   }
@@ -32512,7 +32522,7 @@ var compoundV3RatioTrigger = {
     return {
       owner: decodedData[0],
       market: decodedData[1],
-      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]),
+      ratio: (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[2]),
       ratioState: +decodedData[3]
     };
   }