@defisaver/automation-sdk 2.0.3 → 2.0.5

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.d.ts

@@ -105,7 +105,7 @@ export declare const exchangeTimestampTrigger: {
     };
 };
 export declare const exchangeOffchainPriceTrigger: {
-    encode(targetPrice: string, goodUntil: number, orderType: OrderType, fromTokenDecimals: number): string[];
+    encode(targetPrice: string, goodUntil: number, orderType: OrderType, fromTokenDecimals: number, toTokenDecimals: number): string[];
     decode(triggerData: string[], fromTokenDecimals: number, toTokenDecimals: number): {
         orderType: OrderType;
         targetPrice: string;

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],
         };
     },
@@ -197,16 +197,16 @@ exports.exchangeTimestampTrigger = {
     decode(triggerData) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['uint256', 'uint256'], triggerData[0]);
         return {
-            timestamp: decodedData[0],
-            interval: decodedData[1],
+            timestamp: Number(decodedData[0]),
+            interval: Number(decodedData[1]),
         };
     },
 };
 exports.exchangeOffchainPriceTrigger = {
-    encode(targetPrice, goodUntil, orderType, fromTokenDecimals) {
-        const price = new decimal_js_1.default(targetPrice.toString()).mul(Math.pow(10, fromTokenDecimals)).floor().toString();
-        const goodUntilWei = web3Utils.toWei(new decimal_js_1.default(goodUntil).toString(), 'ether');
-        return [web3_eth_abi_1.default.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei, orderType])];
+    encode(targetPrice, goodUntil, orderType, fromTokenDecimals, toTokenDecimals) {
+        const decimals = new decimal_js_1.default(toTokenDecimals).plus(18).minus(fromTokenDecimals).toNumber();
+        const price = new decimal_js_1.default(targetPrice.toString()).mul(Math.pow(10, decimals)).floor().toString();
+        return [web3_eth_abi_1.default.encodeParameters(['uint256', 'uint256', 'uint8'], [price, goodUntil, orderType])];
     },
     decode(triggerData, fromTokenDecimals, toTokenDecimals) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
@@ -214,7 +214,7 @@ exports.exchangeOffchainPriceTrigger = {
         const price = new decimal_js_1.default(decodedData[0]).div(new decimal_js_1.default(10).pow(decimals)).toDP(fromTokenDecimals).toString();
         return {
             targetPrice: price,
-            goodUntil: decodedData[1],
+            goodUntil: +decodedData[1],
             orderType: +decodedData[2],
         };
     },
@@ -263,7 +263,7 @@ exports.curveUsdBorrowRateTrigger = {
     },
     decode(triggerData) {
         const decodedData = web3_eth_abi_1.default.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
-        const rateEth = (0, utils_1.weiToRatioPercentage)(decodedData[1]);
+        const rateEth = web3Utils.fromWei(decodedData[1], 'ether');
         // the form is x = (e**(rate*365*86400))-1 where x*100 is number in %
         const exponentRate = new decimal_js_1.default(rateEth).mul(365).mul(86400);
         const targetRate = new decimal_js_1.default(new decimal_js_1.default(2.718281828459).pow(exponentRate).minus(1)).mul(100)

package/esm/services/triggerService.test.d.ts

@@ -0,0 +1 @@
+export {};