feat: support multiple events of same type

src/events.ts

@@ -180,7 +180,7 @@ const eventLister = (context, event: EventResult): Promise<EventResult> => {
               event: { method, section },
             } = record;
 
-            if (name === `${section}.${method}`) {
+            if (name === `${section}.${method}` && isExpectedEvent(record, event)) {
               resolve(updateEventResult(true, record, event));
               unsubscribe();
             }
@@ -205,6 +205,35 @@ const eventLister = (context, event: EventResult): Promise<EventResult> => {
   });
 };
 
+const isExpectedEvent = (record, event: Readonly<EventResult>): boolean => {
+  // Clone event result and apply actual event (record) to determine match
+  let clone : EventResult = { ...event };
+  clone.data = []; // data must be reset due to lack of deep copy of array with spread operator
+  updateEventResult(true, record, clone);
+
+  const { attributes, data, result } = clone;
+
+  // Check whether event is expected based on result/attributes (simplified logic from messageBuilder)
+  if (result)
+    return isExpectedEventResult(clone);
+  else if (attributes)
+    return attributes.every((attribute, i) => {
+      try {
+        const { value, isRange, threshold, xcmOutcome } = attribute;
+
+        if (xcmOutcome)
+          return xcmOutcome === data[i].xcmOutcome;
+        else if (value && data[i])
+          return isExpectedEventAttribute(value, data[i].value, isRange, threshold);
+      } catch (e) {
+        console.log(e);
+        return false;
+      }
+    });
+
+  return false;
+};
+
 const isExpectedEventResult = (event: EventResult): boolean => {
   const { result, record, strict } = event;