fix: prevent concurrent block reverts, reset block number after revert

matter-labs · Jan 22, 2025 · 7e9bcbe · 7e9bcbe
1 parent 237bdf1
commit 7e9bcbe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/worker/src/app.service.ts b/packages/worker/src/app.service.ts
@@ -15,6 +15,7 @@ import { SystemContractService } from "./contract/systemContract.service";
 @Injectable()
 export class AppService implements OnModuleInit, OnModuleDestroy {
   private readonly logger: Logger;
+  private isHandlingBlocksRevert = false;
 
   public constructor(
     private readonly counterService: CounterService,
@@ -43,14 +44,21 @@ export class AppService implements OnModuleInit, OnModuleDestroy {
 
   @OnEvent(BLOCKS_REVERT_DETECTED_EVENT)
   protected async handleBlocksRevert({ detectedIncorrectBlockNumber }: { detectedIncorrectBlockNumber: number }) {
+    if (this.isHandlingBlocksRevert) {
+      return;
+    }
+    this.isHandlingBlocksRevert = true;
+
     this.logger.log("Stopping workers before blocks revert");
     await this.stopWorkers();
 
     this.logger.log("Reverting blocks");
     await this.blocksRevertService.handleRevert(detectedIncorrectBlockNumber);
 
     this.logger.log("Starting workers after blocks revert");
-    await this.startWorkers();
+    this.startWorkers();
+
+    this.isHandlingBlocksRevert = false;
   }
 
   private startWorkers() {

diff --git a/packages/worker/src/block/block.watcher.ts b/packages/worker/src/block/block.watcher.ts
@@ -119,7 +119,7 @@ export class BlockWatcher implements OnModuleInit, OnModuleDestroy {
     this.logger.debug(`Last block number is set to: ${this.lastBlockchainBlockNumber}`);
 
     this.blockchainService.on("block", (blockNumber) => {
-      this.lastBlockchainBlockNumber = Math.max(this.lastBlockchainBlockNumber, blockNumber);
+      this.lastBlockchainBlockNumber = blockNumber || this.lastBlockchainBlockNumber;
       this.blockchainBlocksMetric.set(this.lastBlockchainBlockNumber);
       this.logger.debug(`Last block number is updated to: ${this.lastBlockchainBlockNumber}`);
     });