Fix edge case with 1 abi type event

src/types/docs-schemas/definitions.schema.json

@@ -733,7 +733,7 @@
       "title": "AbiType",
       "anyOf": [
         { "title": "StringABI", "type": "string" },
-        { "title": "ArrayABI", "type": "array" }
+        { "title": "ArrayABI", "type": "array", "items": { "type": "string" } }
       ]
     },
     "safe-contracts": {

src/types/docs/definitions-definitions-abitype-anyof-arrayabi-items.md

@@ -0,0 +1,3 @@
+## items Type
+
+`string`

src/types/docs/definitions-definitions-abitype-anyof-arrayabi.md

@@ -1,3 +1,3 @@
 ## 1 Type
 
-`array` ([ArrayABI](definitions-definitions-abitype-anyof-arrayabi.md))
+`string[]`

src/types/types/resources.schema.d.ts

@@ -126,7 +126,7 @@ export type Address = string;
 export type Network1 = SupportedNetwork | TenantNetwork;
 export type AbiType = StringABI | ArrayABI;
 export type StringABI = string;
-export type ArrayABI = unknown[];
+export type ArrayABI = string[];
 export type DefenderID5 = string;
 export type MonitorOrDefenderID = Monitor | DefenderID6;
 export type Monitor = BlockMonitor | FortaMonitor;

src/utils/index.ts

@@ -38,6 +38,7 @@ import {
 } from '../types';
 import { sanitise } from './sanitise';
 import {
+  AbiType,
   Action,
   ActionOrDefenderID,
   ActionSecrets,
@@ -317,6 +318,16 @@ const getDefenderContract = (
   return contracts.find((a) => `${a.network}-${a.address}` === `${resource.network}-${resource.address}`);
 };
 
+const parseMonitorAbi = (abi: AbiType | undefined) => {
+  // Because the way AbiType is typed (string | string[]), a list with 1 string item is interpreted as a string rather than string[]
+  // Therefore, JSON.parse may fail if the string is not a valid JSON
+  try {
+    return abi && JSON.stringify(typeof abi === 'string' ? JSON.parse(abi) : abi);
+  } catch (e) {
+    return abi && JSON.stringify([abi]);
+  }
+};
+
 export const constructMonitor = (
   context: Serverless,
   resources: Resources,
@@ -353,9 +364,8 @@ export const constructMonitor = (
   //        otherwise getDefenderContract will return old values
   const monitorContracts = monitor.contracts?.map((contract) => getDefenderContract(contract, contracts));
   // if monitor.abi is defined, we use that over the first entry from monitorContracts by default
-  const monitorABI =
-    (monitor.abi && JSON.stringify(typeof monitor.abi === 'string' ? JSON.parse(monitor.abi) : monitor.abi)) ||
-    monitorContracts?.[0]?.abi;
+  const monitorABI = parseMonitorAbi(monitor.abi) || monitorContracts?.[0]?.abi;
+
   // Pull addresses from either monitor.addresses or monitor.contracts
   const monitorAddresses =
     (monitorContracts &&