@defisaver/automation-sdk 1.2.20 → 1.2.22

package/esm/services/strategiesService.js

@@ -246,11 +246,11 @@ function parseExchangeDca(position, parseData) {
     _position.strategyData.decoded.subData = subDataService.exchangeDcaSubData.decode(subStruct.subData);
     return _position;
 }
-function parseExchangeLimitOrder(position, parseData) {
+function parseExchangeLimitOrder(position, parseData, chainId) {
     const _position = cloneDeep(position);
     const { subStruct } = parseData.subscriptionEventData;
-    _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData);
-    const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken).decimals;
+    _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+    const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
     _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals);
     return _position;
 }
@@ -327,5 +327,5 @@ export function parseStrategiesAutomatedPosition(parseData) {
         },
         specific: {},
     };
-    return getParsingMethod(position.protocol.id, position.strategy)(position, parseData);
+    return getParsingMethod(position.protocol.id, position.strategy)(position, parseData, chainId);
 }

package/esm/services/subDataService.d.ts

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

package/esm/services/subDataService.js

@@ -212,10 +212,10 @@ export const exchangeLimitOrderSubData = {
             new Dec(orderType).toString(),
         ];
     },
-    decode: (subData) => {
+    decode: (subData, chainId) => {
         const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
         const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-        const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken).symbol);
+        const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
         return { fromToken, toToken, amount };
     },
 };

package/esm/types/index.d.ts

@@ -187,5 +187,5 @@ type MapToProtocolVersion<T> = {
         [key in Strategies.Identifiers as string]: T;
     };
 };
-export type StrategiesToProtocolVersionMapping = MapToProtocolVersion<(position: Position.Automated, parseData: ParseData) => Position.Automated>;
+export type StrategiesToProtocolVersionMapping = MapToProtocolVersion<(position: Position.Automated, parseData: ParseData, chainId: ChainId) => Position.Automated>;
 export {};

package/package.json

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

package/src/services/strategiesService.ts

@@ -5,6 +5,7 @@ import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import type {
   Position, ParseData, StrategiesToProtocolVersionMapping, BundleOrStrategy, StrategyOrBundleIds,
 } from '../types';
+import type { ChainId } from '../types/enums';
 import { ProtocolIdentifiers, Strategies } from '../types/enums';
 
 import { getRatioStateInfoForAaveCloseStrategy, isRatioStateOver, wethToEthByAddress } from './utils';
@@ -329,23 +330,23 @@ function parseLiquityBondProtection(position: Position.Automated, parseData: Par
   return _position;
 }
 
-function parseExchangeDca(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseExchangeDca(position: Position.Automated, parseData: ParseData, chainId: ChainId): Position.Automated {
   const _position = cloneDeep(position);
 
   const { subStruct } = parseData.subscriptionEventData;
 
   _position.strategyData.decoded.triggerData = triggerService.exchangeTimestampTrigger.decode(subStruct.triggerData);
-  _position.strategyData.decoded.subData = subDataService.exchangeDcaSubData.decode(subStruct.subData);
+  _position.strategyData.decoded.subData = subDataService.exchangeDcaSubData.decode(subStruct.subData, chainId);
 
   return _position;
 }
-function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseData): Position.Automated {
+function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseData, chainId: ChainId): Position.Automated {
   const _position = cloneDeep(position);
 
   const { subStruct } = parseData.subscriptionEventData;
 
-  _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData);
-  const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken).decimals;
+  _position.strategyData.decoded.subData = subDataService.exchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+  const fromTokenDecimals = getAssetInfoByAddress(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
   _position.strategyData.decoded.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals);
 
   return _position;
@@ -441,5 +442,5 @@ export function parseStrategiesAutomatedPosition(parseData: ParseData): Position
     specific: {},
   };
 
-  return getParsingMethod(position.protocol.id, position.strategy)(position, parseData);
+  return getParsingMethod(position.protocol.id, position.strategy)(position, parseData, chainId);
 }

package/src/services/subDataService.ts

@@ -262,10 +262,10 @@ export const exchangeDcaSubData = {
 
     return [sellTokenEncoded, buyTokenEncoded, amountEncoded, intervalEncoded];
   },
-  decode: (subData: SubData) => {
+  decode: (subData: SubData, chainId: ChainId) => {
     const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
     const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken).symbol);
+    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
     const interval = mockedWeb3.eth.abi.decodeParameter('uint256', subData[3]).toString();
     return {
       fromToken,
@@ -287,10 +287,10 @@ export const exchangeLimitOrderSubData = {
       new Dec(orderType).toString(),
     ];
   },
-  decode: (subData: SubData) => {
+  decode: (subData: SubData, chainId: ChainId) => {
     const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
     const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken).symbol);
+    const amount = assetAmountInEth(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), getAssetInfoByAddress(fromToken, chainId).symbol);
     return { fromToken, toToken, amount };
   },
 };

package/src/types/index.ts

@@ -224,4 +224,4 @@ type MapToProtocolVersion<T> = {
   }
 };
 
-export type StrategiesToProtocolVersionMapping = MapToProtocolVersion<(position: Position.Automated, parseData: ParseData) => Position.Automated>;
+export type StrategiesToProtocolVersionMapping = MapToProtocolVersion<(position: Position.Automated, parseData: ParseData, chainId: ChainId) => Position.Automated>;

package/umd/index.js

@@ -1724,13 +1724,13 @@ function parseExchangeDca(position, parseData) {
   _position.strategyData.decoded.subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.exchangeDcaSubData.decode(subStruct.subData);
   return _position;
 }
-function parseExchangeLimitOrder(position, parseData) {
+function parseExchangeLimitOrder(position, parseData, chainId) {
   var _position = (0,lodash__WEBPACK_IMPORTED_MODULE_1__.cloneDeep)(position);
   var {
     subStruct
   } = parseData.subscriptionEventData;
-  _position.strategyData.decoded.subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.exchangeLimitOrderSubData.decode(subStruct.subData);
-  var fromTokenDecimals = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_0__.getAssetInfoByAddress)(_position.strategyData.decoded.subData.fromToken).decimals;
+  _position.strategyData.decoded.subData = _subDataService__WEBPACK_IMPORTED_MODULE_5__.exchangeLimitOrderSubData.decode(subStruct.subData, chainId);
+  var fromTokenDecimals = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_0__.getAssetInfoByAddress)(_position.strategyData.decoded.subData.fromToken, chainId).decimals;
   _position.strategyData.decoded.triggerData = _triggerService__WEBPACK_IMPORTED_MODULE_6__.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals);
   return _position;
 }
@@ -1818,7 +1818,7 @@ function parseStrategiesAutomatedPosition(parseData) {
     },
     specific: {}
   };
-  return getParsingMethod(position.protocol.id, position.strategy)(position, parseData);
+  return getParsingMethod(position.protocol.id, position.strategy)(position, parseData, chainId);
 }
 
 /***/ }),
@@ -19284,10 +19284,10 @@ var exchangeLimitOrderSubData = {
   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 => {
+  decode: (subData, chainId) => {
     var fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
     var toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
-    var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.assetAmountInEth)(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfoByAddress)(fromToken).symbol);
+    var amount = (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.assetAmountInEth)(mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString(), (0,_defisaver_tokens__WEBPACK_IMPORTED_MODULE_1__.getAssetInfoByAddress)(fromToken, chainId).symbol);
     return {
       fromToken,
       toToken,