feat: missing action

OasisDEX · Nov 22, 2023 · fa96386 · fa96386
1 parent 09e934f
commit fa96386
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/packages/automation/package.json b/packages/automation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oasisdex/automation",
-  "version": "1.5.9-alpha3",
+  "version": "1.5.9-alpha4",
   "description": "The set of utilities for Oasis automation",
   "homepage": "https://github.com/OasisDEX/common#readme",
   "main": "lib/src/index.js",

diff --git a/packages/automation/src/abi-coding.ts b/packages/automation/src/abi-coding.ts
@@ -16,6 +16,20 @@ export function decodeTriggerData(
   return utils.defaultAbiCoder.decode(paramTypes, data);
 }
 
+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(
   commandAddress: string,
   network: number,
@@ -30,11 +44,6 @@ export function decodeTriggerDataAsJson(
   }, {});
 }
 
-export function decodeTriggerDataByType(type: CommandContractType, data: string): utils.Result {
-  const paramTypes = getDefinitionForCommandType(type);
-  return utils.defaultAbiCoder.decode(paramTypes, data);
-}
-
 export function decodeTriggerDataByTypeAsJson(
   type: CommandContractType,
   data: string,

diff --git a/packages/automation/src/index.ts b/packages/automation/src/index.ts
@@ -1,11 +1,19 @@
 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';
diff --git a/packages/automation/test/abi-coding.test.ts b/packages/automation/test/abi-coding.test.ts
@@ -3,6 +3,7 @@ import { BigNumber as EthersBN, constants, utils } from 'ethers';
 import {
   decodeTriggerData,
   decodeTriggerDataAsJson,
+  decodeTriggerDataByTriggerType,
   decodeTriggerDataByTriggerTypeAsJson,
   decodeTriggerDataByType,
   decodeTriggerDataByTypeAsJson,
@@ -79,8 +80,13 @@ describe('abi-coding', () => {
         expect(EthersBN.from(value).toNumber()).to.eq(validValues[idx]);
       });
     });
-
-    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);
       result.forEach((value, idx) => {
         expect(EthersBN.from(value).toNumber()).to.eq(validValues[idx]);