fix some stuff

StefanBratanov · Oct 14, 2024 · 332f23e · 332f23e
1 parent 3bde374
commit 332f23e
Show file tree

Hide file tree

Showing 5 changed files with 72 additions and 12 deletions.
diff --git a/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java b/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java
@@ -374,11 +374,8 @@ private ExecutionRequests getExecutionRequestsFromBuilderFlow(
         // from the builder bid
         .flatMap(BuilderBid::getOptionalExecutionRequests)
         // from the local fallback
-        .orElse(
-            builderBidOrFallbackData
-                .getFallbackDataRequired()
-                .getExecutionRequests()
-                .orElseThrow());
+        .or(() -> builderBidOrFallbackData.getFallbackDataRequired().getExecutionRequests())
+        .orElseThrow();
   }
 
   public Consumer<SignedBeaconBlockUnblinder> createBlockUnblinderSelector(

diff --git a/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java b/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java
@@ -1020,6 +1020,45 @@ void shouldGetExecutionRequestsForLocallyProducedBlocks() {
     assertThat(bodyBuilder.executionRequests).isEqualTo(expectedExecutionRequests);
   }
 
+  @Test
+  void shouldIncludeExecutionRequestsInBlindedBlock() {
+    final UInt64 slot = UInt64.valueOf(2);
+    final BeaconState blockSlotState = dataStructureUtil.randomBeaconState(slot);
+
+    final ExecutionRequests executionRequests = dataStructureUtil.randomExecutionRequests();
+
+    final ExecutionPayloadContext executionPayloadContextWithValidatorRegistration =
+        dataStructureUtil.randomPayloadExecutionContext(false, true);
+    when(forkChoiceNotifier.getPayloadId(any(), any()))
+        .thenReturn(
+            SafeFuture.completedFuture(
+                Optional.of(executionPayloadContextWithValidatorRegistration)));
+
+    prepareBlindedBlockWithBlobsAndExecutionRequestsProduction(
+        dataStructureUtil.randomExecutionPayloadHeader(),
+        executionPayloadContextWithValidatorRegistration,
+        blockSlotState,
+        dataStructureUtil.randomBlobKzgCommitments(),
+        executionRequests,
+        dataStructureUtil.randomUInt256());
+
+    final CapturingBeaconBlockBodyBuilder bodyBuilder =
+        new CapturingBeaconBlockBodyBuilder(true, true);
+
+    safeJoin(
+        factory
+            .createSelector(
+                parentRoot,
+                blockSlotState,
+                dataStructureUtil.randomSignature(),
+                Optional.empty(),
+                Optional.empty(),
+                BlockProductionPerformance.NOOP)
+            .apply(bodyBuilder));
+
+    assertThat(bodyBuilder.executionRequests).isEqualTo(executionRequests);
+  }
+
   private void prepareBlockProductionWithPayload(
       final ExecutionPayload executionPayload,
       final ExecutionPayloadContext executionPayloadContext,
@@ -1158,6 +1197,33 @@ private void prepareBlindedBlockAndBlobsProduction(
                 executionPayloadContext, SafeFuture.completedFuture(builderBidOrFallbackData)));
   }
 
+  private void prepareBlindedBlockWithBlobsAndExecutionRequestsProduction(
+      final ExecutionPayloadHeader executionPayloadHeader,
+      final ExecutionPayloadContext executionPayloadContext,
+      final BeaconState blockSlotState,
+      final SszList<SszKZGCommitment> blobKzgCommitments,
+      final ExecutionRequests executionRequests,
+      final UInt256 executionPayloadValue) {
+    final BuilderBidOrFallbackData builderBidOrFallbackData =
+        BuilderBidOrFallbackData.create(
+            dataStructureUtil.randomBuilderBid(
+                builder -> {
+                  builder.header(executionPayloadHeader);
+                  builder.blobKzgCommitments(blobKzgCommitments);
+                  builder.executionRequests(executionRequests);
+                  builder.value(executionPayloadValue);
+                }));
+    when(executionLayer.initiateBlockProduction(
+            executionPayloadContext,
+            blockSlotState,
+            true,
+            Optional.empty(),
+            BlockProductionPerformance.NOOP))
+        .thenReturn(
+            ExecutionPayloadResult.createForBuilderFlow(
+                executionPayloadContext, SafeFuture.completedFuture(builderBidOrFallbackData)));
+  }
+
   private void prepareBlindedBlockAndBlobsProductionWithFallBack(
       final ExecutionPayload executionPayload,
       final ExecutionPayloadContext executionPayloadContext,

diff --git a/...h/pegasys/teku/spec/datastructures/builder/versions/electra/BuilderBidBuilderElectra.java b/...h/pegasys/teku/spec/datastructures/builder/versions/electra/BuilderBidBuilderElectra.java
@@ -53,6 +53,6 @@ public BuilderBid build() {
   @Override
   protected void validate() {
     super.validate();
-    checkNotNull(blobKzgCommitments, "blobKzgCommitments must be specified");
+    checkNotNull(executionRequests, "executionRequests must be specified");
   }
 }
diff --git a/...tech/pegasys/teku/spec/datastructures/builder/versions/electra/BuilderBidElectraImpl.java b/...tech/pegasys/teku/spec/datastructures/builder/versions/electra/BuilderBidElectraImpl.java
@@ -13,7 +13,6 @@
 
 package tech.pegasys.teku.spec.datastructures.builder.versions.electra;
 
-import java.util.Optional;
 import org.apache.tuweni.units.bigints.UInt256;
 import tech.pegasys.teku.bls.BLSPublicKey;
 import tech.pegasys.teku.infrastructure.ssz.SszList;
@@ -54,11 +53,6 @@ public ExecutionPayloadHeader getHeader() {
     return getField0();
   }
 
-  @Override
-  public Optional<ExecutionRequests> getOptionalExecutionRequests() {
-    return Optional.empty();
-  }
-
   @Override
   public SszList<SszKZGCommitment> getBlobKzgCommitments() {
     return getField1();

diff --git a/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java b/ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java
@@ -636,6 +636,9 @@ public BuilderBid randomBuilderBid(final Consumer<BuilderBidBuilder> builderModi
               schemaDefinitions
                   .toVersionDeneb()
                   .ifPresent(__ -> builder.blobKzgCommitments(randomBlobKzgCommitments()));
+              schemaDefinitions
+                  .toVersionElectra()
+                  .ifPresent(__ -> builder.executionRequests(randomExecutionRequests()));
               // 1 ETH is 10^18 wei, Uint256 max is more than 10^77, so just to avoid
               // overflows in
               // computation