Electra devnet 5 (#8817)

use forkChoiceUpdatedV4 with PayloadAttributesV4 

Co-authored-by: Mehdi AOUADI <[email protected]>
Co-authored-by: Enrico Del Fante <[email protected]>

Author: 3 people

ethereum/executionlayer/src/main/java/tech/pegasys/teku/ethereum/executionlayer/MilestoneBasedEngineJsonRpcMethodsResolver.java

@@ -31,6 +31,7 @@
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV2;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV3;
+import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV4;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetBlobsV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetPayloadV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetPayloadV2;
@@ -119,9 +120,7 @@ private Map<EngineApiMethod, EngineJsonRpcMethod<?>> electraSupportedMethods() {
 
     methods.put(ENGINE_NEW_PAYLOAD, new EngineNewPayloadV4(executionEngineClient));
     methods.put(ENGINE_GET_PAYLOAD, new EngineGetPayloadV4(executionEngineClient, spec));
-    // TODO EIP-7742 Replace with EngineForkChoiceUpdatedV4
-    // (https://github.com/Consensys/teku/issues/8745)
-    methods.put(ENGINE_FORK_CHOICE_UPDATED, new EngineForkChoiceUpdatedV3(executionEngineClient));
+    methods.put(ENGINE_FORK_CHOICE_UPDATED, new EngineForkChoiceUpdatedV4(executionEngineClient));
     methods.put(ENGINE_GET_BLOBS, new EngineGetBlobsV1(executionEngineClient, spec));
 
     return methods;

ethereum/executionlayer/src/test/java/tech/pegasys/teku/ethereum/executionlayer/ElectraExecutionClientHandlerTest.java

@@ -31,7 +31,7 @@
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceStateV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceUpdatedResult;
 import tech.pegasys.teku.ethereum.executionclient.schema.GetPayloadV4Response;
-import tech.pegasys.teku.ethereum.executionclient.schema.PayloadAttributesV3;
+import tech.pegasys.teku.ethereum.executionclient.schema.PayloadAttributesV4;
 import tech.pegasys.teku.ethereum.executionclient.schema.PayloadStatusV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.Response;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
@@ -128,7 +128,6 @@ void engineNewPayload_shouldCallNewPayloadV4() {
 
   @Test
   void engineForkChoiceUpdated_shouldCallEngineForkChoiceUpdatedV3() {
-    // TODO EIP-7742 should call FcUV4 (https://github.com/Consensys/teku/issues/8745)
     final ExecutionClientHandler handler = getHandler();
     final ForkChoiceState forkChoiceState = dataStructureUtil.randomForkChoiceState(false);
     final ForkChoiceStateV1 forkChoiceStateV1 =
@@ -142,21 +141,23 @@ void engineForkChoiceUpdated_shouldCallEngineForkChoiceUpdatedV3() {
             dataStructureUtil.randomEth1Address(),
             Optional.empty(),
             Optional.of(List.of()),
-            dataStructureUtil.randomBytes32());
-    final Optional<PayloadAttributesV3> payloadAttributes =
-        PayloadAttributesV3.fromInternalPayloadBuildingAttributesV3(Optional.of(attributes));
+            dataStructureUtil.randomBytes32(),
+            spec.getMaxBlobsPerBlock().map(max -> UInt64.valueOf(max / 2)),
+            spec.getMaxBlobsPerBlock().map(UInt64::valueOf));
+    final Optional<PayloadAttributesV4> payloadAttributes =
+        PayloadAttributesV4.fromInternalPayloadBuildingAttributesV4(Optional.of(attributes));
     final ForkChoiceUpdatedResult responseData =
         new ForkChoiceUpdatedResult(
             new PayloadStatusV1(
                 ExecutionPayloadStatus.ACCEPTED, dataStructureUtil.randomBytes32(), ""),
             dataStructureUtil.randomBytes8());
     final SafeFuture<Response<ForkChoiceUpdatedResult>> dummyResponse =
         SafeFuture.completedFuture(new Response<>(responseData));
-    when(executionEngineClient.forkChoiceUpdatedV3(forkChoiceStateV1, payloadAttributes))
+    when(executionEngineClient.forkChoiceUpdatedV4(forkChoiceStateV1, payloadAttributes))
         .thenReturn(dummyResponse);
     final SafeFuture<tech.pegasys.teku.spec.executionlayer.ForkChoiceUpdatedResult> future =
         handler.engineForkChoiceUpdated(forkChoiceState, Optional.of(attributes));
-    verify(executionEngineClient).forkChoiceUpdatedV3(forkChoiceStateV1, payloadAttributes);
+    verify(executionEngineClient).forkChoiceUpdatedV4(forkChoiceStateV1, payloadAttributes);
     assertThat(future).isCompletedWithValue(responseData.asInternalExecutionPayload());
   }
 

ethereum/executionlayer/src/test/java/tech/pegasys/teku/ethereum/executionlayer/MilestoneBasedEngineJsonRpcMethodsResolverTest.java

@@ -34,6 +34,7 @@
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV2;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV3;
+import tech.pegasys.teku.ethereum.executionclient.methods.EngineForkChoiceUpdatedV4;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetBlobsV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetPayloadV1;
 import tech.pegasys.teku.ethereum.executionclient.methods.EngineGetPayloadV2;
@@ -200,7 +201,7 @@ private static Stream<Arguments> electraMethods() {
     return Stream.of(
         arguments(ENGINE_NEW_PAYLOAD, EngineNewPayloadV4.class),
         arguments(ENGINE_GET_PAYLOAD, EngineGetPayloadV4.class),
-        arguments(ENGINE_FORK_CHOICE_UPDATED, EngineForkChoiceUpdatedV3.class),
+        arguments(ENGINE_FORK_CHOICE_UPDATED, EngineForkChoiceUpdatedV4.class),
         arguments(ENGINE_GET_BLOBS, EngineGetBlobsV1.class));
   }
 
@@ -227,7 +228,8 @@ void getsCapabilities() {
             "engine_getPayloadV3",
             "engine_forkchoiceUpdatedV3",
             "engine_newPayloadV4",
-            "engine_getPayloadV4");
+            "engine_getPayloadV4",
+            "engine_forkchoiceUpdatedV4");
   }
 
   @Test

ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/forkchoice/ProposersDataManager.java

@@ -237,9 +237,8 @@ private Optional<PayloadBuildingAttributes> calculatePayloadBuildingAttributes(
             .map(RegisteredValidatorInfo::getSignedValidatorRegistration);
 
     final Eth1Address feeRecipient = getFeeRecipient(proposerInfo, blockSlot);
+    final Optional<UInt64> maxBlobsPerBlock = spec.getMaxBlobsPerBlock().map(UInt64::valueOf);
 
-    // TODO EIP-7742 add targetBlobCount and maximumBlobCount
-    // (https://github.com/Consensys/teku/issues/8745)
     return Optional.of(
         new PayloadBuildingAttributes(
             proposerIndex,
@@ -250,8 +249,8 @@ private Optional<PayloadBuildingAttributes> calculatePayloadBuildingAttributes(
             validatorRegistration,
             spec.getExpectedWithdrawals(state),
             currentHeadBlockRoot,
-            Optional.empty(),
-            Optional.empty()));
+            maxBlobsPerBlock.map(maxBlobs -> maxBlobs.dividedBy(2)),
+            maxBlobsPerBlock));
   }
 
   // this function MUST return a fee recipient.

ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/forkchoice/ForkChoiceNotifierTest.java

@@ -1095,6 +1095,7 @@ private PayloadBuildingAttributes getExpectedPayloadBuildingAttributes(
         overrideFeeRecipient.orElse(dataStructureUtil.randomEth1Address());
     final UInt64 timestamp = spec.computeTimeAtSlot(headState, blockSlot);
     final Bytes32 random = spec.getRandaoMix(headState, UInt64.ZERO);
+    final Optional<UInt64> maxBlobsPerBlock = spec.getMaxBlobsPerBlock().map(UInt64::valueOf);
     return new PayloadBuildingAttributes(
         proposerIndex,
         blockSlot,
@@ -1103,7 +1104,9 @@ private PayloadBuildingAttributes getExpectedPayloadBuildingAttributes(
         feeRecipient,
         validatorRegistration,
         dataStructureUtil.randomWithdrawalList(),
-        forkChoiceState.getHeadBlockRoot());
+        forkChoiceState.getHeadBlockRoot(),
+        maxBlobsPerBlock.map(maxBlobs -> maxBlobs.dividedBy(2)),
+        maxBlobsPerBlock);
   }
 
   private ForkChoiceState getCurrentForkChoiceState() {