Resolved merge problems

Author: rpanic

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

@@ -109,7 +109,7 @@ export class BlockProducerModule extends SequencerModule<BlockConfig> {
 
   public async generateMetadata(block: Block): Promise<BlockResult> {
     const { result, blockHashTreeStore, treeStore } =
-      await this.executionService.generateMetadataForNextBlock(
+      await this.resultService.generateMetadataForNextBlock(
         block,
         this.unprovenMerkleStore,
         this.blockTreeStore

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

@@ -72,7 +72,11 @@ export class BlockResultService {
     merkleTreeStore: AsyncMerkleTreeStore,
     blockHashTreeStore: AsyncMerkleTreeStore,
     modifyTreeStore = true
-  ): Promise<BlockResult> {
+  ): Promise<{
+    result: BlockResult;
+    treeStore: CachedMerkleTreeStore;
+    blockHashTreeStore: CachedMerkleTreeStore;
+  }> {
     const combinedDiff = createCombinedStateDiff(block.transactions);
 
     const inMemoryStore = new CachedMerkleTreeStore(merkleTreeStore);
@@ -138,22 +142,21 @@ export class BlockResultService {
     );
     const blockHashWitness = blockHashTree.getWitness(block.height.toBigInt());
     const newBlockHashRoot = blockHashTree.getRoot();
-    await blockHashInMemoryStore.mergeIntoParent();
-
-    if (modifyTreeStore) {
-      await inMemoryStore.mergeIntoParent();
-    }
 
     return {
-      afterNetworkState: methodResult,
-      stateRoot: stateRoot.toBigInt(),
-      blockHashRoot: newBlockHashRoot.toBigInt(),
-      blockHashWitness,
-
-      blockStateTransitions: stateTransitions.map((st) =>
-        UntypedStateTransition.fromStateTransition(st)
-      ),
-      blockHash: block.hash.toBigInt(),
+      result: {
+        afterNetworkState: methodResult,
+        stateRoot: stateRoot.toBigInt(),
+        blockHashRoot: newBlockHashRoot.toBigInt(),
+        blockHashWitness,
+
+        blockStateTransitions: stateTransitions.map((st) =>
+          UntypedStateTransition.fromStateTransition(st)
+        ),
+        blockHash: block.hash.toBigInt(),
+      },
+      treeStore: inMemoryStore,
+      blockHashTreeStore: blockHashInMemoryStore,
     };
   }
 }