From 1bd495dde35161eeae7349773d408f17ed2dba93 Mon Sep 17 00:00:00 2001 From: Roman Petriv Date: Tue, 21 Jan 2025 16:44:05 +0200 Subject: [PATCH] fix: handle null blocks in array of blocks to process (#376) --- packages/worker/src/block/block.processor.ts | 4 ++-- packages/worker/src/blocksRevert/blocksRevert.service.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/worker/src/block/block.processor.ts b/packages/worker/src/block/block.processor.ts index 3fa438135b..7418ebe8f4 100644 --- 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 index 497cd4fb5d..8dd75a1323 100644 --- 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;