Fix electra builder block production flow (#9001)

Consensys · Jan 16, 2025 · 09d427b · 09d427b
1 parent c315305
commit 09d427b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...ys/teku/spec/datastructures/blocks/blockbody/versions/electra/BeaconBlockBodyElectra.java b/...ys/teku/spec/datastructures/blocks/blockbody/versions/electra/BeaconBlockBodyElectra.java
@@ -32,6 +32,11 @@ static BeaconBlockBodyElectra required(final BeaconBlockBody body) {
 
   ExecutionRequests getExecutionRequests();
 
+  @Override
+  default Optional<ExecutionRequests> getOptionalExecutionRequests() {
+    return Optional.of(getExecutionRequests());
+  }
+
   @Override
   default Optional<BeaconBlockBodyElectra> toVersionElectra() {
     return Optional.of(this);

diff --git a/...m/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerChannelStub.java b/...m/spec/src/main/java/tech/pegasys/teku/spec/executionlayer/ExecutionLayerChannelStub.java
@@ -433,6 +433,14 @@ public SafeFuture<BuilderBidOrFallbackData> builderGetHeader(
                                 .getBlobKzgCommitmentsSchema()
                                 .createFromBlobsBundle(blobsBundle);
                           });
+              final Optional<ExecutionRequests> executionRequests =
+                  schemaDefinitions
+                      .toVersionElectra()
+                      .map(SchemaDefinitionsElectra::getExecutionRequestsSchema)
+                      .map(
+                          executionRequestsSchema ->
+                              new ExecutionRequestsBuilderElectra(executionRequestsSchema).build());
+
               final BuilderBid builderBid =
                   schemaDefinitions
                       .getBuilderBidSchema()
@@ -443,6 +451,7 @@ public SafeFuture<BuilderBidOrFallbackData> builderGetHeader(
                             builder.value(getPayloadResponse.getExecutionPayloadValue());
                             // using an empty public key for the stub
                             builder.publicKey(BLSPublicKey.empty());
+                            executionRequests.ifPresent(builder::executionRequests);
                           });
               return BuilderBidOrFallbackData.create(builderBid);
             })

diff --git a/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java b/.../main/java/tech/pegasys/teku/spec/logic/versions/electra/block/BlockProcessorElectra.java
@@ -41,7 +41,6 @@
 import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.config.SpecConfigElectra;
 import tech.pegasys.teku.spec.datastructures.blocks.blockbody.BeaconBlockBody;
-import tech.pegasys.teku.spec.datastructures.blocks.blockbody.versions.electra.BeaconBlockBodyElectra;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadSummary;
 import tech.pegasys.teku.spec.datastructures.execution.ExpectedWithdrawals;
@@ -141,7 +140,9 @@ public NewPayloadRequest computeNewPayloadRequest(
             .toList();
     final Bytes32 parentBeaconBlockRoot = state.getLatestBlockHeader().getParentRoot();
     final ExecutionRequests executionRequests =
-        BeaconBlockBodyElectra.required(beaconBlockBody).getExecutionRequests();
+        beaconBlockBody
+            .getOptionalExecutionRequests()
+            .orElseThrow(() -> new BlockProcessingException("Execution requests expected"));
     return new NewPayloadRequest(
         executionPayload,
         versionedHashes,
@@ -162,7 +163,8 @@ protected void processOperationsNoValidation(
     safelyProcess(
         () -> {
           final ExecutionRequests executionRequests =
-              BeaconBlockBodyElectra.required(body).getExecutionRequests();
+              body.getOptionalExecutionRequests()
+                  .orElseThrow(() -> new BlockProcessingException("Execution requests expected"));
 
           processDepositRequests(state, executionRequests.getDeposits());
           processWithdrawalRequests(