@defisaver/automation-sdk 1.2.14 → 1.2.15

package/esm/services/strategySubService.d.ts

@@ -36,5 +36,5 @@ export declare const morphoAaveV2Encode: {
 };
 export declare const exchangeEncode: {
     dca(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number): (boolean | string[] | Strategies.MainnetIds)[];
-    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string): string[];
+    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string, orderType: number): string[];
 };

package/esm/services/strategySubService.js

@@ -112,7 +112,7 @@ export const exchangeEncode = {
         const strategyId = Strategies.MainnetIds.EXCHANGE_DCA;
         return [strategyId, false, triggerData, subData];
     },
-    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil) {
-        return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil);
+    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
+        return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
     },
 };

package/esm/services/subDataService.d.ts

@@ -83,7 +83,7 @@ export declare const exchangeDcaSubData: {
     };
 };
 export declare const exchangeLimitOrderSubData: {
-    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string): string[];
+    encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: number): string[];
     decode: (subData: string[]) => {
         fromToken: string;
         toToken: string;

package/esm/services/subDataService.js

@@ -200,13 +200,14 @@ export const exchangeDcaSubData = {
     },
 };
 export const exchangeLimitOrderSubData = {
-    encode(fromToken, toToken, amount, targetPrice, goodUntil) {
+    encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
         return [
             fromToken,
             toToken,
             amount,
             targetPrice,
-            goodUntil,
+            new Dec(goodUntil).toString(),
+            new Dec(orderType).toString(),
         ];
     },
     decode: (subData) => {

package/esm/services/triggerService.d.ts

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

package/esm/services/triggerService.js

@@ -179,11 +179,12 @@ export const exchangeOffchainPriceTrigger = {
         return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei])];
     },
     decode(triggerData, fromTokenDecimals) {
-        const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
         const price = new Dec(decodedData[0]).div(new Dec(10).pow(fromTokenDecimals)).toDP(fromTokenDecimals).toString();
         return {
             targetPrice: price,
             goodUntil: decodedData[1],
+            orderType: +decodedData[2],
         };
     },
 };

package/package.json

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

package/src/services/strategySubService.ts

@@ -251,7 +251,8 @@ export const exchangeEncode = {
     amount: string,
     targetPrice: string,
     goodUntil: string,
+    orderType: number,
   ) {
-    return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil);
+    return subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
   },
 };

package/src/services/subDataService.ts

@@ -276,13 +276,14 @@ export const exchangeDcaSubData = {
 };
 
 export const exchangeLimitOrderSubData = {
-  encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string) : SubData {
+  encode(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string | number, orderType: number) : SubData {
     return [
       fromToken,
       toToken,
       amount,
       targetPrice,
-      goodUntil,
+      new Dec(goodUntil).toString(),
+      new Dec(orderType).toString(),
     ];
   },
   decode: (subData: SubData) => {

package/src/services/triggerService.ts

@@ -224,12 +224,13 @@ export const exchangeOffchainPriceTrigger = {
   decode(
     triggerData: TriggerData,
     fromTokenDecimals: number,
-  ): { targetPrice: string, goodUntil: number } {
-    const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+  ): { orderType: number; targetPrice: string; goodUntil: any } {
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
     const price = new Dec(decodedData[0]).div(new Dec(10).pow(fromTokenDecimals)).toDP(fromTokenDecimals).toString();
     return {
       targetPrice: price,
       goodUntil: decodedData[1],
+      orderType: +decodedData[2],
     };
   },
 };

package/umd/index.js

@@ -19284,8 +19284,8 @@ var exchangeDcaSubData = {
   }
 };
 var exchangeLimitOrderSubData = {
-  encode(fromToken, toToken, amount, targetPrice, goodUntil) {
-    return [fromToken, toToken, amount, targetPrice, goodUntil];
+  encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
+    return [fromToken, toToken, amount, targetPrice, new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(goodUntil).toString(), new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(orderType).toString()];
   },
   decode: subData => {
     var fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
@@ -29235,11 +29235,12 @@ var exchangeOffchainPriceTrigger = {
     return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei])];
   },
   decode(triggerData, fromTokenDecimals) {
-    var decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+    var decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256', 'uint8'], triggerData[0]);
     var price = new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(decodedData[0]).div(new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(10).pow(fromTokenDecimals)).toDP(fromTokenDecimals).toString();
     return {
       targetPrice: price,
-      goodUntil: decodedData[1]
+      goodUntil: decodedData[1],
+      orderType: +decodedData[2]
     };
   }
 };
@@ -29448,8 +29449,8 @@ var exchangeEncode = {
     var strategyId = _types_enums__WEBPACK_IMPORTED_MODULE_2__.Strategies.MainnetIds.EXCHANGE_DCA;
     return [strategyId, false, triggerData, subData];
   },
-  limitOrder(fromToken, toToken, amount, targetPrice, goodUntil) {
-    return _subDataService__WEBPACK_IMPORTED_MODULE_3__.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil);
+  limitOrder(fromToken, toToken, amount, targetPrice, goodUntil, orderType) {
+    return _subDataService__WEBPACK_IMPORTED_MODULE_3__.exchangeLimitOrderSubData.encode(fromToken, toToken, amount, targetPrice, goodUntil, orderType);
   }
 };