Remove invalid terminal block execution scenario (#4076)

ChainSafe · May 27, 2022 · c1ed45d · c1ed45d
1 parent dfa7b98
commit c1ed45d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/packages/lodestar/src/chain/blocks/verifyBlock.ts b/packages/lodestar/src/chain/blocks/verifyBlock.ts
@@ -270,7 +270,6 @@ export async function verifyBlockStateTransition(
       // child block will cause it to replay
 
       case ExecutePayloadStatus.INVALID_BLOCK_HASH:
-      case ExecutePayloadStatus.INVALID_TERMINAL_BLOCK:
       case ExecutePayloadStatus.ELERROR:
       case ExecutePayloadStatus.UNAVAILABLE:
         throw new BlockError(block, {

diff --git a/packages/lodestar/src/executionEngine/http.ts b/packages/lodestar/src/executionEngine/http.ts
@@ -140,7 +140,6 @@ export class ExecutionEngineHttp implements IExecutionEngine {
         return {status, latestValidHash: null, validationError: null};
 
       case ExecutePayloadStatus.INVALID_BLOCK_HASH:
-      case ExecutePayloadStatus.INVALID_TERMINAL_BLOCK:
         return {status, latestValidHash: null, validationError: validationError ?? "Malformed block"};
 
       case ExecutePayloadStatus.UNAVAILABLE:
@@ -249,13 +248,6 @@ export class ExecutionEngineHttp implements IExecutionEngine {
           }`
         );
 
-      case ExecutePayloadStatus.INVALID_TERMINAL_BLOCK:
-        throw Error(
-          `Invalid terminal block for ${
-            payloadAttributes ? "prepare payload" : "forkchoice request"
-          }, validationError=${validationError ?? ""}`
-        );
-
       default:
         throw Error(`Unknown status ${status}`);
     }

diff --git a/packages/lodestar/src/executionEngine/interface.ts b/packages/lodestar/src/executionEngine/interface.ts
@@ -17,8 +17,6 @@ export enum ExecutePayloadStatus {
   ACCEPTED = "ACCEPTED",
   /** blockHash is invalid */
   INVALID_BLOCK_HASH = "INVALID_BLOCK_HASH",
-  /** invalid terminal block */
-  INVALID_TERMINAL_BLOCK = "INVALID_TERMINAL_BLOCK",
   /** EL error */
   ELERROR = "ELERROR",
   /** EL unavailable */
@@ -32,20 +30,15 @@ export type ExecutePayloadResponse =
   | {status: ExecutePayloadStatus.VALID; latestValidHash: RootHex; validationError: null}
   | {status: ExecutePayloadStatus.INVALID; latestValidHash: RootHex; validationError: string | null}
   | {
-      status:
-        | ExecutePayloadStatus.INVALID_BLOCK_HASH
-        | ExecutePayloadStatus.INVALID_TERMINAL_BLOCK
-        | ExecutePayloadStatus.ELERROR
-        | ExecutePayloadStatus.UNAVAILABLE;
+      status: ExecutePayloadStatus.INVALID_BLOCK_HASH | ExecutePayloadStatus.ELERROR | ExecutePayloadStatus.UNAVAILABLE;
       latestValidHash: null;
       validationError: string;
     };
 
 export type ForkChoiceUpdateStatus =
   | ExecutePayloadStatus.VALID
   | ExecutePayloadStatus.INVALID
-  | ExecutePayloadStatus.SYNCING
-  | ExecutePayloadStatus.INVALID_TERMINAL_BLOCK;
+  | ExecutePayloadStatus.SYNCING;
 
 export type PayloadAttributes = {
   timestamp: number;