From c1d49bef645639473af82b9e835ea9b512cb4805 Mon Sep 17 00:00:00 2001 From: Stefan Date: Wed, 13 Sep 2023 13:54:48 +1000 Subject: [PATCH 1/2] payload attributes: fix wrong warning and fail if beacon root is available before cancun Signed-off-by: Stefan --- .../methods/engine/AbstractEngineForkchoiceUpdated.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java index cfb28bcc9ef..ca7a61a0675 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java @@ -219,9 +219,12 @@ 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( From 79cdae25ca18b407f1f190d6ab0cafe6a6036594 Mon Sep 17 00:00:00 2001 From: Sally MacFarlane Date: Wed, 13 Sep 2023 16:12:30 +1000 Subject: [PATCH 2/2] formatting Signed-off-by: Sally MacFarlane --- .../methods/engine/AbstractEngineForkchoiceUpdated.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java index ca7a61a0675..1cde6c259a0 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineForkchoiceUpdated.java @@ -220,11 +220,13 @@ private boolean isPayloadAttributesValid( } if (payloadAttributes.getTimestamp() < cancunTimestamp) { if (payloadAttributes.getParentBeaconBlockRoot() != null) { - LOG.error("Parent beacon block root hash present in payload attributes before cancun hardfork"); + LOG.error( + "Parent beacon block root hash present in payload attributes before cancun hardfork"); return false; } } else if (payloadAttributes.getParentBeaconBlockRoot() == null) { - LOG.error("Parent beacon block root hash 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(