Fix BlockFetching.ts

Author: ejMina226

packages/processor/src/indexer/BlockFetching.ts

@@ -4,11 +4,15 @@ import {
   BlockResult as PrismaBlockResult,
   Transaction as PrismaTransaction,
   TransactionExecutionResult as PrismaTransactionExecutionResult,
+  StateTransition as PrismaStateTransition,
+  StateTransitionBatch as PrismaStateTransitionBatch,
 } from "@prisma/client";
 import {
   BlockMapper,
   BlockResultMapper,
   TransactionExecutionResultMapper,
+  StateTransitionMapper,
+  StateTransitionBatchArrayMapper,
 } from "@proto-kit/persistance";
 import { log } from "@proto-kit/common";
 import { injectable } from "tsyringe";
@@ -23,10 +27,16 @@ export interface BlockFetchingConfig {
 export interface BlockResponse {
   data: {
     findFirstBlock: PrismaBlock & {
-      result: PrismaBlockResult;
+      beforeBlockStateTransitions: PrismaStateTransition[];
+      result: PrismaBlockResult & {
+        afterBlockStateTransitions: PrismaStateTransition[];
+      };
     } & {
       transactions: (PrismaTransactionExecutionResult & {
         tx: PrismaTransaction;
+        stateTransitionBatch: (PrismaStateTransitionBatch & {
+          stateTransitions: PrismaStateTransition[];
+        })[];
       })[];
     };
   };
@@ -37,7 +47,9 @@ export class BlockFetching extends ProcessorModule<BlockFetchingConfig> {
   public constructor(
     public blockMapper: BlockMapper,
     public blockResultMapper: BlockResultMapper,
-    public transactionResultMapper: TransactionExecutionResultMapper
+    public transactionResultMapper: TransactionExecutionResultMapper,
+    private readonly stateTransitionBatchMapper: StateTransitionBatchArrayMapper,
+    private readonly stateTransitionMapper: StateTransitionMapper
   ) {
     super();
   }
@@ -63,6 +75,14 @@ export class BlockFetching extends ProcessorModule<BlockFetchingConfig> {
             fromMessagesHash
             toMessagesHash
             transactionsHash
+            StateTransitionBatch {
+              applied,
+              StateTransition {
+                path,
+                from,    
+                to,      
+              }
+            }
             parent {
               hash
             }
@@ -73,13 +93,27 @@ export class BlockFetching extends ProcessorModule<BlockFetchingConfig> {
               blockHashWitness,
               blockStateTransitions,
               blockHash,
+              StateTransitionBatch {
+                StateTransition {
+                  path,
+                  from,    
+                  to,      
+                }
+              }
             }
             transactions {
               stateTransitions
               protocolTransitions
               status
               statusMessage
               events
+              StateTransitionBatch {
+                StateTransition {
+                  path,
+                  from,    
+                  to,      
+                }
+              }
               tx {
                 hash
                 methodId
@@ -115,13 +149,39 @@ export class BlockFetching extends ProcessorModule<BlockFetchingConfig> {
       return undefined;
     }
 
-    const block = this.blockMapper.mapIn(parsedResponse?.data.findFirstBlock);
-    const result = this.blockResultMapper.mapIn(
-      parsedResponse?.data.findFirstBlock.result
-    );
+    const block = {
+      ...this.blockMapper.mapIn(parsedResponse?.data.findFirstBlock),
+      beforeBlockStateTransitions:
+        parsedResponse.data.findFirstBlock.beforeBlockStateTransitions.map(
+          (st) => this.stateTransitionMapper.mapIn(st)
+        ),
+    };
+    const result = {
+      ...this.blockResultMapper.mapIn(
+        parsedResponse?.data.findFirstBlock.result
+      ),
+      afterBlockStateTransitions:
+        parsedResponse.data.findFirstBlock.result.afterBlockStateTransitions.map(
+          (st) => this.stateTransitionMapper.mapIn(st)
+        ),
+    };
+
     const transactions = parsedResponse?.data.findFirstBlock.transactions.map(
       (tx) => {
-        return this.transactionResultMapper.mapIn([tx, tx.tx]);
+        const txMapped = this.transactionResultMapper.mapIn([tx, tx.tx]);
+        const stBatch = tx.stateTransitionBatch.map<
+          [
+            Omit<
+              PrismaStateTransitionBatch,
+              "txExecutionResultId" | "id" | "blockId" | "blockResultId"
+            >,
+            Omit<PrismaStateTransition, "batchId" | "id">[],
+          ]
+        >((batch) => [{ applied: batch.applied }, batch.stateTransitions]);
+        return {
+          ...txMapped,
+          stateTransitions: this.stateTransitionBatchMapper.mapIn(stBatch),
+        };
       }
     );
 
@@ -138,7 +198,9 @@ export class BlockFetching extends ProcessorModule<BlockFetchingConfig> {
         ...block,
         transactions,
       },
-      result,
+      result: {
+        ...result,
+      },
     };
   }