@defisaver/automation-sdk 1.2.14 → 1.2.16

package/.eslintrc.js

@@ -1,7 +1,6 @@
 
 module.exports = {
-  extends: ['airbnb'],
-  plugins: ['import'],
+  extends: ['@defisaver/eslint-config/base-config'],
   parser: '@babel/eslint-parser',
   env: {
     es6: true,
@@ -10,7 +9,7 @@ module.exports = {
   overrides: [{
     // these are overrides for .ts files, meaning these are only applied to .ts files
     files: ['*.ts'],
-    extends: ['airbnb-typescript'],
+    extends: ['@defisaver/eslint-config/base-config-typescript'],
     plugins: ['@typescript-eslint'],
     parser: '@typescript-eslint/parser',
     parserOptions: {
@@ -19,77 +18,14 @@ module.exports = {
     },
     // typescript rules must be added here to work
     rules: {
-      '@typescript-eslint/no-unused-vars': 0,
-      '@typescript-eslint/naming-convention': 0,
-      '@typescript-eslint/default-param-last': 0,
       '@typescript-eslint/consistent-type-imports': 2,
+      'max-len': 0,
     },
   }],
   parserOptions: {
     ecmaVersion: 2018,
     sourceType: 'module',
   },
-  rules: {
-    'no-restricted-syntax': 0,
-    'no-continue': 0,
-    'jsx-a11y/control-has-associated-label': 0,
-    'arrow-parens': 0,
-    'no-async-promise-executor': 0,
-    'no-multiple-empty-lines': [2, { max: 2 }],
-    camelcase: [2, { allow: ['^UNSAFE_'] }],
-    'no-mixed-operators': [2, { allowSamePrecedence: true }],
-    'no-plusplus': 0,
-    'no-minusminus': 0,
-    'prefer-destructuring': 0,
-    'max-len': 0,
-    'class-methods-use-this': 0,
-    'jsx-a11y/href-no-hash': 'off',
-    'jsx-a11y/no-autofocus': 0,
-    'no-unused-vars': 0,
-    'no-underscore-dangle': 0,
-    'global-require': 0,
-    'no-console': 0,
-    'new-cap': 0,
-    'eol-last': 0,
-    'jsx-a11y/label-has-for': 0,
-    'linebreak-style': 0,
-    'consistent-return': 0,
-    'import/prefer-default-export': 0,
-    'no-unescaped-entities': 0,
-    'jsx-a11y/no-static-element-interactions': 0,
-    'jsx-a11y/click-events-have-key-events': 0,
-    'jsx-a11y/anchor-is-valid': 0,
-    'no-shadow': 0,
-    'prefer-promise-reject-errors': 0,
-    'function-paren-newline': 0,
-    'operator-linebreak': 0,
-    'jsx-a11y/no-noninteractive-element-interactions': 0,
-    'jsx-a11y/label-has-associated-control': 0,
-    'no-nested-ternary': 0,
-    'import/no-cycle': 0,
-    'import/no-unresolved': 0,
-    'function-call-argument-newline': 0,
-    'import/extensions': [
-      'error',
-      'always',
-      {
-        pattern: {
-          js: 'never',
-          ts: 'never',
-        },
-      },
-    ],
-  },
-  globals: {
-    web3: true,
-    ethereum: true,
-    $: true,
-    window: true,
-    document: true,
-    fetch: true,
-    location: true,
-    localStorage: true,
-  },
   settings: {
     'import/resolver': {
       typescript: {

package/esm/services/strategySubService.d.ts

@@ -35,6 +35,6 @@ 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: string): string[];
+    dca(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, timestamp: number, interval: number, network: number): (boolean | string[] | Strategies.MainnetIds | Strategies.OptimismIds | Strategies.ArbitrumIds)[];
+    limitOrder(fromToken: EthereumAddress, toToken: EthereumAddress, amount: string, targetPrice: string, goodUntil: string, orderType: number): string[];
 };

package/esm/services/strategySubService.js

@@ -105,14 +105,19 @@ export const morphoAaveV2Encode = {
     },
 };
 export const exchangeEncode = {
-    dca(fromToken, toToken, amount, timestamp, interval) {
+    dca(fromToken, toToken, amount, timestamp, interval, network) {
         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;
+        const selectedNetwork = network === 1
+            ? 'MainnetIds'
+            : network === 10
+                ? 'OptimismIds'
+                : 'ArbitrumIds';
+        const strategyId = Strategies[selectedNetwork].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

@@ -136,15 +136,17 @@ export const compoundV3LeverageManagementSubData = {
 };
 export const morphoAaveV2LeverageManagementSubData = {
     encode(minRatio, maxRatio, maxOptimalRatio, minOptimalRatio, boostEnabled) {
-        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];
+        return [
+            ratioPercentageToWei(minRatio),
+            ratioPercentageToWei(maxRatio),
+            ratioPercentageToWei(maxOptimalRatio),
+            ratioPercentageToWei(minOptimalRatio),
+            // @ts-ignore
+            boostEnabled,
+        ];
     },
     decode(subData) {
-        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[0]);
+        const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]);
         const targetRatio = weiToRatioPercentage(ratioWei);
         return { targetRatio };
     },
@@ -200,13 +202,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

@@ -49,15 +49,15 @@ export const aaveV3RatioTrigger = {
 };
 export const morphoAaveV2RatioTrigger = {
     encode(owner, ratioPercentage, ratioState) {
-        const ratioWei = ratioPercentageToWei(ratioPercentage);
-        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+        const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
+        return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
     },
     decode(triggerData) {
-        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]);
+        const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]);
         return {
             owner: decodedData[0],
-            ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
-            ratioState: Number(decodedData[3]),
+            ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
+            ratioState: Number(decodedData[2]),
         };
     },
 };
@@ -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.16",
   "description": "",
   "main": "./umd/index.js",
   "module": "./esm/index.js",
@@ -20,6 +20,7 @@
   "repository": "https://github.com/defisaver/automation-sdk",
   "license": "ISC",
   "dependencies": {
+    "@defisaver/eslint-config": "^1.0.0",
     "@defisaver/sdk": "^1.0.5",
     "@defisaver/tokens": "^1.4.25",
     "@ethersproject/address": "^5.0.10",

package/src/services/strategySubService.ts

@@ -237,11 +237,18 @@ export const exchangeEncode = {
     amount: string,
     timestamp: number,
     interval: number,
+    network: 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;
+    const selectedNetwork = network === 1
+      ? 'MainnetIds'
+      : network === 10
+        ? 'OptimismIds'
+        : 'ArbitrumIds';
+
+    const strategyId = Strategies[selectedNetwork].EXCHANGE_DCA;
 
     return [strategyId, false, triggerData, subData];
   },
@@ -251,7 +258,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

@@ -203,16 +203,17 @@ export const morphoAaveV2LeverageManagementSubData = {
     minOptimalRatio: number,
     boostEnabled: boolean,
   ): SubData {
-    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];
+    return [
+      ratioPercentageToWei(minRatio),
+      ratioPercentageToWei(maxRatio),
+      ratioPercentageToWei(maxOptimalRatio),
+      ratioPercentageToWei(minOptimalRatio),
+      // @ts-ignore
+      boostEnabled,
+    ];
   },
   decode(subData: SubData): { targetRatio: number } {
-    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[0]) as any as string;
+    const ratioWei = mockedWeb3.eth.abi.decodeParameter('uint128', subData[1]) as any as string;
     const targetRatio = weiToRatioPercentage(ratioWei);
 
     return { targetRatio };
@@ -276,13 +277,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

@@ -61,15 +61,15 @@ export const aaveV3RatioTrigger = {
 
 export const morphoAaveV2RatioTrigger = {
   encode(owner: EthereumAddress, ratioPercentage: number, ratioState: RatioState) {
-    const ratioWei = ratioPercentageToWei(ratioPercentage);
-    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint256', 'uint8'], [owner, ratioWei, ratioState])];
+    const ratioWei = new Dec(ratioPercentage).mul(1e16).toString();
+    return [mockedWeb3.eth.abi.encodeParameters(['address', 'uint128', 'uint8'], [owner, ratioWei, ratioState])];
   },
   decode(triggerData: TriggerData) {
-    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint256', 'uint8'], triggerData[0]) as string[];
+    const decodedData = mockedWeb3.eth.abi.decodeParameters(['address', 'uint128', 'uint8'], triggerData[0]) as string[];
     return {
       owner: decodedData[0],
-      ratio: new Dec(mockedWeb3.utils.fromWei(decodedData[2])).mul(100).toNumber(),
-      ratioState: Number(decodedData[3]),
+      ratio: new Dec(decodedData[1]).div(1e16).toNumber(),
+      ratioState: Number(decodedData[2]),
     };
   },
 };
@@ -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],
     };
   },
 };