Fix: Hive engine api FCU regression (hyperledger#4947)

* Swap lines order to ensure we commit FCU even if payload timestamp is before head timestamp Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> * spotless Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com> Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
elenduuche · Aug 16, 2023 · b25d966 · b25d966
1 parent 855ffff
commit b25d966
Showing 1 changed file with 4 additions and 4 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
@@ -143,6 +143,10 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
                         ws ->
                             ws.stream().map(WithdrawalParameter::toWithdrawal).collect(toList())));
 
+    ForkchoiceResult result =
+        mergeCoordinator.updateForkChoice(
+            newHead, forkChoice.getFinalizedBlockHash(), forkChoice.getSafeBlockHash());
+
     if (maybePayloadAttributes.isPresent()
         && !isPayloadAttributesValid(maybePayloadAttributes.get(), withdrawals, newHead)) {
       warnLambda(
@@ -153,10 +157,6 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
       return new JsonRpcErrorResponse(requestId, JsonRpcError.INVALID_PAYLOAD_ATTRIBUTES);
     }
 
-    ForkchoiceResult result =
-        mergeCoordinator.updateForkChoice(
-            newHead, forkChoice.getFinalizedBlockHash(), forkChoice.getSafeBlockHash());
-
     if (!result.isValid()) {
       logForkchoiceUpdatedCall(INVALID, forkChoice);
       return handleNonValidForkchoiceUpdate(requestId, result);