moves syncing check after badblock check

Signed-off-by: Justin Florentine <justin+github@florentine.us>
hyperledger · Oct 17, 2023 · 8d52b31 · 8d52b31
1 parent adbf35b
commit 8d52b31
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/...er/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java b/...er/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java
@@ -98,9 +98,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
             forkChoice.getHeadBlockHash(), forkChoice.getFinalizedBlockHash());
 
     ForkchoiceResult forkchoiceResult = null;
-    if (maybeNewHead.isEmpty()) {
-      return syncingResponse(requestId, forkChoice);
-    } else if (!isValidForkchoiceState(
+    if (!isValidForkchoiceState(
         forkChoice.getSafeBlockHash(), forkChoice.getFinalizedBlockHash(), maybeNewHead.get())) {
       logForkchoiceUpdatedCall(INVALID, forkChoice);
       return new JsonRpcErrorResponse(requestId, RpcErrorType.INVALID_FORKCHOICE_STATE);
@@ -148,16 +146,19 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
     if (mergeCoordinator.isBadBlock(forkChoice.getHeadBlockHash())) {
       logForkchoiceUpdatedCall(INVALID, forkChoice);
       return new JsonRpcSuccessResponse(
-          requestId,
-          new EngineUpdateForkchoiceResult(
-              INVALID,
-              mergeCoordinator
-                  .getLatestValidHashOfBadBlock(forkChoice.getHeadBlockHash())
-                  .orElse(Hash.ZERO),
-              null,
-              Optional.of(forkChoice.getHeadBlockHash() + " is an invalid block")));
+              requestId,
+              new EngineUpdateForkchoiceResult(
+                      INVALID,
+                      mergeCoordinator
+                              .getLatestValidHashOfBadBlock(forkChoice.getHeadBlockHash())
+                              .orElse(Hash.ZERO),
+                      null,
+                      Optional.of(forkChoice.getHeadBlockHash() + " is an invalid block")));
     }
 
+    if (maybeNewHead.isEmpty()) {
+      return syncingResponse(requestId, forkChoice);
+    }
     final BlockHeader newHead = maybeNewHead.get();
     if (maybePayloadAttributes.isPresent()) {
       Optional<JsonRpcErrorResponse> maybeError =