From 21dff15e48d7a006fa4ea0cd3bd1572a4a28eb58 Mon Sep 17 00:00:00 2001
From: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
Date: Fri, 25 Aug 2023 15:43:29 +1000
Subject: [PATCH] Fix Invalid Block Hash return (#5803)

Signed-off-by: Gabriel-Trintinalia <gabriel.trintinalia@consensys.net>
---
 .../internal/methods/engine/AbstractEngineNewPayload.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
index 553fa07fc76..d70b1cc1997 100644
--- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
+++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java
@@ -225,12 +225,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
               "Computed block hash %s does not match block hash parameter %s",
               newBlockHeader.getBlockHash(), blockParam.getBlockHash());
       LOG.debug(errorMessage);
-      return respondWithInvalid(
-          reqId,
-          blockParam,
-          mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
-          getInvalidBlockHashStatus(),
-          errorMessage);
+      return respondWithInvalid(reqId, blockParam, null, getInvalidBlockHashStatus(), errorMessage);
     }
 
     ValidationResult<RpcErrorType> blobValidationResult =