Validate parameters pre cancun

Signed-off-by: Gabriel-Trintinalia <[email protected]>
Gabriel-Trintinalia · Aug 25, 2023 · a5c432e · a5c432e
1 parent bab9c1d
commit a5c432e
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java b/...org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV2.java
@@ -18,6 +18,7 @@
 import org.hyperledger.besu.datatypes.VersionedHash;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.EnginePayloadParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.Transaction;
@@ -48,6 +49,22 @@ public String getName() {
     return RpcMethod.ENGINE_NEW_PAYLOAD_V2.getMethodName();
   }
 
+  @Override
+  protected ValidationResult<RpcErrorType> validateParameters(
+      final EnginePayloadParameter payloadParameter,
+      final Optional<List<String>> maybeVersionedHashParam,
+      final Optional<String> maybeBeaconBlockRootParam) {
+    if (payloadParameter.getBlobGasUsed() != null) {
+      return ValidationResult.invalid(
+          RpcErrorType.INVALID_PARAMS, "non-nil BlobGasUsed pre-cancun");
+    }
+    if (payloadParameter.getExcessBlobGas() != null) {
+      return ValidationResult.invalid(
+          RpcErrorType.INVALID_PARAMS, "non-nil ExcessBlobGas pre-cancun");
+    }
+    return ValidationResult.valid();
+  }
+
   @Override
   protected ValidationResult<RpcErrorType> validateBlobs(
       final List<Transaction> transactions,