EIP-7742 Fix AT and update TODOs

Signed-off-by: Simon Dudley <[email protected]>

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ethereum/CodeDelegationTransactionAcceptanceTest.java

@@ -58,7 +58,7 @@ public class CodeDelegationTransactionAcceptanceTest extends AcceptanceTestBase
   public static final Bytes TRANSACTION_SPONSOR_PRIVATE_KEY =
       Bytes.fromHexString("3a4ff6d22d7502ef2452368165422861c01a0f72f851793b372b87888dc3c453");
 
-  private final Account otherAccount = accounts.createAccount("otherAccount");
+  private final Account otherAccount = accounts.getPrimaryBenefactor();
 
   private BesuNode besuNode;
   private PragueAcceptanceTestHelper testHelper;
@@ -85,7 +85,6 @@ void tearDown() {
    */
   @Test
   public void shouldTransferAllEthOfAuthorizerToSponsor() throws IOException {
-
     // 7702 transaction
     final CodeDelegation authorization =
         org.hyperledger.besu.ethereum.core.CodeDelegation.builder()

acceptance-tests/tests/src/test/java/org/hyperledger/besu/tests/acceptance/ethereum/PragueAcceptanceTestHelper.java

@@ -20,6 +20,7 @@
 import org.hyperledger.besu.tests.acceptance.dsl.transaction.eth.EthTransactions;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Optional;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -92,11 +93,21 @@ public void buildNewBlock() throws IOException {
       assertThat(newBlockHash).isNotEmpty();
     }
 
+    final String targetBlobsPerBlock = "0x3";
     final Call newPayloadRequest =
         createEngineCall(
             createNewPayloadRequest(
-                executionPayload.toString(), parentBeaconBlockRoot, executionRequests.toString()));
+                executionPayload.toString(),
+                parentBeaconBlockRoot,
+                executionRequests.toString(),
+                targetBlobsPerBlock));
     try (final Response newPayloadResponse = newPayloadRequest.execute()) {
+      final InputStream responseStr = newPayloadResponse.body().byteStream();
+      JsonNode jsonNode = mapper.readTree(responseStr);
+      if (jsonNode.has("error")) {
+        throw new AssertionError(
+            "Unexpected engine_newPayload error: " + jsonNode.get("error").get("message").asText());
+      }
       assertThat(newPayloadResponse.code()).isEqualTo(200);
     }
 
@@ -148,7 +159,9 @@ private String createForkChoiceRequest(final String parentBlockHash, final Long
               + "      \"prevRandao\": \"0x0000000000000000000000000000000000000000000000000000000000000000\","
               + "      \"suggestedFeeRecipient\": \"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b\","
               + "      \"withdrawals\": [],"
-              + "      \"parentBeaconBlockRoot\": \"0x0000000000000000000000000000000000000000000000000000000000000000\""
+              + "      \"parentBeaconBlockRoot\": \"0x0000000000000000000000000000000000000000000000000000000000000000\","
+              + "      \"targetBlobsPerBlock\": \"0x3\","
+              + "      \"maximumBlobCount\": \"0x6\""
               + "    }";
     }
 
@@ -171,7 +184,8 @@ private String createGetPayloadRequest(final String payloadId) {
   private String createNewPayloadRequest(
       final String executionPayload,
       final String parentBeaconBlockRoot,
-      final String executionRequests) {
+      final String executionRequests,
+      final String targetBlobsPerBlock) {
     return "{"
         + "  \"jsonrpc\": \"2.0\","
         + "  \"method\": \"engine_newPayloadV4\","
@@ -183,7 +197,11 @@ private String createNewPayloadRequest(
         + "\""
         + ","
         + executionRequests
-        + "],"
+        + ","
+        + "\""
+        + targetBlobsPerBlock
+        + "\""
+        + "]," // end params
         + "  \"id\": 67"
         + "}";
   }

acceptance-tests/tests/src/test/resources/dev/dev_prague.json

@@ -110,5 +110,6 @@
   "number":"0x0",
   "gasUsed":"0x0",
   "parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
-  "baseFeePerGas":"0x7"
+  "baseFeePerGas":"0x7",
+  "targetBlobsPerBlock":"0x1"
 }

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

@@ -81,7 +81,7 @@ public BlockCreationResult createBlock(
       final long timestamp,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount,
+      final Optional<UInt64> targetBlobsPerBlock,
       final BlockHeader parentHeader) {
 
     return createBlock(
@@ -90,7 +90,7 @@ public BlockCreationResult createBlock(
         withdrawals,
         Optional.of(random),
         parentBeaconBlockRoot,
-        targetBlobCount,
+        targetBlobsPerBlock,
         timestamp,
         false,
         parentHeader);

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

@@ -259,7 +259,7 @@ public PayloadIdentifier preparePayload(
       final Address feeRecipient,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount) {
+      final Optional<UInt64> targetBlobsPerBlock) {
 
     // we assume that preparePayload is always called sequentially, since the RPC Engine calls
     // are sequential, if this assumption changes then more synchronization should be added to
@@ -273,7 +273,7 @@ public PayloadIdentifier preparePayload(
             feeRecipient,
             withdrawals,
             parentBeaconBlockRoot,
-            targetBlobCount);
+            targetBlobsPerBlock);
 
     if (blockCreationTasks.containsKey(payloadIdentifier)) {
       LOG.debug(
@@ -298,7 +298,7 @@ public PayloadIdentifier preparePayload(
                 timestamp,
                 withdrawals,
                 parentBeaconBlockRoot,
-                targetBlobCount,
+                targetBlobsPerBlock,
                 parentHeader)
             .getBlock();
 
@@ -330,7 +330,7 @@ public PayloadIdentifier preparePayload(
         mergeBlockCreator,
         withdrawals,
         parentBeaconBlockRoot,
-        targetBlobCount,
+        targetBlobsPerBlock,
         parentHeader);
 
     return payloadIdentifier;
@@ -373,7 +373,7 @@ private void tryToBuildBetterBlock(
       final MergeBlockCreator mergeBlockCreator,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount,
+      final Optional<UInt64> targetBlobsPerBlock,
       final BlockHeader parentHeader) {
 
     final Supplier<BlockCreationResult> blockCreator =
@@ -384,7 +384,7 @@ private void tryToBuildBetterBlock(
                 timestamp,
                 withdrawals,
                 parentBeaconBlockRoot,
-                targetBlobCount,
+                targetBlobsPerBlock,
                 parentHeader);
 
     LOG.debug(

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

@@ -44,7 +44,7 @@ public interface MergeMiningCoordinator extends MiningCoordinator {
    * @param feeRecipient the fee recipient
    * @param withdrawals the optional list of withdrawals
    * @param parentBeaconBlockRoot optional root hash of the parent beacon block
-   * @param targetBlobCount optional target blob count
+   * @param targetBlobsPerBlock optional target blobs per block
    * @return the payload identifier
    */
   PayloadIdentifier preparePayload(
@@ -54,7 +54,7 @@ PayloadIdentifier preparePayload(
       final Address feeRecipient,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount);
+      final Optional<UInt64> targetBlobsPerBlock);
 
   @Override
   default boolean isCompatibleWithEngineApi() {

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

@@ -63,7 +63,7 @@ public PayloadIdentifier(final Long payloadId) {
    * @param feeRecipient the fee recipient
    * @param withdrawals the withdrawals
    * @param parentBeaconBlockRoot the parent beacon block root
-   * @param targetBlobCount the target blob count
+   * @param targetBlobsPerBlock the target blobs per block
    * @return the payload identifier
    */
   public static PayloadIdentifier forPayloadParams(
@@ -73,7 +73,7 @@ public static PayloadIdentifier forPayloadParams(
       final Address feeRecipient,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount) {
+      final Optional<UInt64> targetBlobsPerBlock) {
 
     return new PayloadIdentifier(
         timestamp
@@ -91,7 +91,7 @@ public static PayloadIdentifier forPayloadParams(
                         .orElse(0)
                 << 32
             ^ ((long) parentBeaconBlockRoot.hashCode()) << 40
-            ^ ((long) targetBlobCount.hashCode()) << 48);
+            ^ ((long) targetBlobsPerBlock.hashCode()) << 48);
   }
 
   @Override

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

@@ -149,15 +149,15 @@ public PayloadIdentifier preparePayload(
       final Address feeRecipient,
       final Optional<List<Withdrawal>> withdrawals,
       final Optional<Bytes32> parentBeaconBlockRoot,
-      final Optional<UInt64> targetBlobCount) {
+      final Optional<UInt64> targetBlobsPerBlock) {
     return mergeCoordinator.preparePayload(
         parentHeader,
         timestamp,
         prevRandao,
         feeRecipient,
         withdrawals,
         parentBeaconBlockRoot,
-        targetBlobCount);
+        targetBlobsPerBlock);
   }
 
   @Override

consensus/merge/src/test/java/org/hyperledger/besu/consensus/merge/blockcreation/PayloadIdentifierTest.java

@@ -228,7 +228,7 @@ public void differentParentBeaconBlockRootYieldDifferentHash() {
   }
 
   @Test
-  public void emptyOptionalAndNonEmptyTargetBlobCountYieldDifferentHash() {
+  public void emptyOptionalAndNonEmptyTargetBlobsPerBlockYieldDifferentHash() {
     final Bytes32 prevRandao = Bytes32.random();
     var idForTbc1 =
         PayloadIdentifier.forPayloadParams(
@@ -252,7 +252,7 @@ public void emptyOptionalAndNonEmptyTargetBlobCountYieldDifferentHash() {
   }
 
   @Test
-  public void differentTargetBlobCountYieldDifferentHash() {
+  public void differentTargetBlobsPerBlockYieldDifferentHash() {
     final Bytes32 prevRandao = Bytes32.random();
     var idForTbc1 =
         PayloadIdentifier.forPayloadParams(

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

@@ -225,7 +225,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
                     payloadAttributes.getSuggestedFeeRecipient(),
                     finalWithdrawals,
                     Optional.ofNullable(payloadAttributes.getParentBeaconBlockRoot()),
-                    Optional.ofNullable(payloadAttributes.getTargetBlobCount())));
+                    Optional.ofNullable(payloadAttributes.getTargetBlobsPerBlock())));
 
     payloadId.ifPresent(
         pid ->
@@ -319,9 +319,9 @@ private void logPayload(final EnginePayloadAttributesParameter payloadAttributes
               .setMessage(message)
               .addArgument(() -> payloadAttributes.getParentBeaconBlockRoot().toHexString());
     }
-    if (payloadAttributes.getTargetBlobCount() != null) {
-      message += ", targetBlobCount: {}";
-      builder = builder.setMessage(message).addArgument(payloadAttributes::getTargetBlobCount);
+    if (payloadAttributes.getTargetBlobsPerBlock() != null) {
+      message += ", targetBlobsPerBlock: {}";
+      builder = builder.setMessage(message).addArgument(payloadAttributes::getTargetBlobsPerBlock);
     }
     builder.log();
   }

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

@@ -148,12 +148,12 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
           e);
     }
 
-    final Optional<String> maybeTargetBlobCountParam;
+    final Optional<String> maybeTargetBlobsPerBlockParam;
     try {
-      maybeTargetBlobCountParam = requestContext.getOptionalParameter(4, String.class);
+      maybeTargetBlobsPerBlockParam = requestContext.getOptionalParameter(4, String.class);
     } catch (JsonRpcParameterException e) {
       throw new InvalidJsonRpcRequestException(
-          "Invalid target blob count parameter (index 4)",
+          "Invalid target blobs per block parameter (index 4)",
           RpcErrorType.INVALID_TARGET_BLOB_COUNT_PARAM,
           e);
     }
@@ -164,7 +164,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
             maybeVersionedHashParam,
             maybeParentBeaconBlockRootParam,
             maybeRequestsParam,
-            maybeTargetBlobCountParam);
+            maybeTargetBlobsPerBlockParam);
     if (!parameterValidationResult.isValid()) {
       return new JsonRpcErrorResponse(reqId, parameterValidationResult);
     }
@@ -223,16 +223,16 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
       return new JsonRpcErrorResponse(reqId, RpcErrorType.INVALID_EXECUTION_REQUESTS_PARAMS);
     }
 
-    final Optional<UInt64> maybeTargetBlobCount;
+    final Optional<UInt64> maybeTargetBlobsPerBlock;
     try {
-      maybeTargetBlobCount = maybeTargetBlobCountParam.map(UInt64::fromHexString);
+      maybeTargetBlobsPerBlock = maybeTargetBlobsPerBlockParam.map(UInt64::fromHexString);
     } catch (RuntimeException ex) {
       return respondWithInvalid(
           reqId,
           blockParam,
           mergeCoordinator.getLatestValidAncestor(blockParam.getParentHash()).orElse(null),
           INVALID,
-          "Invalid targetBlobCount");
+          "Invalid targetBlobsPerBlock");
     }
 
     if (mergeContext.get().isSyncing()) {
@@ -303,7 +303,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext)
                 : BlobGas.fromHexString(blockParam.getExcessBlobGas()),
             maybeParentBeaconBlockRoot.orElse(null),
             maybeRequests.map(BodyValidation::requestsHash).orElse(null),
-            maybeTargetBlobCount.orElse(null),
+            maybeTargetBlobsPerBlock.orElse(null),
             headerFunctions);
 
     // ensure the block hash matches the blockParam hash
@@ -482,7 +482,7 @@ protected ValidationResult<RpcErrorType> validateParameters(
       final Optional<List<String>> maybeVersionedHashParam,
       final Optional<String> maybeBeaconBlockRootParam,
       final Optional<List<String>> maybeRequestsParam,
-      final Optional<String> maybeTargetBlobCountParam) {
+      final Optional<String> maybeTargetBlobsPerBlockParam) {
     return ValidationResult.valid();
   }
 

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

@@ -71,9 +71,9 @@ protected ValidationResult<RpcErrorType> validateParameter(
         return ValidationResult.invalid(
             getInvalidPayloadAttributesError(), "Missing parent beacon block root hash");
       }
-      if (maybePayloadAttributes.get().getTargetBlobCount() == null) {
+      if (maybePayloadAttributes.get().getTargetBlobsPerBlock() == null) {
         return ValidationResult.invalid(
-            getInvalidPayloadAttributesError(), "Missing target blob count");
+            getInvalidPayloadAttributesError(), "Missing target blobs per block");
       }
       if (maybePayloadAttributes.get().getMaximumBlobCount() == null) {
         return ValidationResult.invalid(
@@ -96,8 +96,8 @@ protected Optional<JsonRpcErrorResponse> isPayloadAttributesValid(
           "Parent beacon block root hash not present in payload attributes after cancun hardfork");
       return Optional.of(new JsonRpcErrorResponse(requestId, getInvalidPayloadAttributesError()));
     }
-    if (payloadAttributes.getTargetBlobCount() == null) {
-      LOG.error("targetBlobCount not present in payload attributes after prague hardfork");
+    if (payloadAttributes.getTargetBlobsPerBlock() == null) {
+      LOG.error("targetBlobsPerBlock not present in payload attributes after prague hardfork");
       return Optional.of(new JsonRpcErrorResponse(requestId, getInvalidPayloadAttributesError()));
     }
     if (payloadAttributes.getMaximumBlobCount() == null) {

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

@@ -59,7 +59,7 @@ protected ValidationResult<RpcErrorType> validateParameters(
       final Optional<List<String>> maybeVersionedHashParam,
       final Optional<String> maybeBeaconBlockRootParam,
       final Optional<List<String>> maybeRequestsParam,
-      final Optional<String> maybeTargetBlobCountParam) {
+      final Optional<String> maybeTargetBlobsPerBlockParam) {
     if (payloadParameter.getBlobGasUsed() != null) {
       return ValidationResult.invalid(
           RpcErrorType.INVALID_BLOB_GAS_USED_PARAMS, "Unexpected blob gas used field present");

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

@@ -57,7 +57,7 @@ protected ValidationResult<RpcErrorType> validateParameters(
       final Optional<List<String>> maybeVersionedHashParam,
       final Optional<String> maybeBeaconBlockRootParam,
       final Optional<List<String>> maybeRequestsParam,
-      final Optional<String> maybeTargetBlobCountParam) {
+      final Optional<String> maybeTargetBlobsPerBlockParam) {
     if (payloadParameter.getBlobGasUsed() == null) {
       return ValidationResult.invalid(
           RpcErrorType.INVALID_BLOB_GAS_USED_PARAMS, "Missing blob gas used field");

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

@@ -57,7 +57,7 @@ protected ValidationResult<RpcErrorType> validateParameters(
       final Optional<List<String>> maybeVersionedHashParam,
       final Optional<String> maybeBeaconBlockRootParam,
       final Optional<List<String>> maybeRequestsParam,
-      final Optional<String> maybeTargetBlobCountParam) {
+      final Optional<String> maybeTargetBlobsPerBlockParam) {
     if (payloadParameter.getBlobGasUsed() == null) {
       return ValidationResult.invalid(
           RpcErrorType.INVALID_BLOB_GAS_USED_PARAMS, "Missing blob gas used field");
@@ -74,9 +74,9 @@ protected ValidationResult<RpcErrorType> validateParameters(
     } else if (maybeRequestsParam.isEmpty()) {
       return ValidationResult.invalid(
           RpcErrorType.INVALID_EXECUTION_REQUESTS_PARAMS, "Missing execution requests field");
-    } else if (maybeTargetBlobCountParam.isEmpty()) {
+    } else if (maybeTargetBlobsPerBlockParam.isEmpty()) {
       return ValidationResult.invalid(
-          RpcErrorType.INVALID_TARGET_BLOB_COUNT_PARAM, "Missing targetBlobCount field");
+          RpcErrorType.INVALID_TARGET_BLOB_COUNT_PARAM, "Missing targetBlobsPerBlock field");
     } else {
       return ValidationResult.valid();
     }