fix: handle null blocks in array of blocks to process (#376)

matter-labs · Jan 21, 2025 · 1bd495d · 1bd495d
1 parent a766220
commit 1bd495d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/worker/src/block/block.processor.ts b/packages/worker/src/block/block.processor.ts
@@ -78,12 +78,12 @@ export class BlockProcessor {
       return false;
     }
 
-    if (lastDbBlock && lastDbBlock.hash !== blocksToProcess[0].block?.parentHash) {
+    if (lastDbBlock && lastDbBlock.hash !== blocksToProcess[0]?.block?.parentHash) {
       this.triggerBlocksRevertEvent(lastDbBlockNumber);
       return false;
     }
 
-    const allBlocksExist = !blocksToProcess.find((blockInfo) => !blockInfo.block || !blockInfo.blockDetails);
+    const allBlocksExist = !blocksToProcess.find((blockInfo) => !blockInfo?.block || !blockInfo?.blockDetails);
     if (!allBlocksExist) {
       // We don't need to handle this potential revert as these blocks are not in DB yet,
       // try again later once these blocks are present in blockchain again.

diff --git a/packages/worker/src/blocksRevert/blocksRevert.service.ts b/packages/worker/src/blocksRevert/blocksRevert.service.ts
@@ -81,7 +81,7 @@ export class BlocksRevertService {
     lastExecutedBlockNumber: number,
     detectedIncorrectBlockNumber: number
   ) => {
-    // binary search the last block with matching hash between latest executed block from DB and incorrect clock detected
+    // binary search the last block with matching hash between latest executed block from DB and incorrect block detected
     let start = lastExecutedBlockNumber;
     let end = detectedIncorrectBlockNumber;