@defisaver/automation-sdk 2.0.3 → 2.0.5

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]!,
     };
   },
@@ -206,21 +206,23 @@ export const exchangeTimestampTrigger = {
   ): { timestamp: number, interval: number } {
     const decodedData = AbiCoder.decodeParameters(['uint256', 'uint256'], triggerData[0]);
     return {
-      timestamp: decodedData[0] as number,
-      interval: decodedData[1] as number,
+      timestamp: Number(decodedData[0]) as number,
+      interval: Number(decodedData[1]) as number,
     };
   },
 };
+
 export const exchangeOffchainPriceTrigger = {
   encode(
     targetPrice: string,
     goodUntil: number,
     orderType: OrderType,
     fromTokenDecimals: number,
+    toTokenDecimals: number,
   ) {
-    const price = new Dec(targetPrice.toString()).mul(10 ** fromTokenDecimals).floor().toString();
-    const goodUntilWei = web3Utils.toWei(new Dec(goodUntil).toString(), 'ether');
-    return [AbiCoder.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
+    const decimals = new Dec(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
+    const price = new Dec(targetPrice.toString()).mul(10 ** decimals).floor().toString();
+    return [AbiCoder.encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
   },
   decode(
     triggerData: TriggerData,
@@ -232,7 +234,7 @@ export const exchangeOffchainPriceTrigger = {
     const price = new Dec(decodedData[0] as string).div(new Dec(10).pow(decimals)).toDP(fromTokenDecimals).toString();
     return {
       targetPrice: price,
-      goodUntil: decodedData[1],
+      goodUntil: +decodedData[1],
       orderType: +decodedData[2]!,
     };
   },
@@ -298,7 +300,7 @@ export const curveUsdBorrowRateTrigger = {
     triggerData: TriggerData,
   ): { market: EthereumAddress, targetRate: string, rateState: RatioState } {
     const decodedData = AbiCoder.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-    const rateEth = weiToRatioPercentage(decodedData[1] as string);
+    const rateEth = web3Utils.fromWei(decodedData[1] as string, 'ether');
 
     // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
     const exponentRate = new Dec(rateEth).mul(365).mul(86400);

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]
     };
   }
@@ -32526,16 +32536,16 @@ var exchangeTimestampTrigger = {
   decode(triggerData) {
     var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256', 'uint256'], triggerData[0]);
     return {
-      timestamp: decodedData[0],
-      interval: decodedData[1]
+      timestamp: Number(decodedData[0]),
+      interval: Number(decodedData[1])
     };
   }
 };
 var exchangeOffchainPriceTrigger = {
-  encode(targetPrice, goodUntil, orderType, fromTokenDecimals) {
-    var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(targetPrice.toString()).mul(10 ** fromTokenDecimals).floor().toString();
-    var goodUntilWei = web3_utils__WEBPACK_IMPORTED_MODULE_2__.toWei(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(goodUntil).toString(), 'ether');
-    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
+  encode(targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals) {
+    var decimals = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
+    var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(targetPrice.toString()).mul(10 ** decimals).floor().toString();
+    return [web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
   },
   decode(triggerData, fromTokenDecimals, toTokenDecimals) {
     var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
@@ -32543,7 +32553,7 @@ var exchangeOffchainPriceTrigger = {
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[0]).div(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(10).pow(decimals)).toDP(fromTokenDecimals).toString();
     return {
       targetPrice: price,
-      goodUntil: decodedData[1],
+      goodUntil: +decodedData[1],
       orderType: +decodedData[2]
     };
   }
@@ -32592,7 +32602,7 @@ var curveUsdBorrowRateTrigger = {
   },
   decode(triggerData) {
     var decodedData = web3_eth_abi__WEBPACK_IMPORTED_MODULE_1___default().decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-    var rateEth = (0,_utils__WEBPACK_IMPORTED_MODULE_3__.weiToRatioPercentage)(decodedData[1]);
+    var rateEth = web3_utils__WEBPACK_IMPORTED_MODULE_2__.fromWei(decodedData[1], 'ether');
 
     // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
     var exponentRate = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(rateEth).mul(365).mul(86400);