client/engine: delete invalid skeleton blocks (#2584)

Co-authored-by: acolytec3 <[email protected]>
ethereumjs · Mar 14, 2023 · f0f0cc5 · f0f0cc5
1 parent 9c957b7
commit f0f0cc5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/packages/client/lib/rpc/modules/engine.ts b/packages/client/lib/rpc/modules/engine.ts
@@ -590,8 +590,10 @@ export class Engine {
 
     blocks.push(block)
 
+    let lastBlock: Block
     try {
       for (const [i, block] of blocks.entries()) {
+        lastBlock = block
         const root = (i > 0 ? blocks[i - 1] : await this.chain.getBlock(block.header.parentHash))
           .header.stateRoot
         await this.execution.runWithoutSetHead({
@@ -605,6 +607,14 @@ export class Engine {
       this.config.logger.error(validationError)
       const latestValidHash = await validHash(block.header.parentHash, this.chain)
       const response = { status: Status.INVALID, latestValidHash, validationError }
+      try {
+        await this.chain.blockchain.delBlock(lastBlock!.hash())
+        // eslint-disable-next-line no-empty
+      } catch {}
+      try {
+        await this.service.beaconSync?.skeleton.deleteBlock(lastBlock!)
+        // eslint-disable-next-line no-empty
+      } catch {}
       return response
     }
 

diff --git a/packages/client/lib/sync/skeleton.ts b/packages/client/lib/sync/skeleton.ts
@@ -788,7 +788,7 @@ export class Skeleton extends MetaDBManager {
   /**
    * Deletes a skeleton block from the db by number
    */
-  private async deleteBlock(block: Block): Promise<boolean> {
+  async deleteBlock(block: Block): Promise<boolean> {
     try {
       await this.delete(DBKey.SkeletonBlock, bigIntToBuffer(block.header.number))
       await this.delete(DBKey.SkeletonBlockHashToNumber, block.hash())