@oasisdex/automation - npm Package Compare versions

Comparing version 1.5.9-alpha3 to 1.5.9-alpha4

lib/src/abi-coding.d.ts

 import { utils } from 'ethers';
 import { CommandContractType, TriggerType } from './types';
 export declare function decodeTriggerData(commandAddress: string, network: number, data: string): utils.Result;
+export declare function decodeTriggerDataByType(type: CommandContractType, data: string): utils.Result;
+export declare function decodeTriggerDataByTriggerType(triggerType: TriggerType, data: string): utils.Result;
 export declare function decodeTriggerDataAsJson(commandAddress: string, network: number, data: string): utils.Result;
-export declare function decodeTriggerDataByType(type: CommandContractType, data: string): utils.Result;
 export declare function decodeTriggerDataByTypeAsJson(type: CommandContractType, data: string): utils.Result;
@@ -7,0 +8,0 @@ export declare function decodeTriggerDataByTriggerTypeAsJson(triggerType: TriggerType, data: string): utils.Result;

lib/src/abi-coding.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeTriggerDataByTriggerType = exports.encodeTriggerDataByType = exports.encodeTriggerData = exports.decodeTriggerDataByTriggerTypeAsJson = exports.decodeTriggerDataByTypeAsJson = exports.decodeTriggerDataByType = exports.decodeTriggerDataAsJson = exports.decodeTriggerData = void 0;
+exports.encodeTriggerDataByTriggerType = exports.encodeTriggerDataByType = exports.encodeTriggerData = exports.decodeTriggerDataByTriggerTypeAsJson = exports.decodeTriggerDataByTypeAsJson = exports.decodeTriggerDataAsJson = exports.decodeTriggerDataByTriggerType = exports.decodeTriggerDataByType = exports.decodeTriggerData = void 0;
 const ethers_1 = require("ethers");
@@ -12,2 +12,13 @@ const mapping_1 = require("./mapping");
 exports.decodeTriggerData = decodeTriggerData;
+function decodeTriggerDataByType(type, data) {
+    const paramTypes = (0, mapping_1.getDefinitionForCommandType)(type);
+    return ethers_1.utils.defaultAbiCoder.decode(paramTypes, data);
+}
+exports.decodeTriggerDataByType = decodeTriggerDataByType;
+function decodeTriggerDataByTriggerType(triggerType, data) {
+    const type = types_1.triggerTypeToCommandContractTypeMap[triggerType];
+    const paramTypes = (0, mapping_1.getDefinitionForCommandType)(type);
+    return ethers_1.utils.defaultAbiCoder.decode(paramTypes, data);
+}
+exports.decodeTriggerDataByTriggerType = decodeTriggerDataByTriggerType;
 function decodeTriggerDataAsJson(commandAddress, network, data) {
@@ -22,7 +33,2 @@ const arr = decodeTriggerData(commandAddress, network, data);
 exports.decodeTriggerDataAsJson = decodeTriggerDataAsJson;
-function decodeTriggerDataByType(type, data) {
-    const paramTypes = (0, mapping_1.getDefinitionForCommandType)(type);
-    return ethers_1.utils.defaultAbiCoder.decode(paramTypes, data);
-}
-exports.decodeTriggerDataByType = decodeTriggerDataByType;
 function decodeTriggerDataByTypeAsJson(type, data) {
@@ -29,0 +35,0 @@ const arr = decodeTriggerDataByType(type, data);

lib/src/index.d.ts

@@ -1,4 +0,4 @@
-export { decodeTriggerData, decodeTriggerDataByType, encodeTriggerData, encodeTriggerDataByType, decodeTriggerDataAsJson, decodeTriggerDataByTypeAsJson, } from './abi-coding';
+export { decodeTriggerData, decodeTriggerDataByType, decodeTriggerDataByTriggerType, encodeTriggerData, encodeTriggerDataByType, decodeTriggerDataAsJson, encodeTriggerDataByTriggerType, decodeTriggerDataByTypeAsJson, decodeTriggerDataByTriggerTypeAsJson, } from './abi-coding';
 export { getCommandAddresses } from './mapping';
-export { CommandContractType, TriggerType, TriggerGroupType } from './types';
+export { CommandContractType, TriggerType, TriggerGroupType, triggerTypeToCommandContractTypeMap, } from './types';
 //# sourceMappingURL=index.d.ts.map

lib/src/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TriggerGroupType = exports.TriggerType = exports.CommandContractType = exports.getCommandAddresses = exports.decodeTriggerDataByTypeAsJson = exports.decodeTriggerDataAsJson = exports.encodeTriggerDataByType = exports.encodeTriggerData = exports.decodeTriggerDataByType = exports.decodeTriggerData = void 0;
+exports.triggerTypeToCommandContractTypeMap = exports.TriggerGroupType = exports.TriggerType = exports.CommandContractType = exports.getCommandAddresses = exports.decodeTriggerDataByTriggerTypeAsJson = exports.decodeTriggerDataByTypeAsJson = exports.encodeTriggerDataByTriggerType = exports.decodeTriggerDataAsJson = exports.encodeTriggerDataByType = exports.encodeTriggerData = exports.decodeTriggerDataByTriggerType = exports.decodeTriggerDataByType = exports.decodeTriggerData = void 0;
 var abi_coding_1 = require("./abi-coding");
 Object.defineProperty(exports, "decodeTriggerData", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerData; } });
 Object.defineProperty(exports, "decodeTriggerDataByType", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerDataByType; } });
+Object.defineProperty(exports, "decodeTriggerDataByTriggerType", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerDataByTriggerType; } });
 Object.defineProperty(exports, "encodeTriggerData", { enumerable: true, get: function () { return abi_coding_1.encodeTriggerData; } });
 Object.defineProperty(exports, "encodeTriggerDataByType", { enumerable: true, get: function () { return abi_coding_1.encodeTriggerDataByType; } });
 Object.defineProperty(exports, "decodeTriggerDataAsJson", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerDataAsJson; } });
+Object.defineProperty(exports, "encodeTriggerDataByTriggerType", { enumerable: true, get: function () { return abi_coding_1.encodeTriggerDataByTriggerType; } });
 Object.defineProperty(exports, "decodeTriggerDataByTypeAsJson", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerDataByTypeAsJson; } });
+Object.defineProperty(exports, "decodeTriggerDataByTriggerTypeAsJson", { enumerable: true, get: function () { return abi_coding_1.decodeTriggerDataByTriggerTypeAsJson; } });
 var mapping_1 = require("./mapping");
@@ -17,2 +20,3 @@ Object.defineProperty(exports, "getCommandAddresses", { enumerable: true, get: function () { return mapping_1.getCommandAddresses; } });
 Object.defineProperty(exports, "TriggerGroupType", { enumerable: true, get: function () { return types_1.TriggerGroupType; } });
+Object.defineProperty(exports, "triggerTypeToCommandContractTypeMap", { enumerable: true, get: function () { return types_1.triggerTypeToCommandContractTypeMap; } });
 //# sourceMappingURL=index.js.map

lib/test/abi-coding.test.js

@@ -57,3 +57,9 @@ "use strict";
         });
-        it('can decode trigger data by command address', () => {
+        it('can decode trigger data by trigger type', () => {
+            const result = (0, abi_coding_1.decodeTriggerDataByTriggerType)(types_1.TriggerType.StopLossToCollateral, data);
+            result.forEach((value, idx) => {
+                (0, chai_1.expect)(ethers_1.BigNumber.from(value).toNumber()).to.eq(validValues[idx]);
+            });
+        });
+        it('can decode trigger data by command type', () => {
             const result = (0, abi_coding_1.decodeTriggerDataByType)(type, data);
@@ -60,0 +66,0 @@ result.forEach((value, idx) => {

package.json

 {
   "name": "@oasisdex/automation",
-  "version": "1.5.9-alpha3",
+  "version": "1.5.9-alpha4",
   "description": "The set of utilities for Oasis automation",
@@ -5,0 +5,0 @@ "homepage": "https://github.com/OasisDEX/common#readme",

src/abi-coding.ts

@@ -19,2 +19,16 @@ import { utils } from 'ethers';
 
+export function decodeTriggerDataByType(type: CommandContractType, data: string): utils.Result {
+  const paramTypes = getDefinitionForCommandType(type);
+  return utils.defaultAbiCoder.decode(paramTypes, data);
+}
+
+export function decodeTriggerDataByTriggerType(
+  triggerType: TriggerType,
+  data: string,
+): utils.Result {
+  const type = triggerTypeToCommandContractTypeMap[triggerType];
+  const paramTypes = getDefinitionForCommandType(type);
+  return utils.defaultAbiCoder.decode(paramTypes, data);
+}
+
 export function decodeTriggerDataAsJson(
@@ -34,7 +48,2 @@ commandAddress: string,
 
-export function decodeTriggerDataByType(type: CommandContractType, data: string): utils.Result {
-  const paramTypes = getDefinitionForCommandType(type);
-  return utils.defaultAbiCoder.decode(paramTypes, data);
-}
-
 export function decodeTriggerDataByTypeAsJson(
@@ -41,0 +50,0 @@ type: CommandContractType,

src/index.ts

 export {
   decodeTriggerData,
   decodeTriggerDataByType,
+  decodeTriggerDataByTriggerType,
   encodeTriggerData,
   encodeTriggerDataByType,
   decodeTriggerDataAsJson,
+  encodeTriggerDataByTriggerType,
   decodeTriggerDataByTypeAsJson,
+  decodeTriggerDataByTriggerTypeAsJson,
 } from './abi-coding';
 export { getCommandAddresses } from './mapping';
 
-export { CommandContractType, TriggerType, TriggerGroupType } from './types';
+export {
+  CommandContractType,
+  TriggerType,
+  TriggerGroupType,
+  triggerTypeToCommandContractTypeMap,
+} from './types';

test/abi-coding.test.ts

@@ -6,2 +6,3 @@ import { expect } from 'chai';
   decodeTriggerDataAsJson,
+  decodeTriggerDataByTriggerType,
   decodeTriggerDataByTriggerTypeAsJson,
@@ -83,4 +84,9 @@ decodeTriggerDataByType,
     });
-
-    it('can decode trigger data by command address', () => {
+    it('can decode trigger data by trigger type', () => {
+      const result = decodeTriggerDataByTriggerType(TriggerType.StopLossToCollateral, data);
+      result.forEach((value, idx) => {
+        expect(EthersBN.from(value).toNumber()).to.eq(validValues[idx]);
+      });
+    });
+    it('can decode trigger data by command type', () => {
       const result = decodeTriggerDataByType(type, data);
@@ -87,0 +93,0 @@ result.forEach((value, idx) => {

No alert changes

Improved metrics

Total package byte prevSize

130033

increased by2.69%

Lines of code

1639

increased by2.57%

No dependency changes