@oasisdex/automation - npm Package Compare versions

Comparing version 1.6.0-alpha.2 to 1.6.0-alpha.3

lib/src/mapping.d.ts

@@ -17,4 +17,4 @@ import { CommandContractInfo, CommandContractType, ParamDefinition, TriggerType } from './types';
     readonly MakerBasicSellCommandV2: readonly ["uint256", "uint16", "uint256", "uint256", "uint256", "uint256", "uint64", "uint32"];
-    readonly AaveV3BasicBuyCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256", "uint256", "uint256", "uint64", "uint32"];
-    readonly AaveV3BasicSellCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256", "uint256", "uint256", "uint64", "uint32"];
+    readonly DmaAaveV3BasicBuyCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256", "uint256", "uint256", "uint64", "uint32"];
+    readonly DmaAaveV3BasicSellCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256", "uint256", "uint256", "uint64", "uint32"];
     readonly DmaAaveV3StopLossCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256"];
@@ -21,0 +21,0 @@ readonly DmaSparkStopLossCommandV2: readonly ["address", "uint16", "uint256", "address", "address", "bytes32", "uint256"];

lib/src/mapping.js

@@ -96,3 +96,3 @@ "use strict";
     ],
-    [types_1.CommandContractType.AaveBasicSellCommandV2]: [
+    [types_1.CommandContractType.DmaAaveBasicSellCommandV2]: [
         'positionAddress',
@@ -110,3 +110,3 @@ 'triggerType',
     ],
-    [types_1.CommandContractType.AaveBasicBuyCommandV2]: [
+    [types_1.CommandContractType.DmaAaveBasicBuyCommandV2]: [
         'positionAddress',
@@ -124,3 +124,3 @@ 'triggerType',
     ],
-    [types_1.CommandContractType.AaveStopLossCommandV2_2]: [
+    [types_1.CommandContractType.DmaAaveStopLossCommandV2]: [
         'positionAddress',
@@ -134,3 +134,3 @@ 'triggerType',
     ],
-    [types_1.CommandContractType.SparkStopLossCommandV2_2]: [
+    [types_1.CommandContractType.DmaSparkStopLossCommandV2]: [
         'positionAddress',
@@ -213,6 +213,6 @@ 'triggerType',
         '0x72241841022bc824B0b66e3D27D8937D36dA4FDF': {
-            type: types_1.CommandContractType.AaveBasicBuyCommandV2,
+            type: types_1.CommandContractType.DmaAaveBasicBuyCommandV2,
         },
         '0x31d767f6556CE3fC55d6245C9aEF3575aa64BABf': {
-            type: types_1.CommandContractType.AaveBasicSellCommandV2,
+            type: types_1.CommandContractType.DmaAaveBasicSellCommandV2,
         },
@@ -222,6 +222,6 @@ },
         '0xb7CB13e4cD2D64e739b5746563978Ab7ee36B064': {
-            type: types_1.CommandContractType.AaveBasicBuyCommandV2,
+            type: types_1.CommandContractType.DmaAaveBasicBuyCommandV2,
         },
         '0xbf566C1b260F0464f75470C146288283f11219a9': {
-            type: types_1.CommandContractType.AaveBasicSellCommandV2,
+            type: types_1.CommandContractType.DmaAaveBasicSellCommandV2,
         },
@@ -302,3 +302,3 @@ },
     ],
-    [types_1.CommandContractType.AaveBasicBuyCommandV2]: [
+    [types_1.CommandContractType.DmaAaveBasicBuyCommandV2]: [
         'address',
@@ -316,3 +316,3 @@ 'uint16',
     ],
-    [types_1.CommandContractType.AaveBasicSellCommandV2]: [
+    [types_1.CommandContractType.DmaAaveBasicSellCommandV2]: [
         'address',
@@ -330,3 +330,3 @@ 'uint16',
     ],
-    [types_1.CommandContractType.AaveStopLossCommandV2_2]: [
+    [types_1.CommandContractType.DmaAaveStopLossCommandV2]: [
         'address',
@@ -340,3 +340,3 @@ 'uint16',
     ],
-    [types_1.CommandContractType.SparkStopLossCommandV2_2]: [
+    [types_1.CommandContractType.DmaSparkStopLossCommandV2]: [
         'address',
@@ -343,0 +343,0 @@ 'uint16',

lib/src/types.d.ts

@@ -22,6 +22,6 @@ import { ethers } from 'ethers';
     SparkStopLossCommandV2 = "SparkStopLossCommandV2",
-    AaveBasicBuyCommandV2 = "AaveV3BasicBuyCommandV2",
-    AaveBasicSellCommandV2 = "AaveV3BasicSellCommandV2",
-    SparkStopLossCommandV2_2 = "DmaSparkStopLossCommandV2",
-    AaveStopLossCommandV2_2 = "DmaAaveV3StopLossCommandV2"
+    DmaAaveBasicBuyCommandV2 = "DmaAaveV3BasicBuyCommandV2",
+    DmaAaveBasicSellCommandV2 = "DmaAaveV3BasicSellCommandV2",
+    DmaSparkStopLossCommandV2 = "DmaSparkStopLossCommandV2",
+    DmaAaveStopLossCommandV2 = "DmaAaveV3StopLossCommandV2"
 }
@@ -50,6 +50,6 @@ export declare enum TriggerType {
     AaveBasicSellV2 = 120,
-    AaveStopLossToCollateralV2_2 = 121,
-    AaveStopLossToDebtV2_2 = 122,
-    SparkStopLossToCollateralV2_2 = 123,
-    SparkStopLossToDebtV2_2 = 124
+    DmaAaveStopLossToCollateralV2 = 121,
+    DmaAaveStopLossToDebtV2 = 122,
+    DmaSparkStopLossToCollateralV2 = 123,
+    DmaSparkStopLossToDebtV2 = 124
 }
@@ -56,0 +56,0 @@ export declare const triggerTypeToCommandContractTypeMap: Record<TriggerType, CommandContractType>;

lib/src/types.js

@@ -26,6 +26,6 @@ "use strict";
     CommandContractType["SparkStopLossCommandV2"] = "SparkStopLossCommandV2";
-    CommandContractType["AaveBasicBuyCommandV2"] = "AaveV3BasicBuyCommandV2";
-    CommandContractType["AaveBasicSellCommandV2"] = "AaveV3BasicSellCommandV2";
-    CommandContractType["SparkStopLossCommandV2_2"] = "DmaSparkStopLossCommandV2";
-    CommandContractType["AaveStopLossCommandV2_2"] = "DmaAaveV3StopLossCommandV2";
+    CommandContractType["DmaAaveBasicBuyCommandV2"] = "DmaAaveV3BasicBuyCommandV2";
+    CommandContractType["DmaAaveBasicSellCommandV2"] = "DmaAaveV3BasicSellCommandV2";
+    CommandContractType["DmaSparkStopLossCommandV2"] = "DmaSparkStopLossCommandV2";
+    CommandContractType["DmaAaveStopLossCommandV2"] = "DmaAaveV3StopLossCommandV2";
 })(CommandContractType = exports.CommandContractType || (exports.CommandContractType = {}));
@@ -55,6 +55,6 @@ var TriggerType;
     TriggerType[TriggerType["AaveBasicSellV2"] = 120] = "AaveBasicSellV2";
-    TriggerType[TriggerType["AaveStopLossToCollateralV2_2"] = 121] = "AaveStopLossToCollateralV2_2";
-    TriggerType[TriggerType["AaveStopLossToDebtV2_2"] = 122] = "AaveStopLossToDebtV2_2";
-    TriggerType[TriggerType["SparkStopLossToCollateralV2_2"] = 123] = "SparkStopLossToCollateralV2_2";
-    TriggerType[TriggerType["SparkStopLossToDebtV2_2"] = 124] = "SparkStopLossToDebtV2_2";
+    TriggerType[TriggerType["DmaAaveStopLossToCollateralV2"] = 121] = "DmaAaveStopLossToCollateralV2";
+    TriggerType[TriggerType["DmaAaveStopLossToDebtV2"] = 122] = "DmaAaveStopLossToDebtV2";
+    TriggerType[TriggerType["DmaSparkStopLossToCollateralV2"] = 123] = "DmaSparkStopLossToCollateralV2";
+    TriggerType[TriggerType["DmaSparkStopLossToDebtV2"] = 124] = "DmaSparkStopLossToDebtV2";
 })(TriggerType = exports.TriggerType || (exports.TriggerType = {}));
@@ -81,8 +81,8 @@ exports.triggerTypeToCommandContractTypeMap = {
     [TriggerType.SparkStopLossToDebtV2]: CommandContractType.SparkStopLossCommandV2,
-    [TriggerType.AaveBasicBuyV2]: CommandContractType.AaveBasicBuyCommandV2,
-    [TriggerType.AaveBasicSellV2]: CommandContractType.AaveBasicSellCommandV2,
-    [TriggerType.AaveStopLossToCollateralV2_2]: CommandContractType.AaveStopLossCommandV2_2,
-    [TriggerType.AaveStopLossToDebtV2_2]: CommandContractType.AaveStopLossCommandV2_2,
-    [TriggerType.SparkStopLossToCollateralV2_2]: CommandContractType.SparkStopLossCommandV2_2,
-    [TriggerType.SparkStopLossToDebtV2_2]: CommandContractType.SparkStopLossCommandV2_2,
+    [TriggerType.AaveBasicBuyV2]: CommandContractType.DmaAaveBasicBuyCommandV2,
+    [TriggerType.AaveBasicSellV2]: CommandContractType.DmaAaveBasicSellCommandV2,
+    [TriggerType.DmaAaveStopLossToCollateralV2]: CommandContractType.DmaAaveStopLossCommandV2,
+    [TriggerType.DmaAaveStopLossToDebtV2]: CommandContractType.DmaAaveStopLossCommandV2,
+    [TriggerType.DmaSparkStopLossToCollateralV2]: CommandContractType.DmaSparkStopLossCommandV2,
+    [TriggerType.DmaSparkStopLossToDebtV2]: CommandContractType.DmaSparkStopLossCommandV2,
 };
@@ -89,0 +89,0 @@ var TriggerGroupType;

package.json

 {
   "name": "@oasisdex/automation",
   "packageManager": "yarn@1.22.21",
-  "version": "1.6.0-alpha.2",
+  "version": "1.6.0-alpha.3",
   "description": "The set of utilities for Oasis automation",
@@ -6,0 +6,0 @@ "homepage": "https://github.com/OasisDEX/common#readme",

src/mapping.ts

@@ -101,3 +101,3 @@ import {
   ],
-  [CommandContractType.AaveBasicSellCommandV2]: [
+  [CommandContractType.DmaAaveBasicSellCommandV2]: [
     'positionAddress',
@@ -115,3 +115,3 @@ 'triggerType',
   ],
-  [CommandContractType.AaveBasicBuyCommandV2]: [
+  [CommandContractType.DmaAaveBasicBuyCommandV2]: [
     'positionAddress',
@@ -129,3 +129,3 @@ 'triggerType',
   ],
-  [CommandContractType.AaveStopLossCommandV2_2]: [
+  [CommandContractType.DmaAaveStopLossCommandV2]: [
     'positionAddress',
@@ -139,3 +139,3 @@ 'triggerType',
   ],
-  [CommandContractType.SparkStopLossCommandV2_2]: [
+  [CommandContractType.DmaSparkStopLossCommandV2]: [
     'positionAddress',
@@ -223,6 +223,6 @@ 'triggerType',
       '0x72241841022bc824B0b66e3D27D8937D36dA4FDF': {
-        type: CommandContractType.AaveBasicBuyCommandV2,
+        type: CommandContractType.DmaAaveBasicBuyCommandV2,
       },
       '0x31d767f6556CE3fC55d6245C9aEF3575aa64BABf': {
-        type: CommandContractType.AaveBasicSellCommandV2,
+        type: CommandContractType.DmaAaveBasicSellCommandV2,
       },
@@ -232,6 +232,6 @@ },
       '0xb7CB13e4cD2D64e739b5746563978Ab7ee36B064': {
-        type: CommandContractType.AaveBasicBuyCommandV2,
+        type: CommandContractType.DmaAaveBasicBuyCommandV2,
       },
       '0xbf566C1b260F0464f75470C146288283f11219a9': {
-        type: CommandContractType.AaveBasicSellCommandV2,
+        type: CommandContractType.DmaAaveBasicSellCommandV2,
       },
@@ -316,3 +316,3 @@ },
   ],
-  [CommandContractType.AaveBasicBuyCommandV2]: [
+  [CommandContractType.DmaAaveBasicBuyCommandV2]: [
     'address', //positionAddress
@@ -330,3 +330,3 @@ 'uint16', // triggerType
   ],
-  [CommandContractType.AaveBasicSellCommandV2]: [
+  [CommandContractType.DmaAaveBasicSellCommandV2]: [
     'address', //positionAddress
@@ -344,3 +344,3 @@ 'uint16', // triggerType
   ],
-  [CommandContractType.AaveStopLossCommandV2_2]: [
+  [CommandContractType.DmaAaveStopLossCommandV2]: [
     'address', //positionAddress
@@ -354,3 +354,3 @@ 'uint16', // triggerType
   ],
-  [CommandContractType.SparkStopLossCommandV2_2]: [
+  [CommandContractType.DmaSparkStopLossCommandV2]: [
     'address', //positionAddress
@@ -357,0 +357,0 @@ 'uint16', // triggerType

src/types.ts

@@ -24,35 +24,35 @@ import { ethers } from 'ethers';
   SparkStopLossCommandV2 = 'SparkStopLossCommandV2',
-  AaveBasicBuyCommandV2 = 'AaveV3BasicBuyCommandV2',
-  AaveBasicSellCommandV2 = 'AaveV3BasicSellCommandV2',
-  SparkStopLossCommandV2_2 = 'DmaSparkStopLossCommandV2',
-  AaveStopLossCommandV2_2 = 'DmaAaveV3StopLossCommandV2',
+  DmaAaveBasicBuyCommandV2 = 'DmaAaveV3BasicBuyCommandV2',
+  DmaAaveBasicSellCommandV2 = 'DmaAaveV3BasicSellCommandV2',
+  DmaSparkStopLossCommandV2 = 'DmaSparkStopLossCommandV2',
+  DmaAaveStopLossCommandV2 = 'DmaAaveV3StopLossCommandV2',
 }
 
-export enum TriggerType {
-  StopLossToCollateral = 1,
-  StopLossToDai = 2,
-  BasicBuy = 3,
-  BasicSell = 4,
-  AutoTakeProfitToCollateral = 7,
-  AutoTakeProfitToDai = 8,
-  SimpleAAVESell = 9,
-  AaveStopLossToCollateral = 10,
-  AaveStopLossToDebt = 11,
-  MakerStopLossToCollateralV2 = 101,
-  MakerStopLossToDaiV2 = 102,
-  MakerBasicBuyV2 = 103,
-  MakerBasicSellV2 = 104,
-  MakerAutoTakeProfitToCollateralV2 = 105,
-  MakerAutoTakeProfitToDaiV2 = 106,
-  AaveStopLossToCollateralV2 = 111,
-  AaveStopLossToDebtV2 = 112,
-  SparkStopLossToCollateralV2 = 117,
-  SparkStopLossToDebtV2 = 118,
-  AaveBasicBuyV2 = 119,
-  AaveBasicSellV2 = 120,
-  AaveStopLossToCollateralV2_2 = 121,
-  AaveStopLossToDebtV2_2 = 122,
-  SparkStopLossToCollateralV2_2 = 123,
-  SparkStopLossToDebtV2_2 = 124,
-}
+  export enum TriggerType {
+    StopLossToCollateral = 1,
+    StopLossToDai = 2,
+    BasicBuy = 3,
+    BasicSell = 4,
+    AutoTakeProfitToCollateral = 7,
+    AutoTakeProfitToDai = 8,
+    SimpleAAVESell = 9,
+    AaveStopLossToCollateral = 10,
+    AaveStopLossToDebt = 11,
+    MakerStopLossToCollateralV2 = 101,
+    MakerStopLossToDaiV2 = 102,
+    MakerBasicBuyV2 = 103,
+    MakerBasicSellV2 = 104,
+    MakerAutoTakeProfitToCollateralV2 = 105,
+    MakerAutoTakeProfitToDaiV2 = 106,
+    AaveStopLossToCollateralV2 = 111,
+    AaveStopLossToDebtV2 = 112,
+    SparkStopLossToCollateralV2 = 117,
+    SparkStopLossToDebtV2 = 118,
+    AaveBasicBuyV2 = 119,
+    AaveBasicSellV2 = 120,
+    DmaAaveStopLossToCollateralV2 = 121,
+    DmaAaveStopLossToDebtV2 = 122,
+    DmaSparkStopLossToCollateralV2 = 123,
+    DmaSparkStopLossToDebtV2 = 124,
+  }
 
@@ -79,8 +79,8 @@ export const triggerTypeToCommandContractTypeMap: Record<TriggerType, CommandContractType> = {
   [TriggerType.SparkStopLossToDebtV2]: CommandContractType.SparkStopLossCommandV2,
-  [TriggerType.AaveBasicBuyV2]: CommandContractType.AaveBasicBuyCommandV2,
-  [TriggerType.AaveBasicSellV2]: CommandContractType.AaveBasicSellCommandV2,
-  [TriggerType.AaveStopLossToCollateralV2_2]: CommandContractType.AaveStopLossCommandV2_2,
-  [TriggerType.AaveStopLossToDebtV2_2]: CommandContractType.AaveStopLossCommandV2_2,
-  [TriggerType.SparkStopLossToCollateralV2_2]: CommandContractType.SparkStopLossCommandV2_2,
-  [TriggerType.SparkStopLossToDebtV2_2]: CommandContractType.SparkStopLossCommandV2_2,
+  [TriggerType.AaveBasicBuyV2]: CommandContractType.DmaAaveBasicBuyCommandV2,
+  [TriggerType.AaveBasicSellV2]: CommandContractType.DmaAaveBasicSellCommandV2,
+  [TriggerType.DmaAaveStopLossToCollateralV2]: CommandContractType.DmaAaveStopLossCommandV2,
+  [TriggerType.DmaAaveStopLossToDebtV2]: CommandContractType.DmaAaveStopLossCommandV2,
+  [TriggerType.DmaSparkStopLossToCollateralV2]: CommandContractType.DmaSparkStopLossCommandV2,
+  [TriggerType.DmaSparkStopLossToDebtV2]: CommandContractType.DmaSparkStopLossCommandV2,
 };
@@ -87,0 +87,0 @@

No alert changes

Improved metrics

Total package byte prevSize

136721

increased by0.15%

No dependency changes