Adapted persistence schema

Author: rpanic

packages/persistance/prisma/schema.prisma

@@ -40,11 +40,11 @@ model Transaction {
 }
 
 model TransactionExecutionResult {
-  stateTransitions Json @db.Json
-  protocolTransitions Json @db.Json
-  status Boolean
-  statusMessage String?
-  events Json @db.Json
+  // TODO Make StateTransitionBatch and StateTransition Table
+  stateTransitions Json    @db.Json
+  status           Boolean
+  statusMessage    String?
+  events           Json    @db.Json
 
   tx     Transaction @relation(fields: [txHash], references: [hash])
   txHash String      @id
@@ -65,6 +65,9 @@ model Block {
   fromBlockHashRoot           String
   fromMessagesHash            String
   toMessagesHash              String
+  fromStateRoot               String
+
+  beforeBlockStateTransitions Json @db.Json
 
   parentHash String? @unique
   parent     Block?  @relation("Parent", fields: [parentHash], references: [hash])
@@ -91,11 +94,12 @@ model Batch {
 model BlockResult {
   blockHash String @id @unique
 
-  stateRoot             String
-  blockHashRoot         String
-  afterNetworkState     Json   @db.Json
-  blockStateTransitions Json   @db.Json
-  blockHashWitness      Json   @db.Json
+  stateRoot                  String
+  blockHashRoot              String
+  witnessedRoots             String[]
+  afterNetworkState          Json     @db.Json
+  afterBlockStateTransitions Json     @db.Json
+  blockHashWitness           Json     @db.Json
 
   block Block? @relation(fields: [blockHash], references: [hash])
 }

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

@@ -6,8 +6,14 @@ import { Field } from "o1js";
 
 import { ObjectMapper } from "../../../ObjectMapper";
 
+import { StateTransitionArrayMapper } from "./StateTransitionMapper";
+
 @singleton()
 export class BlockMapper implements ObjectMapper<Block, PrismaBlock> {
+  public constructor(
+    private readonly stArrayMapper: StateTransitionArrayMapper
+  ) {}
+
   public mapIn(input: PrismaBlock): Block {
     return {
       transactions: [],
@@ -30,10 +36,15 @@ export class BlockMapper implements ObjectMapper<Block, PrismaBlock> {
       fromBlockHashRoot: Field(input.fromBlockHashRoot),
       fromMessagesHash: Field(input.fromMessagesHash),
       toMessagesHash: Field(input.toMessagesHash),
+      fromStateRoot: Field(input.fromStateRoot),
 
       transactionsHash: Field(input.transactionsHash),
       previousBlockHash:
         input.parentHash !== null ? Field(input.parentHash) : undefined,
+
+      beforeBlockStateTransitions: this.stArrayMapper.mapIn(
+        input.beforeBlockStateTransitions
+      ),
     };
   }
 
@@ -47,11 +58,16 @@ export class BlockMapper implements ObjectMapper<Block, PrismaBlock> {
       fromBlockHashRoot: input.fromBlockHashRoot.toString(),
       fromMessagesHash: input.fromMessagesHash.toString(),
       toMessagesHash: input.toMessagesHash.toString(),
+      fromStateRoot: input.fromStateRoot.toString(),
 
       hash: input.hash.toString(),
       transactionsHash: input.transactionsHash.toString(),
       parentHash: input.previousBlockHash?.toString() ?? null,
       batchHeight: null,
+
+      beforeBlockStateTransitions: this.stArrayMapper.mapOut(
+        input.beforeBlockStateTransitions
+      ),
     };
   }
 }

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

@@ -28,10 +28,12 @@ export class BlockResultMapper
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         BlockHashMerkleTreeWitness.fromJSON(input.blockHashWitness as any)
       ),
-      blockStateTransitions: this.stArrayMapper.mapIn(
-        input.blockStateTransitions
+      afterBlockStateTransitions: this.stArrayMapper.mapIn(
+        input.afterBlockStateTransitions
       ),
       blockHash: BigInt(input.blockHash),
+
+      witnessedRoots: [BigInt(input.witnessedRoots[0])],
     };
   }
 
@@ -44,10 +46,12 @@ export class BlockResultMapper
       blockHashWitness: BlockHashMerkleTreeWitness.toJSON(
         input.blockHashWitness
       ),
-      blockStateTransitions: this.stArrayMapper.mapOut(
-        input.blockStateTransitions
+      afterBlockStateTransitions: this.stArrayMapper.mapOut(
+        input.afterBlockStateTransitions
       ),
       afterNetworkState: NetworkState.toJSON(input.afterNetworkState),
+
+      witnessedRoots: [input.witnessedRoots[0].toString()],
     };
   }
 }

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

@@ -1,5 +1,8 @@
 import { singleton } from "tsyringe";
-import { UntypedStateTransition } from "@proto-kit/sequencer";
+import {
+  StateTransitionBatch,
+  UntypedStateTransition,
+} from "@proto-kit/sequencer";
 import { Prisma } from "@prisma/client";
 
 import { ObjectMapper } from "../../../ObjectMapper";
@@ -40,3 +43,38 @@ export class StateTransitionArrayMapper
     return input.map((st) => this.stMapper.mapOut(st)) as Prisma.JsonArray;
   }
 }
+
+@singleton()
+export class StateTransitionBatchArrayMapper
+  implements ObjectMapper<StateTransitionBatch[], Prisma.JsonValue>
+{
+  public constructor(
+    private readonly stArrayMapper: StateTransitionArrayMapper
+  ) {}
+
+  public mapOut(input: StateTransitionBatch[]): Prisma.JsonValue {
+    return input.map((st) => ({
+      stateTransitions: this.stArrayMapper.mapOut(
+        st.stateTransitions
+      ) as Prisma.JsonArray,
+      applied: st.applied,
+    }));
+  }
+
+  public mapIn(input: Prisma.JsonValue): StateTransitionBatch[] {
+    if (input === undefined) return [];
+
+    if (Array.isArray(input)) {
+      return (input as Prisma.JsonArray).map((stJson) => {
+        const batchJsonObject = stJson as Prisma.JsonObject;
+        return {
+          stateTransitions: this.stArrayMapper.mapIn(
+            batchJsonObject.stateTransitions
+          ),
+          applied: batchJsonObject.applied as boolean,
+        };
+      });
+    }
+    return [];
+  }
+}

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

@@ -11,7 +11,7 @@ import { Bool } from "o1js";
 
 import { ObjectMapper } from "../../../ObjectMapper";
 
-import { StateTransitionArrayMapper } from "./StateTransitionMapper";
+import { StateTransitionBatchArrayMapper } from "./StateTransitionMapper";
 import { EventArrayMapper } from "./EventMapper";
 
 @singleton()
@@ -55,7 +55,7 @@ export class TransactionExecutionResultMapper
 {
   public constructor(
     private readonly transactionMapper: TransactionMapper,
-    private readonly stArrayMapper: StateTransitionArrayMapper,
+    private readonly stBatchMapper: StateTransitionBatchArrayMapper,
     private readonly eventArrayMapper: EventArrayMapper
   ) {}
 
@@ -67,12 +67,9 @@ export class TransactionExecutionResultMapper
       tx: this.transactionMapper.mapIn(input[1]),
       status: Bool(executionResult.status),
       statusMessage: executionResult.statusMessage ?? undefined,
-      stateTransitions: this.stArrayMapper.mapIn(
+      stateTransitions: this.stBatchMapper.mapIn(
         executionResult.stateTransitions
       ),
-      protocolTransitions: this.stArrayMapper.mapIn(
-        executionResult.protocolTransitions
-      ),
       events: this.eventArrayMapper.mapIn(executionResult.events),
     };
   }
@@ -84,8 +81,7 @@ export class TransactionExecutionResultMapper
     const executionResult = {
       status: input.status.toBoolean(),
       statusMessage: input.statusMessage ?? null,
-      stateTransitions: this.stArrayMapper.mapOut(input.stateTransitions),
-      protocolTransitions: this.stArrayMapper.mapOut(input.protocolTransitions),
+      stateTransitions: this.stBatchMapper.mapOut(input.stateTransitions),
       events: this.eventArrayMapper.mapOut(input.events),
       txHash: tx.hash,
     };