[4844] wip - added versioned hashes checking

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/CombinedProtocolScheduleFactory.java

@@ -52,7 +52,9 @@ public BftProtocolSchedule create(
           Optional.ofNullable(forkSpecs.higher(spec)).map(ForkSpec::getBlock);
       protocolSchedule.getScheduledProtocolSpecs().stream()
           .filter(protocolSpecMatchesConsensusBlockRange(spec.getBlock(), endBlock))
-          .forEach(s -> combinedProtocolSchedule.putBlockNumberMilestone(s.milestone(), s.spec()));
+          .forEach(
+              s ->
+                  combinedProtocolSchedule.putBlockNumberMilestone(s.fork().milestone(), s.spec()));
 
       // When moving to a new consensus mechanism we want to use the last milestone but created by
       // our consensus mechanism's BesuControllerBuilder so any additional rules are applied
@@ -67,7 +69,7 @@ public BftProtocolSchedule create(
   private Predicate<ScheduledProtocolSpec> protocolSpecMatchesConsensusBlockRange(
       final long startBlock, final Optional<Long> endBlock) {
     return scheduledProtocolSpec ->
-        scheduledProtocolSpec.milestone() >= startBlock
-            && endBlock.map(b -> scheduledProtocolSpec.milestone() < b).orElse(true);
+        scheduledProtocolSpec.fork().milestone() >= startBlock
+            && endBlock.map(b -> scheduledProtocolSpec.fork().milestone() < b).orElse(true);
   }
 }

consensus/common/src/main/java/org/hyperledger/besu/consensus/common/bft/BftProtocolSchedule.java

@@ -49,11 +49,12 @@ public ProtocolSpec getByBlockNumber(final long number) {
     checkArgument(
         !protocolSpecs.isEmpty(), "At least 1 milestone must be provided to the protocol schedule");
     checkArgument(
-        protocolSpecs.last().milestone() == 0, "There must be a milestone starting from block 0");
+        protocolSpecs.last().fork().milestone() == 0,
+        "There must be a milestone starting from block 0");
     // protocolSpecs is sorted in descending block order, so the first one we find that's lower than
     // the requested level will be the most appropriate spec
     for (final ScheduledProtocolSpec s : protocolSpecs) {
-      if (number >= s.milestone()) {
+      if (number >= s.fork().milestone()) {
         return s.spec();
       }
     }

consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataEncoderTest.java → consensus/ibft/src/test/java/org/hyperledger/besu/consensus/ibft/IbftExtraDataRLPEncoderTest.java

@@ -41,7 +41,7 @@
 import org.apache.tuweni.bytes.Bytes;
 import org.junit.Test;
 
-public class IbftExtraDataEncoderTest {
+public class IbftExtraDataRLPEncoderTest {
 
   private static final Supplier<SignatureAlgorithm> SIGNATURE_ALGORITHM =
       Suppliers.memoize(SignatureAlgorithmFactory::getInstance);

consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionProtocolSchedule.java

@@ -203,6 +203,13 @@ public void putTimestampMilestone(final long timestamp, final ProtocolSpec proto
         "Should not use TransitionProtocolSchedule wrapper class to create milestones");
   }
 
+  @Override
+  public Optional<ScheduledProtocolSpec.Hardfork> hardforkFor(
+      final Predicate<ScheduledProtocolSpec> predicate) {
+    return this.transitionUtils.dispatchFunctionAccordingToMergeState(
+        schedule -> schedule.hardforkFor(predicate));
+  }
+
   /**
    * List milestones.
    *

ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcResponseUtils.java

@@ -194,7 +194,6 @@ public TransactionResult transaction(
                             .byteValueExact()))
             .payload(bytes(input))
             .sender(address(fromAddress))
-            .v(bigInteger(v))
             .build();
 
     return new TransactionCompleteResult(
@@ -224,10 +223,6 @@ private String removeHexPrefix(final String prefixedHex) {
     return prefixedHex.startsWith("0x") ? prefixedHex.substring(2) : prefixedHex;
   }
 
-  private BigInteger bigInteger(final String hex) {
-    return hex == null ? null : new BigInteger(removeHexPrefix(hex), HEX_RADIX);
-  }
-
   private Wei wei(final String hex) {
     return Wei.fromHexString(hex);
   }

ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/RpcMethod.java

@@ -51,15 +51,19 @@ public enum RpcMethod {
   DEBUG_GET_RAW_RECEIPTS("debug_getRawReceipts"),
   ENGINE_GET_PAYLOAD_V1("engine_getPayloadV1"),
   ENGINE_GET_PAYLOAD_V2("engine_getPayloadV2"),
+  ENGINE_GET_PAYLOAD_V3("engine_getPayloadV3"),
+  ENGINE_EXECUTE_PAYLOAD("engine_executePayloadV1"),
   ENGINE_NEW_PAYLOAD_V1("engine_newPayloadV1"),
   ENGINE_NEW_PAYLOAD_V2("engine_newPayloadV2"),
+  ENGINE_NEW_PAYLOAD_V3("engine_newPayloadV3"),
   ENGINE_FORKCHOICE_UPDATED_V1("engine_forkchoiceUpdatedV1"),
   ENGINE_FORKCHOICE_UPDATED_V2("engine_forkchoiceUpdatedV2"),
   ENGINE_EXCHANGE_TRANSITION_CONFIGURATION("engine_exchangeTransitionConfigurationV1"),
   ENGINE_GET_PAYLOAD_BODIES_BY_HASH_V1("engine_getPayloadBodiesByHashV1"),
   ENGINE_GET_PAYLOAD_BODIES_BY_RANGE_V1("engine_getPayloadBodiesByRangeV1"),
   ENGINE_EXCHANGE_CAPABILITIES("engine_exchangeCapabilities"),
   ENGINE_PREPARE_PAYLOAD_DEBUG("engine_preparePayload_debug"),
+  ENGINE_GET_BLOBS_BUNDLE_V1("engine_getBlobsBundleV1"),
   PRIV_CALL("priv_call"),
   PRIV_GET_PRIVATE_TRANSACTION("priv_getPrivateTransaction"),
   PRIV_GET_TRANSACTION_COUNT("priv_getTransactionCount"),

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

@@ -26,6 +26,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.core.BlockHeader;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.Optional;
 
@@ -39,15 +40,19 @@ public abstract class AbstractEngineGetPayload extends ExecutionEngineJsonRpcMet
   protected final BlockResultFactory blockResultFactory;
   private static final Logger LOG = LoggerFactory.getLogger(AbstractEngineGetPayload.class);
 
+  protected final Optional<ProtocolSchedule> schedule;
+
   public AbstractEngineGetPayload(
       final Vertx vertx,
       final ProtocolContext protocolContext,
       final MergeMiningCoordinator mergeMiningCoordinator,
       final BlockResultFactory blockResultFactory,
-      final EngineCallListener engineCallListener) {
+      final EngineCallListener engineCallListener,
+      final ProtocolSchedule schedule) {
     super(vertx, protocolContext, engineCallListener);
     this.mergeMiningCoordinator = mergeMiningCoordinator;
     this.blockResultFactory = blockResultFactory;
+    this.schedule = Optional.ofNullable(schedule);
   }
 
   @Override

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

@@ -24,6 +24,7 @@
 import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError.INVALID_PARAMS;
 
 import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.datatypes.DataGas;
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.datatypes.Wei;
 import org.hyperledger.besu.ethereum.BlockProcessingResult;
@@ -160,7 +161,9 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
             blockParam.getPrevRandao(),
             0,
             maybeWithdrawals.map(BodyValidation::withdrawalsRoot).orElse(null),
-            null,
+            blockParam.getExcessDataGas() == null
+                ? null
+                : DataGas.fromHexString(blockParam.getExcessDataGas()),
             null,
             headerFunctions);
 
@@ -190,6 +193,41 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
           "Block already present in bad block manager.");
     }
 
+    final List<Hash> transactionVersionedHashes = new ArrayList<>();
+    // get versioned hashes, in order, from all blob tx
+    transactions.stream()
+        .filter(tx -> tx.getBlobCount() > 0)
+        .map(tx -> transactionVersionedHashes.addAll(tx.getVersionedHashes().get()));
+    // and compare with expected versioned hashes param
+    final Optional<List<Hash>> maybeVersionedHashes =
+        Optional.ofNullable(blockParam.getVersionedHashes());
+    // check if one is empty
+    if (maybeVersionedHashes.isPresent() && transactionVersionedHashes.isEmpty()) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          null,
+          INVALID,
+          "Versioned hashes from blob transactions (empty) do not match expected values");
+    }
+    if (maybeVersionedHashes.isEmpty() && !transactionVersionedHashes.isEmpty()) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          null,
+          INVALID,
+          "Versioned hashes from blob transactions do not match expected values (empty)");
+    }
+    // otherwise, check list contents
+    if (!maybeVersionedHashes.get().equals(transactionVersionedHashes)) {
+      return respondWithInvalid(
+          reqId,
+          blockParam,
+          null,
+          INVALID,
+          "Versioned hashes from blob transactions do not match expected values (empty)");
+    }
+
     final Optional<BlockHeader> maybeParentHeader =
         protocolContext.getBlockchain().getBlockHeader(blockParam.getParentHash());
     if (maybeParentHeader.isPresent()

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright Hyperledger Besu Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.engine;
+
+import org.hyperledger.besu.consensus.merge.blockcreation.MergeMiningCoordinator;
+import org.hyperledger.besu.consensus.merge.blockcreation.PayloadIdentifier;
+import org.hyperledger.besu.ethereum.ProtocolContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlobsBundleV1;
+import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
+import org.hyperledger.besu.ethereum.core.Block;
+import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.core.Transaction;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
+
+import java.util.List;
+
+import io.vertx.core.Vertx;
+
+public class EngineGetBlobsBundleV1 extends AbstractEngineGetPayload {
+
+  public EngineGetBlobsBundleV1(
+      final Vertx vertx,
+      final ProtocolContext protocolContext,
+      final MergeMiningCoordinator mergeMiningCoordinator,
+      final BlockResultFactory blockResultFactory,
+      final EngineCallListener engineCallListener,
+      final ProtocolSchedule schedule) {
+    super(
+        vertx,
+        protocolContext,
+        mergeMiningCoordinator,
+        blockResultFactory,
+        engineCallListener,
+        schedule);
+  }
+
+  @Override
+  protected JsonRpcResponse createResponse(
+      final JsonRpcRequestContext request,
+      final PayloadIdentifier payloadId,
+      final BlockWithReceipts blockWithReceipts) {
+
+    return new JsonRpcSuccessResponse(
+        request.getRequest().getId(), createResponse(blockWithReceipts.getBlock()));
+  }
+
+  private BlobsBundleV1 createResponse(final Block block) {
+
+    final List<Transaction> transactions = block.getBody().getTransactions();
+
+    return new BlobsBundleV1(transactions);
+  }
+
+  @Override
+  public String getName() {
+    return RpcMethod.ENGINE_GET_BLOBS_BUNDLE_V1.getMethodName();
+  }
+}

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

@@ -23,6 +23,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.Optional;
 
@@ -35,8 +36,15 @@ public EngineGetPayloadV1(
       final ProtocolContext protocolContext,
       final MergeMiningCoordinator mergeMiningCoordinator,
       final BlockResultFactory blockResultFactory,
-      final EngineCallListener engineCallListener) {
-    super(vertx, protocolContext, mergeMiningCoordinator, blockResultFactory, engineCallListener);
+      final EngineCallListener engineCallListener,
+      final ProtocolSchedule schedule) {
+    super(
+        vertx,
+        protocolContext,
+        mergeMiningCoordinator,
+        blockResultFactory,
+        engineCallListener,
+        schedule);
   }
 
   @Override

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

@@ -24,6 +24,7 @@
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcSuccessResponse;
 import org.hyperledger.besu.ethereum.api.jsonrpc.internal.results.BlockResultFactory;
 import org.hyperledger.besu.ethereum.core.BlockWithReceipts;
+import org.hyperledger.besu.ethereum.mainnet.ProtocolSchedule;
 
 import java.util.Optional;
 
@@ -36,8 +37,15 @@ public EngineGetPayloadV2(
       final ProtocolContext protocolContext,
       final MergeMiningCoordinator mergeMiningCoordinator,
       final BlockResultFactory blockResultFactory,
-      final EngineCallListener engineCallListener) {
-    super(vertx, protocolContext, mergeMiningCoordinator, blockResultFactory, engineCallListener);
+      final EngineCallListener engineCallListener,
+      final ProtocolSchedule schedule) {
+    super(
+        vertx,
+        protocolContext,
+        mergeMiningCoordinator,
+        blockResultFactory,
+        engineCallListener,
+        schedule);
   }
 
   @Override