@defisaver/automation-sdk 1.2.10 → 1.2.12

package/esm/constants/index.d.ts

@@ -4,8 +4,30 @@ export declare const ZERO_ADDRESS: EthereumAddress;
 export declare const PROTOCOLS: Record<keyof typeof ProtocolIdentifiers.StrategiesAutomation, Interfaces.Protocol>;
 export declare const LEGACY_PROTOCOLS: Record<keyof typeof ProtocolIdentifiers.LegacyAutomation, Interfaces.LegacyProtocol>;
 export declare const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo;
-export declare const OPTIMISM_STRATEGIES_INFO: {};
-export declare const ARBITRUM_STRATEGIES_INFO: {};
+export declare const OPTIMISM_STRATEGIES_INFO: {
+    8: {
+        strategyOrBundleId: Strategies.OptimismIds;
+        strategyId: Strategies.Identifiers;
+        protocol: Interfaces.Protocol;
+    };
+    9: {
+        strategyOrBundleId: Strategies.OptimismIds;
+        strategyId: Strategies.Identifiers;
+        protocol: Interfaces.Protocol;
+    };
+};
+export declare const ARBITRUM_STRATEGIES_INFO: {
+    8: {
+        strategyOrBundleId: Strategies.ArbitrumIds;
+        strategyId: Strategies.Identifiers;
+        protocol: Interfaces.Protocol;
+    };
+    9: {
+        strategyOrBundleId: Strategies.ArbitrumIds;
+        strategyId: Strategies.Identifiers;
+        protocol: Interfaces.Protocol;
+    };
+};
 export declare const STRATEGIES_INFO: StrategiesInfo;
 export declare const STRATEGY_IDS: {
     1: typeof Strategies.MainnetIds;

package/esm/constants/index.js

@@ -59,9 +59,41 @@ export const MAINNET_STRATEGIES_INFO = {
         strategyId: Strategies.Identifiers.Rebond,
         protocol: PROTOCOLS.ChickenBonds,
     },
+    [Strategies.MainnetIds.EXCHANGE_DCA]: {
+        strategyOrBundleId: Strategies.MainnetIds.EXCHANGE_DCA,
+        strategyId: Strategies.Identifiers.Dca,
+        protocol: PROTOCOLS.Exchange,
+    },
+    [Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER]: {
+        strategyOrBundleId: Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER,
+        strategyId: Strategies.Identifiers.LimitOrder,
+        protocol: PROTOCOLS.Exchange,
+    },
+};
+export const OPTIMISM_STRATEGIES_INFO = {
+    [Strategies.OptimismIds.EXCHANGE_DCA]: {
+        strategyOrBundleId: Strategies.OptimismIds.EXCHANGE_DCA,
+        strategyId: Strategies.Identifiers.Dca,
+        protocol: PROTOCOLS.Exchange,
+    },
+    [Strategies.OptimismIds.EXCHANGE_LIMIT_ORDER]: {
+        strategyOrBundleId: Strategies.OptimismIds.EXCHANGE_LIMIT_ORDER,
+        strategyId: Strategies.Identifiers.LimitOrder,
+        protocol: PROTOCOLS.Exchange,
+    },
+};
+export const ARBITRUM_STRATEGIES_INFO = {
+    [Strategies.ArbitrumIds.EXCHANGE_DCA]: {
+        strategyOrBundleId: Strategies.ArbitrumIds.EXCHANGE_DCA,
+        strategyId: Strategies.Identifiers.Dca,
+        protocol: PROTOCOLS.Exchange,
+    },
+    [Strategies.ArbitrumIds.EXCHANGE_LIMIT_ORDER]: {
+        strategyOrBundleId: Strategies.ArbitrumIds.EXCHANGE_LIMIT_ORDER,
+        strategyId: Strategies.Identifiers.LimitOrder,
+        protocol: PROTOCOLS.Exchange,
+    },
 };
-export const OPTIMISM_STRATEGIES_INFO = {};
-export const ARBITRUM_STRATEGIES_INFO = {};
 export const STRATEGIES_INFO = {
     [ChainId.Ethereum]: MAINNET_STRATEGIES_INFO,
     [ChainId.Optimism]: OPTIMISM_STRATEGIES_INFO,

package/esm/services/strategiesService.js

@@ -1,3 +1,4 @@
+import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
 import { ProtocolIdentifiers, Strategies } from '../types/enums';
@@ -238,6 +239,21 @@ function parseLiquityBondProtection(position, parseData) {
     };
     return _position;
 }
+function parseExchangeDca(position, parseData) {
+    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);
+    return _position;
+}
+function parseExchangeLimitOrder(position, parseData) {
+    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.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals);
+    return _position;
+}
 const parsingMethodsMapping = {
     [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
         [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -272,6 +288,10 @@ const parsingMethodsMapping = {
         [Strategies.Identifiers.Repay]: parseMorphoAaveV2LeverageManagement,
         [Strategies.Identifiers.Boost]: parseMorphoAaveV2LeverageManagement,
     },
+    [ProtocolIdentifiers.StrategiesAutomation.Exchange]: {
+        [Strategies.Identifiers.Dca]: parseExchangeDca,
+        [Strategies.Identifiers.LimitOrder]: parseExchangeLimitOrder,
+    },
 };
 function getParsingMethod(id, strategy) {
     return parsingMethodsMapping[id][strategy.strategyId];

package/esm/services/strategySubService.d.ts

@@ -34,3 +34,7 @@ export declare const compoundV3Encode: {
 export declare const morphoAaveV2Encode: {
     leverageManagement(minRatio: number, maxRatio: number, maxOptimalRatio: number, minOptimalRatio: number, boostEnabled: boolean): string[];
 };
+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: number): (boolean | string[] | Strategies.MainnetIds)[];
+};

package/esm/services/strategySubService.js

@@ -1,5 +1,5 @@
 import Dec from 'decimal.js';
-import { getAssetInfo } from '@defisaver/tokens';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { Bundles, ChainId, RatioState, Strategies, } from '../types/enums';
 import * as subDataService from './subDataService';
 import * as triggerService from './triggerService';
@@ -104,3 +104,19 @@ export const morphoAaveV2Encode = {
         return subDataService.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
     },
 };
+export const exchangeEncode = {
+    dca(fromToken, toToken, amount, timestamp, interval) {
+        requireAddresses([fromToken, toToken]);
+        const subData = subDataService.exchangeDcaSubData.encode(fromToken, toToken, amount, interval);
+        const triggerData = triggerService.exchangeTimestampTrigger.encode(timestamp, interval);
+        const strategyId = Strategies.MainnetIds.EXCHANGE_DCA;
+        return [strategyId, false, triggerData, subData];
+    },
+    limitOrder(fromToken, toToken, amount, targetPrice, goodUntil) {
+        const strategyId = Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER;
+        const subData = subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount);
+        const fromTokenDecimals = getAssetInfoByAddress(fromToken).decimals;
+        const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, goodUntil, fromTokenDecimals);
+        return [strategyId, false, triggerData, subData];
+    },
+};

package/esm/services/subDataService.d.ts

@@ -73,3 +73,20 @@ export declare const liquityPaybackUsingChickenBondSubData: {
         sourceType: string;
     };
 };
+export declare const exchangeDcaSubData: {
+    encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, interval: number) => string[];
+    decode: (subData: string[]) => {
+        fromToken: string;
+        toToken: string;
+        amount: string;
+        interval: string;
+    };
+};
+export declare const exchangeLimitOrderSubData: {
+    encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string) => string[];
+    decode: (subData: string[]) => {
+        fromToken: string;
+        toToken: string;
+        amount: string;
+    };
+};

package/esm/services/subDataService.js

@@ -136,15 +136,15 @@ export const compoundV3LeverageManagementSubData = {
 };
 export const morphoAaveV2LeverageManagementSubData = {
     encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
-        const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minRatio).mul(1e16).toString());
-        const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxRatio).mul(1e16).toString());
-        const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxOptimalRatio).mul(1e16).toString());
-        const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minOptimalRatio).mul(1e16).toString());
+        const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(minRatio));
+        const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(maxRatio));
+        const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(maxOptimalRatio));
+        const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(minOptimalRatio));
         const encodedBoostEnabled = mockedWeb3.eth.abi.encodeParameter('bool', boostEnabled);
         return [encodedMinRatio, encodedMaxRatio, encodedMaxOptimalRatio, encodedMinOptimalRatio, encodedBoostEnabled];
     },
     decode(subData) {
-        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]);
+        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[0]);
         const targetRatio = weiToRatioPercentage(ratioWei);
         return { targetRatio };
     },
@@ -178,3 +178,38 @@ export const liquityPaybackUsingChickenBondSubData = {
         return { sourceId, sourceType };
     },
 };
+export const exchangeDcaSubData = {
+    encode: (fromToken, toToken, amount, interval) => {
+        const sellTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', fromToken);
+        const buyTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', toToken);
+        const amountEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', amount);
+        const intervalEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', interval);
+        return [sellTokenEncoded, buyTokenEncoded, amountEncoded, intervalEncoded];
+    },
+    decode: (subData) => {
+        const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
+        const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
+        const amount = mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString();
+        const interval = mockedWeb3.eth.abi.decodeParameter('uint256', subData[3]).toString();
+        return {
+            fromToken,
+            toToken,
+            amount,
+            interval,
+        };
+    },
+};
+export const exchangeLimitOrderSubData = {
+    encode: (fromToken, toToken, amount) => {
+        const fromTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', fromToken);
+        const toTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', toToken);
+        const amountEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', amount);
+        return [fromTokenEncoded, toTokenEncoded, amountEncoded];
+    },
+    decode: (subData) => {
+        const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
+        const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
+        const amount = mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString();
+        return { fromToken, toToken, amount };
+    },
+};

package/esm/services/triggerService.d.ts

@@ -97,3 +97,17 @@ export declare const compoundV3RatioTrigger: {
         ratio: number;
     };
 };
+export declare const exchangeTimestampTrigger: {
+    encode(timestamp: number, interval: number): string[];
+    decode(triggerData: string[]): {
+        timestamp: number;
+        interval: number;
+    };
+};
+export declare const exchangeOffchainPriceTrigger: {
+    encode(targetPrice: string, goodUntil: number, fromTokenDecimals: number): string[];
+    decode(triggerData: string[], fromTokenDecimals: number): {
+        targetPrice: string;
+        goodUntil: number;
+    };
+};

package/esm/services/triggerService.js

@@ -49,15 +49,15 @@ export const aaveV3RatioTrigger = {
 };
 export const morphoAaveV2RatioTrigger = {
     encode(owner, ratioPercentage, ratioState) {
-        const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
-        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
+        const ratioWei = ratioPercentageToWei(ratioPercentage);
+        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
     },
     decode(triggerData) {
-        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
         return {
             owner: decodedData[0],
-            ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
-            ratioState: Number(decodedData[2]),
+            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
+            ratioState: Number(decodedData[3]),
         };
     },
 };
@@ -158,3 +158,32 @@ export const compoundV3RatioTrigger = {
         };
     },
 };
+export const exchangeTimestampTrigger = {
+    encode(timestamp, interval) {
+        const timestampWei = mockedWeb3.utils.toWei(new Dec(timestamp).toString());
+        const intervalWei = mockedWeb3.utils.toWei(new Dec(interval).toString());
+        return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
+    },
+    decode(triggerData) {
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+        return {
+            timestamp: new Dec(mockedWeb3.utils.fromWei(decodedData[0])).toNumber(),
+            interval: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).toNumber(),
+        };
+    },
+};
+export const exchangeOffchainPriceTrigger = {
+    encode(targetPrice, goodUntil, fromTokenDecimals) {
+        const price = new Dec(targetPrice.toString()).mul(Math.pow(10, fromTokenDecimals)).floor().toString();
+        const goodUntilWei = mockedWeb3.utils.toWei(new Dec(goodUntil).toString());
+        return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei])];
+    },
+    decode(triggerData, fromTokenDecimals) {
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+        const price = new Dec(decodedData[0]).div(Math.pow(10, fromTokenDecimals)).toDP(fromTokenDecimals).toString();
+        return {
+            targetPrice: price,
+            goodUntil: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).toNumber(),
+        };
+    },
+};

package/esm/types/enums.d.ts

@@ -26,7 +26,8 @@ export declare namespace ProtocolIdentifiers {
         ChickenBonds = "Chicken Bonds",
         CompoundV3 = "Compound__V3",
         AaveV3 = "Aave__V3",
-        MorphoAaveV2 = "Morpho-Aave__V2"
+        MorphoAaveV2 = "Morpho-Aave__V2",
+        Exchange = "Exchange"
     }
     enum LegacyAutomation {
         MakerDAO = "MakerDAO",
@@ -43,11 +44,17 @@ export declare namespace Strategies {
         MAKER_TRAILING_STOP_LOSS_TO_DAI = 12,
         LIQUITY_TRAILING_STOP_LOSS_TO_COLL = 13,
         LIQUITY_CLOSE_ON_PRICE_TO_COLL = 14,
-        CHICKEN_BONDS_REBOND = 31
+        CHICKEN_BONDS_REBOND = 31,
+        EXCHANGE_DCA = 46,
+        EXCHANGE_LIMIT_ORDER = 47
     }
     enum OptimismIds {
+        EXCHANGE_DCA = 8,
+        EXCHANGE_LIMIT_ORDER = 9
     }
     enum ArbitrumIds {
+        EXCHANGE_DCA = 8,
+        EXCHANGE_LIMIT_ORDER = 9
     }
     enum Identifiers {
         SavingsLiqProtection = "smart-savings-liquidation-protection",
@@ -62,7 +69,9 @@ export declare namespace Strategies {
         TrailingStopToColl = "trailing-stop-to-collateral",
         TrailingStopToDebt = "trailing-stop-to-debt",
         Rebond = "rebond",
-        BondProtection = "bond-protection"
+        BondProtection = "bond-protection",
+        Dca = "dca",
+        LimitOrder = "limit-order"
     }
     enum IdOverrides {
         TakeProfit = "take-profit",

package/esm/types/enums.js

@@ -32,6 +32,7 @@ export var ProtocolIdentifiers;
         StrategiesAutomation["CompoundV3"] = "Compound__V3";
         StrategiesAutomation["AaveV3"] = "Aave__V3";
         StrategiesAutomation["MorphoAaveV2"] = "Morpho-Aave__V2";
+        StrategiesAutomation["Exchange"] = "Exchange";
     })(StrategiesAutomation = ProtocolIdentifiers.StrategiesAutomation || (ProtocolIdentifiers.StrategiesAutomation = {}));
     let LegacyAutomation;
     (function (LegacyAutomation) {
@@ -52,12 +53,18 @@ export var Strategies;
         MainnetIds[MainnetIds["LIQUITY_TRAILING_STOP_LOSS_TO_COLL"] = 13] = "LIQUITY_TRAILING_STOP_LOSS_TO_COLL";
         MainnetIds[MainnetIds["LIQUITY_CLOSE_ON_PRICE_TO_COLL"] = 14] = "LIQUITY_CLOSE_ON_PRICE_TO_COLL";
         MainnetIds[MainnetIds["CHICKEN_BONDS_REBOND"] = 31] = "CHICKEN_BONDS_REBOND";
+        MainnetIds[MainnetIds["EXCHANGE_DCA"] = 46] = "EXCHANGE_DCA";
+        MainnetIds[MainnetIds["EXCHANGE_LIMIT_ORDER"] = 47] = "EXCHANGE_LIMIT_ORDER";
     })(MainnetIds = Strategies.MainnetIds || (Strategies.MainnetIds = {}));
     let OptimismIds;
     (function (OptimismIds) {
+        OptimismIds[OptimismIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
+        OptimismIds[OptimismIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
     })(OptimismIds = Strategies.OptimismIds || (Strategies.OptimismIds = {}));
     let ArbitrumIds;
     (function (ArbitrumIds) {
+        ArbitrumIds[ArbitrumIds["EXCHANGE_DCA"] = 8] = "EXCHANGE_DCA";
+        ArbitrumIds[ArbitrumIds["EXCHANGE_LIMIT_ORDER"] = 9] = "EXCHANGE_LIMIT_ORDER";
     })(ArbitrumIds = Strategies.ArbitrumIds || (Strategies.ArbitrumIds = {}));
     let Identifiers;
     (function (Identifiers) {
@@ -74,6 +81,8 @@ export var Strategies;
         Identifiers["TrailingStopToDebt"] = "trailing-stop-to-debt";
         Identifiers["Rebond"] = "rebond";
         Identifiers["BondProtection"] = "bond-protection";
+        Identifiers["Dca"] = "dca";
+        Identifiers["LimitOrder"] = "limit-order";
     })(Identifiers = Strategies.Identifiers || (Strategies.Identifiers = {}));
     let IdOverrides;
     (function (IdOverrides) {

package/package.json

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

package/src/constants/index.ts

@@ -70,11 +70,43 @@ export const MAINNET_STRATEGIES_INFO: MainnetStrategiesInfo = {
     strategyId: Strategies.Identifiers.Rebond,
     protocol: PROTOCOLS.ChickenBonds,
   },
+  [Strategies.MainnetIds.EXCHANGE_DCA]: {
+    strategyOrBundleId: Strategies.MainnetIds.EXCHANGE_DCA,
+    strategyId: Strategies.Identifiers.Dca,
+    protocol: PROTOCOLS.Exchange,
+  },
+  [Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER]: {
+    strategyOrBundleId: Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER,
+    strategyId: Strategies.Identifiers.LimitOrder,
+    protocol: PROTOCOLS.Exchange,
+  },
 };
 
-export const OPTIMISM_STRATEGIES_INFO = {};
+export const OPTIMISM_STRATEGIES_INFO = {
+  [Strategies.OptimismIds.EXCHANGE_DCA]: {
+    strategyOrBundleId: Strategies.OptimismIds.EXCHANGE_DCA,
+    strategyId: Strategies.Identifiers.Dca,
+    protocol: PROTOCOLS.Exchange,
+  },
+  [Strategies.OptimismIds.EXCHANGE_LIMIT_ORDER]: {
+    strategyOrBundleId: Strategies.OptimismIds.EXCHANGE_LIMIT_ORDER,
+    strategyId: Strategies.Identifiers.LimitOrder,
+    protocol: PROTOCOLS.Exchange,
+  },
+};
 
-export const ARBITRUM_STRATEGIES_INFO = {};
+export const ARBITRUM_STRATEGIES_INFO = {
+  [Strategies.ArbitrumIds.EXCHANGE_DCA]: {
+    strategyOrBundleId: Strategies.ArbitrumIds.EXCHANGE_DCA,
+    strategyId: Strategies.Identifiers.Dca,
+    protocol: PROTOCOLS.Exchange,
+  },
+  [Strategies.ArbitrumIds.EXCHANGE_LIMIT_ORDER]: {
+    strategyOrBundleId: Strategies.ArbitrumIds.EXCHANGE_LIMIT_ORDER,
+    strategyId: Strategies.Identifiers.LimitOrder,
+    protocol: PROTOCOLS.Exchange,
+  },
+};
 
 export const STRATEGIES_INFO: StrategiesInfo = {
   [ChainId.Ethereum]: MAINNET_STRATEGIES_INFO,

package/src/services/strategiesService.ts

@@ -1,3 +1,4 @@
+import { getAssetInfoByAddress } from '@defisaver/tokens';
 import { cloneDeep } from 'lodash';
 
 import { BUNDLES_INFO, STRATEGIES_INFO } from '../constants';
@@ -328,6 +329,28 @@ function parseLiquityBondProtection(position: Position.Automated, parseData: Par
   return _position;
 }
 
+function parseExchangeDca(position: Position.Automated, parseData: ParseData): 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);
+
+  return _position;
+}
+function parseExchangeLimitOrder(position: Position.Automated, parseData: ParseData): 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.triggerData = triggerService.exchangeOffchainPriceTrigger.decode(subStruct.triggerData, fromTokenDecimals);
+
+  return _position;
+}
+
 const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
   [ProtocolIdentifiers.StrategiesAutomation.MakerDAO]: {
     [Strategies.Identifiers.SavingsLiqProtection]: parseMakerSavingsLiqProtection,
@@ -362,6 +385,10 @@ const parsingMethodsMapping: StrategiesToProtocolVersionMapping = {
     [Strategies.Identifiers.Repay]: parseMorphoAaveV2LeverageManagement,
     [Strategies.Identifiers.Boost]: parseMorphoAaveV2LeverageManagement,
   },
+  [ProtocolIdentifiers.StrategiesAutomation.Exchange]: {
+    [Strategies.Identifiers.Dca]: parseExchangeDca,
+    [Strategies.Identifiers.LimitOrder]: parseExchangeLimitOrder,
+  },
 };
 
 function getParsingMethod(id: ProtocolIdentifiers.StrategiesAutomation, strategy: BundleOrStrategy) {

package/src/services/strategySubService.ts

@@ -1,5 +1,5 @@
 import Dec from 'decimal.js';
-import { getAssetInfo } from '@defisaver/tokens';
+import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 
 import {
   Bundles, ChainId, RatioState, Strategies,
@@ -229,3 +229,34 @@ export const morphoAaveV2Encode = {
     return subDataService.morphoAaveV2LeverageManagementSubData.encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled);
   },
 };
+
+export const exchangeEncode = {
+  dca(
+    fromToken: EthereumAddress,
+    toToken: EthereumAddress,
+    amount: string,
+    timestamp: number,
+    interval: number,
+  ) {
+    requireAddresses([fromToken, toToken]);
+    const subData = subDataService.exchangeDcaSubData.encode(fromToken, toToken, amount, interval);
+    const triggerData = triggerService.exchangeTimestampTrigger.encode(timestamp, interval);
+    const strategyId = Strategies.MainnetIds.EXCHANGE_DCA;
+
+    return [strategyId, false, triggerData, subData];
+  },
+  limitOrder(
+    fromToken: EthereumAddress,
+    toToken: EthereumAddress,
+    amount: string,
+    targetPrice: string,
+    goodUntil: number,
+  ) {
+    const strategyId = Strategies.MainnetIds.EXCHANGE_LIMIT_ORDER;
+    const subData = subDataService.exchangeLimitOrderSubData.encode(fromToken, toToken, amount);
+    const fromTokenDecimals = getAssetInfoByAddress(fromToken).decimals;
+    const triggerData = triggerService.exchangeOffchainPriceTrigger.encode(targetPrice, goodUntil, fromTokenDecimals);
+
+    return [strategyId, false, triggerData, subData];
+  },
+};

package/src/services/subDataService.ts

@@ -203,16 +203,16 @@ export const morphoAaveV2LeverageManagementSubData = {
     minOptimalRatio: number,
     boostEnabled: boolean,
   ): SubData {
-    const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minRatio).mul(1e16).toString());
-    const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxRatio).mul(1e16).toString());
-    const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(maxOptimalRatio).mul(1e16).toString());
-    const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', new Dec(minOptimalRatio).mul(1e16).toString());
+    const encodedMinRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(minRatio));
+    const encodedMaxRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(maxRatio));
+    const encodedMaxOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(maxOptimalRatio));
+    const encodedMinOptimalRatio = mockedWeb3.eth.abi.encodeParameter('uint128', ratioPercentageToWei(minOptimalRatio));
     const encodedBoostEnabled = mockedWeb3.eth.abi.encodeParameter('bool', boostEnabled);
 
     return [encodedMinRatio, encodedMaxRatio, encodedMaxOptimalRatio, encodedMinOptimalRatio, encodedBoostEnabled];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]) as any as string;
+    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[0]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -251,3 +251,42 @@ export const liquityPaybackUsingChickenBondSubData = {
     return { sourceId, sourceType };
   },
 };
+
+export const exchangeDcaSubData = {
+  encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, interval: number) : SubData => {
+    const sellTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', fromToken);
+    const buyTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', toToken);
+    const amountEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', amount);
+    const intervalEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', interval);
+
+    return [sellTokenEncoded, buyTokenEncoded, amountEncoded, intervalEncoded];
+  },
+  decode: (subData: SubData) => {
+    const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
+    const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
+    const amount = mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString();
+    const interval = mockedWeb3.eth.abi.decodeParameter('uint256', subData[3]).toString();
+    return {
+      fromToken,
+      toToken,
+      amount,
+      interval,
+    };
+  },
+};
+
+export const exchangeLimitOrderSubData = {
+  encode: (fromToken: EthereumAddress, toToken: EthereumAddress, amount: string) : SubData => {
+    const fromTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', fromToken);
+    const toTokenEncoded = mockedWeb3.eth.abi.encodeParameter('address', toToken);
+    const amountEncoded = mockedWeb3.eth.abi.encodeParameter('uint256', amount);
+
+    return [fromTokenEncoded, toTokenEncoded, amountEncoded];
+  },
+  decode: (subData: SubData) => {
+    const fromToken = mockedWeb3.eth.abi.decodeParameter('address', subData[0]).toString();
+    const toToken = mockedWeb3.eth.abi.decodeParameter('address', subData[1]).toString();
+    const amount = mockedWeb3.eth.abi.decodeParameter('uint256', subData[2]).toString();
+    return { fromToken, toToken, amount };
+  },
+};

package/src/services/triggerService.ts

@@ -61,15 +61,15 @@ export const aaveV3RatioTrigger = {
 
 export const morphoAaveV2RatioTrigger = {
   encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
-    const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
-    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
+    const ratioWei = ratioPercentageToWei(ratioPercentage);
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData: TriggerData) {
-    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]) as string[];
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]) as string[];
     return {
       owner: decodedData[0],
-      ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
-      ratioState: Number(decodedData[2]),
+      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
+      ratioState: Number(decodedData[3]),
     };
   },
 };
@@ -190,4 +190,46 @@ export const compoundV3RatioTrigger = {
       ratioState: +decodedData[3],
     };
   },
-};
+};
+
+export const exchangeTimestampTrigger = {
+  encode(
+    timestamp: number,
+    interval: number,
+  ) {
+    const timestampWei = mockedWeb3.utils.toWei(new Dec(timestamp).toString());
+    const intervalWei = mockedWeb3.utils.toWei(new Dec(interval).toString());
+    return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [timestampWei, intervalWei])];
+  },
+  decode(
+    triggerData: TriggerData,
+  ): { timestamp: number, interval: number } {
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+    return {
+      timestamp: new Dec(mockedWeb3.utils.fromWei(decodedData[0])).toNumber(),
+      interval: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).toNumber(),
+    };
+  },
+};
+export const exchangeOffchainPriceTrigger = {
+  encode(
+    targetPrice: string,
+    goodUntil: number,
+    fromTokenDecimals: number,
+  ) {
+    const price = new Dec(targetPrice.toString()).mul(10 ** fromTokenDecimals).floor().toString();
+    const goodUntilWei = mockedWeb3.utils.toWei(new Dec(goodUntil).toString());
+    return [mockedWeb3.eth.abi.encodeParameters(['uint256', 'uint256'], [price, goodUntilWei])];
+  },
+  decode(
+    triggerData: TriggerData,
+    fromTokenDecimals: number,
+  ): { targetPrice: string, goodUntil: number } {
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['uint256', 'uint256'], triggerData[0]);
+    const price = new Dec(decodedData[0]).div(10 ** fromTokenDecimals).toDP(fromTokenDecimals).toString();
+    return {
+      targetPrice: price,
+      goodUntil: new Dec(mockedWeb3.utils.fromWei(decodedData[1])).toNumber(),
+    };
+  },
+};