Moving requests out of ExecutionPayload

acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/ElectraUpgradeAcceptanceTest.java

@@ -16,6 +16,7 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.ethereum.execution.types.Eth1Address;
 import tech.pegasys.teku.infrastructure.time.SystemTimeProvider;
@@ -30,6 +31,7 @@
 import tech.pegasys.teku.test.acceptance.dsl.TekuNodeConfigBuilder;
 import tech.pegasys.teku.test.acceptance.dsl.tools.deposits.ValidatorKeystores;
 
+@Disabled("Won't work until we update Engine API for Electra + EL changes")
 public class ElectraUpgradeAcceptanceTest extends AcceptanceTestBase {
 
   private static final String NETWORK_NAME = "swift";

acceptance-tests/src/acceptance-test/java/tech/pegasys/teku/test/acceptance/ExecutionLayerTriggeredExitAcceptanceTest.java

@@ -16,6 +16,7 @@
 import com.google.common.io.Resources;
 import java.net.URL;
 import java.util.Map;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.bls.BLSPublicKey;
 import tech.pegasys.teku.ethereum.execution.types.Eth1Address;
@@ -37,6 +38,7 @@ public class ExecutionLayerTriggeredExitAcceptanceTest extends AcceptanceTestBas
   private static final URL JWT_FILE = Resources.getResource("auth/ee-jwt-secret.hex");
 
   @Test
+  @Disabled("Won't work until we update Engine API for Electra")
   void triggerValidatorExitWithFullWithdrawal() throws Exception {
     final UInt64 currentTime = new SystemTimeProvider().getTimeInSeconds();
     final int genesisTime =

beacon/validator/src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java

@@ -49,6 +49,7 @@
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadContext;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeader;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadResult;
+import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsBuilderElectra;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
@@ -63,6 +64,7 @@
 import tech.pegasys.teku.spec.schemas.SchemaDefinitions;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsDeneb;
+import tech.pegasys.teku.spec.schemas.SchemaDefinitionsElectra;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
 import tech.pegasys.teku.statetransition.attestation.AttestationForkChecker;
@@ -238,6 +240,15 @@ private SafeFuture<Void> setExecutionData(
             requestedBuilderBoostFactor,
             blockProductionPerformance);
 
+    // TODO Update as part of Electra Engine API updates
+    // (https://github.com/Consensys/teku/issues/8620)
+    if (bodyBuilder.supportsExecutionRequests()) {
+      bodyBuilder.executionRequests(
+          new ExecutionRequestsBuilderElectra(
+                  SchemaDefinitionsElectra.required(schemaDefinitions).getExecutionRequestsSchema())
+              .build());
+    }
+
     return SafeFuture.allOf(
         cacheExecutionPayloadValue(executionPayloadResult, blockSlotState),
         setPayloadOrPayloadHeader(bodyBuilder, executionPayloadResult),

beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java

@@ -68,6 +68,7 @@
 import tech.pegasys.teku.spec.datastructures.execution.FallbackData;
 import tech.pegasys.teku.spec.datastructures.execution.FallbackReason;
 import tech.pegasys.teku.spec.datastructures.execution.GetPayloadResponse;
+import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequests;
 import tech.pegasys.teku.spec.datastructures.operations.Attestation;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.Deposit;
@@ -1165,6 +1166,11 @@ private static class CapturingBeaconBlockBodyBuilder implements BeaconBlockBodyB
     protected ExecutionPayloadHeader executionPayloadHeader;
     protected SszList<SszKZGCommitment> blobKzgCommitments;
 
+    // TODO Update as part of Electra Engine API updates
+    // (https://github.com/Consensys/teku/issues/8620)
+    @SuppressWarnings("unused")
+    protected ExecutionRequests executionRequests;
+
     public CapturingBeaconBlockBodyBuilder(final boolean supportsKzgCommitments) {
       this.supportsKzgCommitments = supportsKzgCommitments;
     }
@@ -1243,6 +1249,12 @@ public BeaconBlockBodyBuilder blsToExecutionChanges(
       return this;
     }
 
+    @Override
+    public BeaconBlockBodyBuilder executionRequests(final ExecutionRequests executionRequests) {
+      this.executionRequests = executionRequests;
+      return this;
+    }
+
     @Override
     public Boolean supportsSyncAggregate() {
       return true;

build.gradle

@@ -318,7 +318,7 @@ allprojects {
   }
 }
 
-def refTestVersion = 'v1.5.0-alpha.5'
+def refTestVersion = 'v1.5.0-alpha.6'
 def blsRefTestVersion = 'v0.1.2'
 def slashingProtectionInterchangeRefTestVersion = 'v5.3.0'
 def refTestBaseUrl = 'https://github.com/ethereum/consensus-spec-tests/releases/download'

data/serializer/src/main/java/tech/pegasys/teku/api/schema/ExecutionPayload.java

@@ -17,7 +17,6 @@
 import tech.pegasys.teku.api.schema.bellatrix.ExecutionPayloadBellatrix;
 import tech.pegasys.teku.api.schema.capella.ExecutionPayloadCapella;
 import tech.pegasys.teku.api.schema.deneb.ExecutionPayloadDeneb;
-import tech.pegasys.teku.api.schema.electra.ExecutionPayloadElectra;
 
 public interface ExecutionPayload {
 
@@ -32,8 +31,4 @@ default Optional<ExecutionPayloadCapella> toVersionCapella() {
   default Optional<ExecutionPayloadDeneb> toVersionDeneb() {
     return Optional.empty();
   }
-
-  default Optional<ExecutionPayloadElectra> toVersionElectra() {
-    return Optional.empty();
-  }
 }

data/serializer/src/main/java/tech/pegasys/teku/api/schema/ExecutionPayloadHeader.java

@@ -17,7 +17,6 @@
 import tech.pegasys.teku.api.schema.bellatrix.ExecutionPayloadHeaderBellatrix;
 import tech.pegasys.teku.api.schema.capella.ExecutionPayloadHeaderCapella;
 import tech.pegasys.teku.api.schema.deneb.ExecutionPayloadHeaderDeneb;
-import tech.pegasys.teku.api.schema.electra.ExecutionPayloadHeaderElectra;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeaderSchema;
 
 public interface ExecutionPayloadHeader {
@@ -35,8 +34,4 @@ default Optional<ExecutionPayloadHeaderCapella> toVersionCapella() {
   default Optional<ExecutionPayloadHeaderDeneb> toVersionDeneb() {
     return Optional.empty();
   }
-
-  default Optional<ExecutionPayloadHeaderElectra> toVersionElectra() {
-    return Optional.empty();
-  }
 }

data/serializer/src/main/java/tech/pegasys/teku/api/schema/electra/BeaconBlockBodyElectra.java

@@ -30,17 +30,19 @@
 import tech.pegasys.teku.api.schema.altair.BeaconBlockBodyAltair;
 import tech.pegasys.teku.api.schema.altair.SyncAggregate;
 import tech.pegasys.teku.api.schema.capella.SignedBlsToExecutionChange;
+import tech.pegasys.teku.api.schema.deneb.ExecutionPayloadDeneb;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
 import tech.pegasys.teku.infrastructure.ssz.schema.SszListSchema;
 import tech.pegasys.teku.spec.SpecVersion;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.BeaconBlockBody;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.electra.BeaconBlockBodySchemaElectra;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
+import tech.pegasys.teku.spec.schemas.SchemaDefinitionsElectra;
 
 public class BeaconBlockBodyElectra extends BeaconBlockBodyAltair {
 
   @JsonProperty("execution_payload")
-  public final ExecutionPayloadElectra executionPayload;
+  public final ExecutionPayloadDeneb executionPayload;
 
   @JsonProperty("bls_to_execution_changes")
   public final List<SignedBlsToExecutionChange> blsToExecutionChanges;
@@ -62,7 +64,7 @@ public BeaconBlockBodyElectra(
       @JsonProperty("deposits") final List<Deposit> deposits,
       @JsonProperty("voluntary_exits") final List<SignedVoluntaryExit> voluntaryExits,
       @JsonProperty("sync_aggregate") final SyncAggregate syncAggregate,
-      @JsonProperty("execution_payload") final ExecutionPayloadElectra executionPayload,
+      @JsonProperty("execution_payload") final ExecutionPayloadDeneb executionPayload,
       @JsonProperty("bls_to_execution_changes")
           final List<SignedBlsToExecutionChange> blsToExecutionChanges,
       @JsonProperty("blob_kzg_commitments") final List<KZGCommitment> blobKZGCommitments,
@@ -93,7 +95,7 @@ public BeaconBlockBodyElectra(
           message) {
     super(message);
     checkNotNull(message.getExecutionPayload(), "Execution Payload is required for Electra blocks");
-    this.executionPayload = new ExecutionPayloadElectra(message.getExecutionPayload());
+    this.executionPayload = new ExecutionPayloadDeneb(message.getExecutionPayload());
     checkNotNull(
         message.getBlsToExecutionChanges(),
         "BlsToExecutionChanges are required for Electra blocks");
@@ -106,9 +108,19 @@ public BeaconBlockBodyElectra(
             .map(SszKZGCommitment::getKZGCommitment)
             .map(KZGCommitment::new)
             .toList();
-    // TODO add execution requests from BeaconBlocBodyElectra
-    // (https://github.com/Consensys/teku/pull/8600)
-    this.executionRequests = new ExecutionRequests(List.of(), List.of(), List.of());
+
+    final List<DepositRequest> depositRequests =
+        message.getExecutionRequests().getDeposits().stream().map(DepositRequest::new).toList();
+    final List<WithdrawalRequest> withdrawalRequests =
+        message.getExecutionRequests().getWithdrawals().stream()
+            .map(WithdrawalRequest::new)
+            .toList();
+    final List<ConsolidationRequest> consolidationRequests =
+        message.getExecutionRequests().getConsolidations().stream()
+            .map(ConsolidationRequest::new)
+            .toList();
+    this.executionRequests =
+        new ExecutionRequests(depositRequests, withdrawalRequests, consolidationRequests);
   }
 
   @Override
@@ -137,7 +149,11 @@ public BeaconBlockBody asInternalBeaconBlockBody(final SpecVersion spec) {
                   .map(KZGCommitment::asInternalKZGCommitment)
                   .map(SszKZGCommitment::new)
                   .collect(blobKZGCommitmentsSchema.collector()));
-          // TODO add execution requests (https://github.com/Consensys/teku/pull/8600)
+          builder.executionRequests(
+              this.executionRequests.asInternalConsolidationRequest(
+                  SchemaDefinitionsElectra.required(spec.getSchemaDefinitions())
+                      .getExecutionRequestsSchema()));
+
           return SafeFuture.COMPLETE;
         });
   }

data/serializer/src/main/java/tech/pegasys/teku/api/schema/electra/BeaconStateElectra.java

@@ -27,11 +27,12 @@
 import tech.pegasys.teku.api.schema.altair.BeaconStateAltair;
 import tech.pegasys.teku.api.schema.altair.SyncCommittee;
 import tech.pegasys.teku.api.schema.capella.HistoricalSummary;
+import tech.pegasys.teku.api.schema.deneb.ExecutionPayloadHeaderDeneb;
 import tech.pegasys.teku.infrastructure.ssz.collections.SszBitvector;
 import tech.pegasys.teku.infrastructure.ssz.schema.SszListSchema;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.SpecVersion;
-import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionPayloadHeaderSchemaElectra;
+import tech.pegasys.teku.spec.datastructures.execution.versions.deneb.ExecutionPayloadHeaderSchemaDeneb;
 import tech.pegasys.teku.spec.datastructures.state.SyncCommittee.SyncCommitteeSchema;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
@@ -41,7 +42,7 @@
 public class BeaconStateElectra extends BeaconStateAltair {
 
   @JsonProperty("latest_execution_payload_header")
-  public final ExecutionPayloadHeaderElectra latestExecutionPayloadHeader;
+  public final ExecutionPayloadHeaderDeneb latestExecutionPayloadHeader;
 
   @JsonProperty("next_withdrawal_index")
   @Schema(type = "string", example = EXAMPLE_UINT64)
@@ -107,7 +108,7 @@ public BeaconStateElectra(
       @JsonProperty("current_sync_committee") final SyncCommittee currentSyncCommittee,
       @JsonProperty("next_sync_committee") final SyncCommittee nextSyncCommittee,
       @JsonProperty("latest_execution_payload_header")
-          final ExecutionPayloadHeaderElectra latestExecutionPayloadHeader,
+          final ExecutionPayloadHeaderDeneb latestExecutionPayloadHeader,
       @JsonProperty("next_withdrawal_index") final UInt64 nextWithdrawalIndex,
       @JsonProperty("next_withdrawal_validator_index") final UInt64 nextWithdrawalValidatorIndex,
       @JsonProperty("historical_summaries") final List<HistoricalSummary> historicalSummaries,
@@ -168,8 +169,9 @@ public BeaconStateElectra(final BeaconState beaconState) {
     final tech.pegasys.teku.spec.datastructures.state.beaconstate.versions.electra
             .BeaconStateElectra
         electra = beaconState.toVersionElectra().orElseThrow();
+
     this.latestExecutionPayloadHeader =
-        new ExecutionPayloadHeaderElectra(electra.getLatestExecutionPayloadHeader());
+        new ExecutionPayloadHeaderDeneb(electra.getLatestExecutionPayloadHeader());
     this.nextWithdrawalIndex = electra.getNextWithdrawalIndex();
     this.nextWithdrawalValidatorIndex = electra.getNextWithdrawalValidatorIndex();
     this.historicalSummaries =
@@ -223,7 +225,7 @@ protected static void applyElectraFields(
       final SpecVersion specVersion,
       final MutableBeaconStateElectra state,
       final SyncCommitteeSchema syncCommitteeSchema,
-      final ExecutionPayloadHeaderSchemaElectra executionPayloadHeaderSchema,
+      final ExecutionPayloadHeaderSchemaDeneb executionPayloadHeaderSchema,
       final SszListSchema<
               tech.pegasys.teku.spec.datastructures.state.versions.capella.HistoricalSummary, ?>
           historicalSummariesSchema,

data/serializer/src/main/java/tech/pegasys/teku/api/schema/electra/BlindedBeaconBlockBodyElectra.java

@@ -29,15 +29,28 @@
 import tech.pegasys.teku.api.schema.KZGCommitment;
 import tech.pegasys.teku.api.schema.ProposerSlashing;
 import tech.pegasys.teku.api.schema.SignedVoluntaryExit;
+import tech.pegasys.teku.api.schema.altair.BeaconBlockBodyAltair;
 import tech.pegasys.teku.api.schema.altair.SyncAggregate;
 import tech.pegasys.teku.api.schema.capella.SignedBlsToExecutionChange;
-import tech.pegasys.teku.api.schema.deneb.BlindedBeaconBlockBodyDeneb;
+import tech.pegasys.teku.api.schema.deneb.ExecutionPayloadHeaderDeneb;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
+import tech.pegasys.teku.infrastructure.ssz.schema.SszListSchema;
 import tech.pegasys.teku.spec.SpecVersion;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.BeaconBlockBody;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.electra.BlindedBeaconBlockBodySchemaElectra;
+import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadHeaderSchema;
+import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
 
-public class BlindedBeaconBlockBodyElectra extends BlindedBeaconBlockBodyDeneb {
+public class BlindedBeaconBlockBodyElectra extends BeaconBlockBodyAltair {
+
+  @JsonProperty("execution_payload_header")
+  public final ExecutionPayloadHeaderDeneb executionPayloadHeader;
+
+  @JsonProperty("bls_to_execution_changes")
+  public final List<SignedBlsToExecutionChange> blsToExecutionChanges;
+
+  @JsonProperty("blob_kzg_commitments")
+  public final List<KZGCommitment> blobKZGCommitments;
 
   @JsonProperty("execution_requests_root")
   @Schema(type = "string", format = "byte", description = DESCRIPTION_BYTES32)
@@ -55,7 +68,7 @@ public BlindedBeaconBlockBodyElectra(
       @JsonProperty("voluntary_exits") final List<SignedVoluntaryExit> voluntaryExits,
       @JsonProperty("sync_aggregate") final SyncAggregate syncAggregate,
       @JsonProperty("execution_payload_header")
-          final ExecutionPayloadHeaderElectra executionPayloadHeader,
+          final ExecutionPayloadHeaderDeneb executionPayloadHeader,
       @JsonProperty("bls_to_execution_changes")
           final List<SignedBlsToExecutionChange> blsToExecutionChanges,
       @JsonProperty("blob_kzg_commitments") final List<KZGCommitment> blobKZGCommitments,
@@ -69,10 +82,15 @@ public BlindedBeaconBlockBodyElectra(
         attestations,
         deposits,
         voluntaryExits,
-        syncAggregate,
-        executionPayloadHeader,
-        blsToExecutionChanges,
-        blobKZGCommitments);
+        syncAggregate);
+    checkNotNull(
+        executionPayloadHeader, "Execution Payload Header is required for Electra blinded blocks");
+    this.executionPayloadHeader = executionPayloadHeader;
+    checkNotNull(
+        blsToExecutionChanges, "blsToExecutionChanges is required for Electra blinded blocks");
+    this.blsToExecutionChanges = blsToExecutionChanges;
+    checkNotNull(blobKZGCommitments, "blobKZGCommitments is required for Electra blinded blocks");
+    this.blobKZGCommitments = blobKZGCommitments;
     checkNotNull(
         executionRequestsRoot, "execution_requests_root is required for Electra blinded blocks");
     this.executionRequestsRoot = executionRequestsRoot;
@@ -83,8 +101,17 @@ public BlindedBeaconBlockBodyElectra(
               .BlindedBeaconBlockBodyElectra
           blockBody) {
     super(blockBody);
-    // TODO add execution requests from BeaconBlocBodyElectra
-    // (https://github.com/Consensys/teku/pull/8600)
+    this.executionPayloadHeader =
+        new ExecutionPayloadHeaderDeneb(blockBody.getExecutionPayloadHeader());
+    this.blsToExecutionChanges =
+        blockBody.getBlsToExecutionChanges().stream().map(SignedBlsToExecutionChange::new).toList();
+    this.blobKZGCommitments =
+        blockBody.getBlobKzgCommitments().stream()
+            .map(SszKZGCommitment::getKZGCommitment)
+            .map(KZGCommitment::new)
+            .toList();
+    // TODO Electra Builder API changes
+    // (https://github.com/Consensys/teku/issues/8624)
     this.executionRequestsRoot = Bytes32.ZERO;
   }
 
@@ -101,10 +128,33 @@ public boolean isBlinded() {
 
   @Override
   public BeaconBlockBody asInternalBeaconBlockBody(final SpecVersion spec) {
+
+    final ExecutionPayloadHeaderSchema<?> executionPayloadHeaderSchema =
+        getBeaconBlockBodySchema(spec).getExecutionPayloadHeaderSchema();
+
+    final SszListSchema<
+            tech.pegasys.teku.spec.datastructures.operations.SignedBlsToExecutionChange, ?>
+        blsToExecutionChangesSchema = getBeaconBlockBodySchema(spec).getBlsToExecutionChanges();
+
+    final SszListSchema<SszKZGCommitment, ?> blobKZGCommitmentsSchema =
+        getBeaconBlockBodySchema(spec).getBlobKzgCommitmentsSchema();
+
     return super.asInternalBeaconBlockBody(
         spec,
         builder -> {
-          // TODO add execution requests root (https://github.com/Consensys/teku/pull/8600)
+          builder.executionPayloadHeader(
+              executionPayloadHeader.asInternalExecutionPayloadHeader(
+                  executionPayloadHeaderSchema));
+          builder.blsToExecutionChanges(
+              this.blsToExecutionChanges.stream()
+                  .map(b -> b.asInternalSignedBlsToExecutionChange(spec))
+                  .collect(blsToExecutionChangesSchema.collector()));
+          builder.blobKzgCommitments(
+              this.blobKZGCommitments.stream()
+                  .map(KZGCommitment::asInternalKZGCommitment)
+                  .map(SszKZGCommitment::new)
+                  .collect(blobKZGCommitmentsSchema.collector()));
+          // TODO Electra Builder API changes (https://github.com/Consensys/teku/pull/8600)
           return SafeFuture.COMPLETE;
         });
   }