Update mappers and make type narrow

Author: ejMina226

packages/persistance/src/services/prisma/mappers/EventMapper.ts

@@ -7,42 +7,74 @@ import { ObjectMapper } from "../../../ObjectMapper";
 @singleton()
 export class EventMapper
   implements
-    ObjectMapper<{ eventName: string; data: Field[] }, Prisma.JsonObject>
+    ObjectMapper<
+      {
+        eventName: string;
+        data: Field[];
+        source: "afterTxHook" | "beforeTxHook" | "runtime";
+      },
+      Prisma.JsonObject
+    >
 {
-  public mapIn(input: Prisma.JsonObject): { eventName: string; data: Field[] } {
-    if (input === undefined) return { eventName: "", data: [] };
+  public mapIn(input: Prisma.JsonObject): {
+    eventName: string;
+    data: Field[];
+    source: "afterTxHook" | "beforeTxHook" | "runtime";
+  } {
+    if (input === undefined)
+      return { eventName: "", data: [], source: "runtime" };
     return {
       eventName: input.eventName as string,
       data: (input.data as Prisma.JsonArray).map((field) =>
         Field.fromJSON(field as string)
       ),
+      source: this.sourceConvert(input.source as string),
     };
   }
 
   public mapOut(input: {
     eventName: string;
     data: Field[];
+    source: "afterTxHook" | "beforeTxHook" | "runtime";
   }): Prisma.JsonObject {
     return {
       eventName: input.eventName,
       data: input.data.map((field) => field.toString()),
+      source: input.source,
     } as Prisma.JsonObject;
   }
+
+  private sourceConvert(input: string) {
+    if (
+      input === "beforeTxHook" ||
+      input === "afterTxHook" ||
+      input === "runtime"
+    ) {
+      return input;
+    }
+    throw new Error();
+  }
 }
 
 @singleton()
 export class EventArrayMapper
   implements
     ObjectMapper<
-      { eventName: string; data: Field[] }[],
+      {
+        eventName: string;
+        data: Field[];
+        source: "afterTxHook" | "beforeTxHook" | "runtime";
+      }[],
       Prisma.JsonValue | undefined
     >
 {
   public constructor(private readonly eventMapper: EventMapper) {}
 
-  public mapIn(
-    input: Prisma.JsonValue | undefined
-  ): { eventName: string; data: Field[] }[] {
+  public mapIn(input: Prisma.JsonValue | undefined): {
+    eventName: string;
+    data: Field[];
+    source: "afterTxHook" | "beforeTxHook" | "runtime";
+  }[] {
     if (input === undefined) return [];
 
     if (Array.isArray(input)) {
@@ -54,7 +86,11 @@ export class EventArrayMapper
   }
 
   public mapOut(
-    input: { eventName: string; data: Field[] }[]
+    input: {
+      eventName: string;
+      data: Field[];
+      source: "afterTxHook" | "beforeTxHook" | "runtime";
+    }[]
   ): Prisma.JsonValue {
     return input.map((event) =>
       this.eventMapper.mapOut(event)

packages/sequencer/src/protocol/production/sequencing/TransactionExecutionService.ts

@@ -112,8 +112,12 @@ async function decodeTransaction(
 
 function extractEvents(
   runtimeResult: RuntimeContextReducedExecutionResult,
-  source: string
-): { eventName: string; data: Field[] }[] {
+  source: "afterTxHook" | "beforeTxHook" | "runtime"
+): {
+  eventName: string;
+  data: Field[];
+  source: "afterTxHook" | "beforeTxHook" | "runtime";
+}[] {
   return runtimeResult.events.reduce(
     (acc, event) => {
       if (event.condition.toBoolean()) {
@@ -128,7 +132,11 @@ function extractEvents(
       return acc;
     },
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    [] as { eventName: string; data: Field[]; source: string }[]
+    [] as {
+      eventName: string;
+      data: Field[];
+      source: "afterTxHook" | "beforeTxHook" | "runtime";
+    }[]
   );
 }
 

packages/sequencer/src/storage/model/Block.ts

@@ -20,7 +20,11 @@ export interface TransactionExecutionResult {
   stateTransitions: StateTransitionBatch[];
   status: Bool;
   statusMessage?: string;
-  events: { eventName: string; data: Field[] }[];
+  events: {
+    eventName: string;
+    data: Field[];
+    source: "afterTxHook" | "beforeTxHook" | "runtime";
+  }[];
 }
 
 // TODO Why is Block using Fields, but BlockResult bigints? Align that towards the best option