Merge branch 'main' into pectra-devnet-4

Signed-off-by: Daniel Lehrner <daniel.lehrner@consensys.net>

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinator.java

@@ -22,7 +22,6 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
-import org.hyperledger.besu.ethereum.BlockProcessingOutputs;
 import org.hyperledger.besu.ethereum.BlockProcessingResult;
 import org.hyperledger.besu.ethereum.ProtocolContext;
 import org.hyperledger.besu.ethereum.blockcreation.BlockCreator.BlockCreationResult;
@@ -305,7 +304,7 @@ public PayloadIdentifier preparePayload(
           new PayloadWrapper(
               payloadIdentifier,
               new BlockWithReceipts(emptyBlock, result.getReceipts()),
-              result.getYield().flatMap(BlockProcessingOutputs::getRequests)));
+              result.getRequests()));
       LOG.info(
           "Start building proposals for block {} identified by {}",
           emptyBlock.getHeader().getNumber(),
@@ -474,7 +473,7 @@ private void evaluateNewBlock(
           new PayloadWrapper(
               payloadIdentifier,
               new BlockWithReceipts(bestBlock, resultBest.getReceipts()),
-              resultBest.getYield().flatMap(BlockProcessingOutputs::getRequests)));
+              resultBest.getRequests()));
       LOG.atDebug()
           .setMessage(
               "Successfully built block {} for proposal identified by {}, with {} transactions, in {}ms")

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java

@@ -143,7 +143,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
     } catch (JsonRpcParameterException e) {
       throw new InvalidJsonRpcRequestException(
           "Invalid execution request parameters (index 3)",
-          RpcErrorType.INVALID_REQUESTS_PARAMS,
+          RpcErrorType.INVALID_EXECUTION_REQUESTS_PARAMS,
           e);
     }
 
@@ -202,13 +202,13 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
           blockParam,
           mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
           INVALID,
-          "Invalid requests");
+          "Invalid execution requests");
     }
 
     if (!getRequestsValidator(
             protocolSchedule.get(), blockParam.getTimestamp(), blockParam.getBlockNumber())
         .validate(maybeRequests)) {
-      return new JsonRpcErrorResponse(reqId, RpcErrorType.INVALID_REQUESTS_PARAMS);
+      return new JsonRpcErrorResponse(reqId, RpcErrorType.INVALID_EXECUTION_REQUESTS_PARAMS);
     }
 
     if (mergeContext.get().isSyncing()) {

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/EngineNewPayloadV4.java

@@ -72,7 +72,7 @@ protected ValidationResult<RpcErrorType> validateParameters(
           "Missing parent beacon block root field");
     } else if (maybeRequestsParam.isEmpty()) {
       return ValidationResult.invalid(
-          RpcErrorType.INVALID_REQUESTS_PARAMS, "Missing execution requests field");
+          RpcErrorType.INVALID_EXECUTION_REQUESTS_PARAMS, "Missing execution requests field");
     } else {
       return ValidationResult.valid();
     }

ethereum/blockcreation/src/test/java/org/hyperledger/besu/ethereum/blockcreation/AbstractBlockCreatorTest.java

@@ -281,12 +281,6 @@ private CreateOn blockCreatorWithBlobGasSupport() {
     return createBlockCreator(protocolSpecAdapters);
   }
 
-  //  private CreateOn blockCreatorWithProhibitedDepositRequests() {
-  //    final ProtocolSpecAdapters protocolSpecAdapters =
-  //        ProtocolSpecAdapters.create(0, specBuilder -> specBuilder);
-  //    return createBlockCreator(protocolSpecAdapters);
-  //  }
-
   private CreateOn blockCreatorWithWithdrawalsProcessor() {
     final ProtocolSpecAdapters protocolSpecAdapters =
         ProtocolSpecAdapters.create(

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/GenesisState.java

@@ -22,15 +22,13 @@
 import org.hyperledger.besu.datatypes.Address;
 import org.hyperledger.besu.datatypes.BlobGas;
 import org.hyperledger.besu.datatypes.Hash;
-import org.hyperledger.besu.datatypes.RequestType;
 import org.hyperledger.besu.ethereum.core.Block;
 import org.hyperledger.besu.ethereum.core.BlockBody;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockHeaderBuilder;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 import org.hyperledger.besu.ethereum.core.MutableWorldState;
 import org.hyperledger.besu.ethereum.core.Withdrawal;
-import org.hyperledger.besu.ethereum.mainnet.BodyValidation;
 import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 import org.hyperledger.besu.ethereum.mainnet.ScheduleBasedBlockHeaderFunctions;
 import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration;
@@ -219,19 +217,10 @@ private static BlockHeader buildHeader(
         .excessBlobGas(isCancunAtGenesis(genesis) ? parseExcessBlobGas(genesis) : null)
         .parentBeaconBlockRoot(
             (isCancunAtGenesis(genesis) ? parseParentBeaconBlockRoot(genesis) : null))
-        .requestsHash(isPragueAtGenesis(genesis) ? calcEmptyRequestsHash() : null)
+        .requestsHash(isPragueAtGenesis(genesis) ? Hash.EMPTY_REQUESTS_HASH : null)
         .buildBlockHeader();
   }
 
-  private static Hash calcEmptyRequestsHash() {
-    final List<Request> emptyRequests =
-        List.of(
-            new Request(RequestType.DEPOSIT, Bytes.EMPTY),
-            new Request(RequestType.WITHDRAWAL, Bytes.EMPTY),
-            new Request(RequestType.CONSOLIDATION, Bytes.EMPTY));
-    return BodyValidation.requestsHash(emptyRequests);
-  }
-
   private static Address parseCoinbase(final GenesisConfigFile genesis) {
     return genesis
         .getCoinbase()

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/MainnetRequestsValidator.java

@@ -14,27 +14,26 @@
  */
 package org.hyperledger.besu.ethereum.mainnet.requests;
 
-import org.hyperledger.besu.datatypes.RequestType;
 import org.hyperledger.besu.ethereum.core.Request;
 
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.IntStream;
 
+import com.google.common.collect.Ordering;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Validates requests within a block against a set of predefined validators. This class delegates
  * the validation of requests of specific types to corresponding validators. It ensures that
- * requests are properly ordered, have a valid root, and meet the criteria defined by their
+ * requests are properly ordered, have a valid hash, and meet the criteria defined by their
  * validators.
  */
 public class MainnetRequestsValidator implements RequestsValidator {
   private static final Logger LOG = LoggerFactory.getLogger(MainnetRequestsValidator.class);
 
   /**
-   * Validates a block's requests by ensuring they are correctly ordered, have a valid root, and
+   * Validates a block's requests by ensuring they are correctly ordered, have a valid hash, and
    * pass their respective type-specific validations.
    *
    * @param maybeRequests The list of requests to be validated.
@@ -52,21 +51,10 @@ public boolean validate(final Optional<List<Request>> maybeRequests) {
       return false;
     }
 
-    if (!allRequestTypesAreContained(maybeRequests.get())) {
-      LOG.warn("Requests must contain all request types");
-      return false;
-    }
-
     return true;
   }
 
   private static boolean isRequestOrderValid(final List<Request> requests) {
-    return IntStream.range(0, requests.size() - 1)
-        .allMatch(i -> requests.get(i).getType().compareTo(requests.get(i + 1).getType()) <= 0);
-  }
-
-  private static boolean allRequestTypesAreContained(final List<Request> requests) {
-    return requests.stream().map(Request::getType).distinct().count()
-        == RequestType.values().length;
+    return Ordering.natural().onResultOf(Request::getType).isOrdered(requests);
   }
 }

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/RequestProcessorCoordinator.java

@@ -35,16 +35,10 @@ private RequestProcessorCoordinator(
     this.processors = processors;
   }
 
-  public Optional<List<Request>> process(final ProcessRequestContext context) {
-    List<Request> requests = null;
-    for (RequestProcessor requestProcessor : processors.values()) {
-      var r = requestProcessor.process(context);
-      if (requests == null) {
-        requests = new ArrayList<>();
-      }
-      requests.add(r);
-    }
-    return Optional.ofNullable(requests);
+  public List<Request> process(final ProcessRequestContext context) {
+    return processors.values().stream()
+        .map(requestProcessor -> requestProcessor.process(context))
+        .toList();
   }
 
   public static class Builder {

ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/requests/SystemCallRequestProcessor.java

@@ -52,7 +52,6 @@ public Request process(final ProcessRequestContext context) {
             context.operationTracer(),
             context.blockHashLookup());
 
-    Bytes requestData = systemCallOutput == null ? Bytes.EMPTY : systemCallOutput;
-    return new Request(requestType, requestData);
+    return new Request(requestType, systemCallOutput);
   }
 }

ethereum/core/src/test/java/org/hyperledger/besu/ethereum/mainnet/requests/MainnetRequestsValidatorTest.java

@@ -34,12 +34,6 @@ void validateFalseWhenNoRequests() {
     assertFalse(validator.validate(Optional.empty()));
   }
 
-  @Test
-  void validateFalseWhenEmptyListOfRequests() {
-    MainnetRequestsValidator validator = new MainnetRequestsValidator();
-    assertFalse(validator.validate(Optional.of(List.of())));
-  }
-
   @Test
   void validateFalseWhenRequestsNotInOrder() {
     MainnetRequestsValidator validator = new MainnetRequestsValidator();
@@ -51,16 +45,6 @@ void validateFalseWhenRequestsNotInOrder() {
     assertFalse(validator.validate(Optional.of(requests)));
   }
 
-  @Test
-  void validateFalseWhenNotAllRequestTypesAreContained() {
-    MainnetRequestsValidator validator = new MainnetRequestsValidator();
-    List<Request> requests =
-        List.of(
-            new Request(RequestType.DEPOSIT, Bytes.of(1)),
-            new Request(RequestType.WITHDRAWAL, Bytes.of(2)));
-    assertFalse(validator.validate(Optional.of(requests)));
-  }
-
   @Test
   void validateTrueForValidRequests() {
     MainnetRequestsValidator validator = new MainnetRequestsValidator();

ethereum/evmtool/src/main/java/org/hyperledger/besu/evmtool/T8nExecutor.java

@@ -530,7 +530,7 @@ static T8nResult runTest(
               receipts,
               new CachingBlockHashLookup(blockHeader, blockchain),
               OperationTracer.NO_TRACING);
-      Optional<List<Request>> maybeRequests = rpc.process(context);
+      Optional<List<Request>> maybeRequests = Optional.of(rpc.process(context));
       Hash requestsHash = BodyValidation.requestsHash(maybeRequests.orElse(List.of()));
 
       resultObject.put("requestsHash", requestsHash.toHexString());