5098: Update RpcErrorType.INVALID_PAYLOAD_ID_PARAMS

Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>
Matilda-Clerke · Aug 15, 2024 · a7e8896 · a7e8896
1 parent c53e5be
commit a7e8896
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayload.java b/...perledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineGetPayload.java
@@ -19,7 +19,9 @@
 import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.ExecutionEngineJsonRpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonRpcParameter;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.RpcErrorType;
@@ -68,7 +70,13 @@ public AbstractEngineGetPayload(
   public JsonRpcResponse syncResponse(final JsonRpcRequestContext request) {
     engineCallListener.executionEngineCalled();
 
-    final PayloadIdentifier payloadId = request.getRequiredParameter(0, PayloadIdentifier.class);
+    final PayloadIdentifier payloadId;
+    try {
+      payloadId = request.getRequiredParameter(0, PayloadIdentifier.class);
+    } catch (Exception e) { // TODO:replace with JsonRpcParameter.JsonRpcParameterException
+      throw new InvalidJsonRpcParameters(
+              "Invalid payload ID parameter (index 0)", RpcErrorType.INVALID_PAYLOAD_ID_PARAMS, e);
+    }
     mergeMiningCoordinator.finalizeProposalById(payloadId);
     final Optional<PayloadWrapper> maybePayload = mergeContext.get().retrievePayloadById(payloadId);
     if (maybePayload.isPresent()) {