payload attributes: fix wrong warning and fail if beacon root is avai…

…lable before cancun (hyperledger#5872) Signed-off-by: Stefan <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>
shemnon · Sep 13, 2023 · 36d7411 · 36d7411
1 parent e841cec
commit 36d7411
Showing 1 changed file with 7 additions and 2 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
@@ -219,9 +219,14 @@ private boolean isPayloadAttributesValid(
       return false;
     }
     if (payloadAttributes.getTimestamp() < cancunTimestamp) {
-      LOG.warn("Payload attributes are present before cancun hardfork");
+      if (payloadAttributes.getParentBeaconBlockRoot() != null) {
+        LOG.error(
+            "Parent beacon block root hash present in payload attributes before cancun hardfork");
+        return false;
+      }
     } else if (payloadAttributes.getParentBeaconBlockRoot() == null) {
-      LOG.warn("Parent beacon block root not present in payload attributes after cancun hardfork");
+      LOG.error(
+          "Parent beacon block root hash not present in payload attributes after cancun hardfork");
       return false;
     }
     if (!getWithdrawalsValidator(