fix more tests

StefanBratanov · Sep 10, 2024 · bf60b7e · bf60b7e
1 parent 5f4bd6c
commit bf60b7e
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 39 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
@@ -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.SignedExecutionPayloadHeader;
 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,10 +64,11 @@
 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.SchemaDefinitionsEip7732;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
 import tech.pegasys.teku.statetransition.attestation.AttestationForkChecker;
+import tech.pegasys.teku.statetransition.attestation.PayloadAttestationPool;
+import tech.pegasys.teku.statetransition.execution.ExecutionPayloadHeaderPool;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.statetransition.synccommittee.SyncCommitteeContributionPool;
 
@@ -78,6 +80,8 @@ public class BlockOperationSelectorFactory {
   private final OperationPool<SignedVoluntaryExit> voluntaryExitPool;
   private final OperationPool<SignedBlsToExecutionChange> blsToExecutionChangePool;
   private final SyncCommitteeContributionPool contributionPool;
+  private final ExecutionPayloadHeaderPool executionPayloadHeaderPool;
+  private final PayloadAttestationPool payloadAttestationPool;
   private final DepositProvider depositProvider;
   private final Eth1DataCache eth1DataCache;
   private final GraffitiBuilder graffitiBuilder;
@@ -92,6 +96,8 @@ public BlockOperationSelectorFactory(
       final OperationPool<SignedVoluntaryExit> voluntaryExitPool,
       final OperationPool<SignedBlsToExecutionChange> blsToExecutionChangePool,
       final SyncCommitteeContributionPool contributionPool,
+      final ExecutionPayloadHeaderPool executionPayloadHeaderPool,
+      final PayloadAttestationPool payloadAttestationPool,
       final DepositProvider depositProvider,
       final Eth1DataCache eth1DataCache,
       final GraffitiBuilder graffitiBuilder,
@@ -104,6 +110,8 @@ public BlockOperationSelectorFactory(
     this.voluntaryExitPool = voluntaryExitPool;
     this.blsToExecutionChangePool = blsToExecutionChangePool;
     this.contributionPool = contributionPool;
+    this.executionPayloadHeaderPool = executionPayloadHeaderPool;
+    this.payloadAttestationPool = payloadAttestationPool;
     this.depositProvider = depositProvider;
     this.eth1DataCache = eth1DataCache;
     this.graffitiBuilder = graffitiBuilder;
@@ -173,6 +181,12 @@ public Function<BeaconBlockBodyBuilder, SafeFuture<Void>> createSelector(
             blsToExecutionChangePool.getItemsForBlock(blockSlotState));
       }
 
+      // Post-ePBS: Payload attestations
+      if (bodyBuilder.supportsPayloadAttestations()) {
+        bodyBuilder.payloadAttestations(
+            payloadAttestationPool.getPayloadAttestationsForBlock(blockSlotState));
+      }
+
       final SchemaDefinitions schemaDefinitions =
           spec.atSlot(blockSlotState.getSlot()).getSchemaDefinitions();
 
@@ -226,32 +240,17 @@ private SafeFuture<Void> setExecutionData(
       return SafeFuture.COMPLETE;
     }
 
-    // ePBS (TODO: placeholder) also the whole flow requires refactor
+    // ePBS (EIP7732 TODO: placeholder) need to think about the 3 flows (local, builder, p2p pool)
     if (bodyBuilder.supportsSignedExecutionPayloadHeader()) {
-      final SchemaDefinitionsEip7732 schemaDefinitionsEip7732 =
-          SchemaDefinitionsEip7732.required(schemaDefinitions);
-      final ExecutionPayloadHeader emptyHeader =
-          schemaDefinitions
-              .getExecutionPayloadHeaderSchema()
-              .createExecutionPayloadHeader(
-                  builder ->
-                      builder
-                          .parentBlockHash(() -> Bytes32.ZERO)
-                          .parentBlockRoot(() -> Bytes32.ZERO)
-                          .blockHash(Bytes32.ZERO)
-                          .gasLimit(UInt64.ZERO)
-                          .builderIndex(() -> UInt64.ZERO)
-                          .slot(() -> UInt64.ZERO)
-                          .value(() -> UInt64.ZERO)
-                          .blobKzgCommitmentsRoot(() -> Bytes32.ZERO));
-      // empty signed header
-      bodyBuilder.signedExecutionPayloadHeader(
-          schemaDefinitionsEip7732
-              .getSignedExecutionPayloadHeaderSchema()
-              .create(emptyHeader, BLSSignature.empty()));
-      // empty list
-      bodyBuilder.payloadAttestations(
-          schemaDefinitionsEip7732.getPayloadAttestationsSchema().createFromElements(List.of()));
+      final SignedExecutionPayloadHeader bid =
+          executionPayloadHeaderPool
+              .selectBidForBlock(blockSlotState)
+              .orElseThrow(
+                  () ->
+                      new IllegalStateException(
+                          "No bid available during block production for slot "
+                              + blockSlotState.getSlot()));
+      bodyBuilder.signedExecutionPayloadHeader(bid);
       return SafeFuture.COMPLETE;
     }
 

diff --git a/...dator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java b/...dator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java
@@ -85,6 +85,8 @@
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
+import tech.pegasys.teku.statetransition.attestation.PayloadAttestationPool;
+import tech.pegasys.teku.statetransition.execution.ExecutionPayloadHeaderPool;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.statetransition.synccommittee.SyncCommitteeContributionPool;
 import tech.pegasys.teku.storage.client.RecentChainData;
@@ -109,6 +111,10 @@ public abstract class AbstractBlockFactoryTest {
       mock(ExecutionLayerBlockProductionManager.class);
   protected final SyncCommitteeContributionPool syncCommitteeContributionPool =
       mock(SyncCommitteeContributionPool.class);
+  protected final ExecutionPayloadHeaderPool executionPayloadHeaderPool =
+      mock(ExecutionPayloadHeaderPool.class);
+  protected final PayloadAttestationPool payloadAttestationPool =
+      mock(PayloadAttestationPool.class);
   protected final DepositProvider depositProvider = mock(DepositProvider.class);
   protected final Eth1DataCache eth1DataCache = mock(Eth1DataCache.class);
 

diff --git a/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java b/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java
@@ -188,6 +188,8 @@ public BlockFactory createBlockFactory(final Spec spec) {
             voluntaryExitPool,
             blsToExecutionChangePool,
             syncCommitteeContributionPool,
+            executionPayloadHeaderPool,
+            payloadAttestationPool,
             depositProvider,
             eth1DataCache,
             graffitiBuilder,

diff --git a/...lidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryPhase0Test.java b/...lidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryPhase0Test.java
@@ -196,6 +196,8 @@ public BlockFactory createBlockFactory(final Spec spec) {
             voluntaryExitPool,
             blsToExecutionChangePool,
             syncCommitteeContributionPool,
+            executionPayloadHeaderPool,
+            payloadAttestationPool,
             depositProvider,
             eth1DataCache,
             graffitiBuilder,

diff --git a/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java b/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java
@@ -94,6 +94,8 @@
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.SimpleOperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
+import tech.pegasys.teku.statetransition.attestation.PayloadAttestationPool;
+import tech.pegasys.teku.statetransition.execution.ExecutionPayloadHeaderPool;
 import tech.pegasys.teku.statetransition.forkchoice.ForkChoiceNotifier;
 import tech.pegasys.teku.statetransition.synccommittee.SignedContributionAndProofValidator;
 import tech.pegasys.teku.statetransition.synccommittee.SyncCommitteeContributionPool;
@@ -128,6 +130,9 @@ class BlockOperationSelectorFactoryTest {
   private final SignedContributionAndProofValidator contributionValidator =
       mock(SignedContributionAndProofValidator.class);
 
+  private final OperationValidator<SignedExecutionPayloadHeader> executionPayloadHeaderValidator =
+      mock(OperationValidator.class);
+
   private final AggregatingAttestationPool attestationPool = mock(AggregatingAttestationPool.class);
   private final OperationPool<AttesterSlashing> attesterSlashingPool =
       new SimpleOperationPool<>(
@@ -162,6 +167,12 @@ class BlockOperationSelectorFactoryTest {
   private final SyncCommitteeContributionPool contributionPool =
       new SyncCommitteeContributionPool(spec, contributionValidator);
 
+  private final ExecutionPayloadHeaderPool executionPayloadHeaderPool =
+      new ExecutionPayloadHeaderPool(executionPayloadHeaderValidator);
+
+  private final PayloadAttestationPool payloadAttestationPool =
+      new PayloadAttestationPool(spec, metricsSystem);
+
   private final DepositProvider depositProvider = mock(DepositProvider.class);
   private final Eth1DataCache eth1DataCache = mock(Eth1DataCache.class);
   private final Bytes32 defaultGraffiti = dataStructureUtil.randomBytes32();
@@ -192,6 +203,8 @@ class BlockOperationSelectorFactoryTest {
           voluntaryExitPool,
           blsToExecutionChangePool,
           contributionPool,
+          executionPayloadHeaderPool,
+          payloadAttestationPool,
           depositProvider,
           eth1DataCache,
           graffitiBuilder,
@@ -206,6 +219,8 @@ class BlockOperationSelectorFactoryTest {
           voluntaryExitPool,
           blsToExecutionChangePool,
           contributionPool,
+          executionPayloadHeaderPool,
+          payloadAttestationPool,
           depositProvider,
           eth1DataCache,
           graffitiBuilder,

diff --git a/data/serializer/src/test/java/tech/pegasys/teku/api/schema/BeaconStateTest.java b/data/serializer/src/test/java/tech/pegasys/teku/api/schema/BeaconStateTest.java
@@ -20,6 +20,7 @@
 import tech.pegasys.teku.api.schema.bellatrix.BeaconStateBellatrix;
 import tech.pegasys.teku.api.schema.capella.BeaconStateCapella;
 import tech.pegasys.teku.api.schema.deneb.BeaconStateDeneb;
+import tech.pegasys.teku.api.schema.eip7732.BeaconStateEip7732;
 import tech.pegasys.teku.api.schema.electra.BeaconStateElectra;
 import tech.pegasys.teku.api.schema.phase0.BeaconStatePhase0;
 import tech.pegasys.teku.spec.Spec;
@@ -42,7 +43,7 @@ public void shouldConvertToInternalObject(final SpecContext ctx) {
           case CAPELLA -> new BeaconStateCapella(beaconStateInternal);
           case DENEB -> new BeaconStateDeneb(beaconStateInternal);
           case ELECTRA -> new BeaconStateElectra(beaconStateInternal);
-          case EIP7732 -> throw new UnsupportedOperationException("EIP7732 TODO");
+          case EIP7732 -> new BeaconStateEip7732(beaconStateInternal);
         };
 
     assertThat(beaconState.asInternalBeaconState(spec)).isEqualTo(beaconStateInternal);

diff --git a/...ec/datastructures/blocks/blockbody/versions/eip7732/BeaconBlockBodySchemaEip7732Impl.java b/...ec/datastructures/blocks/blockbody/versions/eip7732/BeaconBlockBodySchemaEip7732Impl.java
@@ -21,7 +21,6 @@
 import tech.pegasys.teku.infrastructure.ssz.primitive.SszBytes32;
 import tech.pegasys.teku.infrastructure.ssz.schema.SszListSchema;
 import tech.pegasys.teku.infrastructure.ssz.schema.SszPrimitiveSchemas;
-import tech.pegasys.teku.infrastructure.ssz.tree.GIndexUtil;
 import tech.pegasys.teku.infrastructure.ssz.tree.TreeNode;
 import tech.pegasys.teku.spec.config.SpecConfigEip7732;
 import tech.pegasys.teku.spec.datastructures.blocks.Eth1Data;
@@ -226,12 +225,9 @@ public long getBlobKzgCommitmentsGeneralizedIndex() {
     throw new UnsupportedOperationException("BlobKzgCommitments removed in Eip7732");
   }
 
-  // TODO: not sure what to do here
   @Override
   public LongList getBlindedNodeGeneralizedIndices() {
-    return GIndexUtil.gIdxComposeAll(
-        getChildGeneralizedIndex(getFieldIndex(BlockBodyFields.EXECUTION_PAYLOAD)),
-        getExecutionPayloadSchema().getBlindedNodeGeneralizedIndices());
+    return LongList.of();
   }
 
   @Override

diff --git a/...pec/src/test/java/tech/pegasys/teku/spec/datastructures/blocks/SignedBeaconBlockTest.java b/...pec/src/test/java/tech/pegasys/teku/spec/datastructures/blocks/SignedBeaconBlockTest.java
@@ -24,18 +24,21 @@
 import tech.pegasys.teku.spec.SpecMilestone;
 import tech.pegasys.teku.spec.TestSpecContext;
 import tech.pegasys.teku.spec.TestSpecInvocationContextProvider.SpecContext;
+import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitions;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
 
 @TestSpecContext(allMilestones = true)
 class SignedBeaconBlockTest {
 
   private Spec spec;
+  private SpecMilestone milestone;
   private DataStructureUtil dataStructureUtil;
 
   @BeforeEach
   void setUp(final SpecContext specContext) {
     spec = specContext.getSpec();
+    milestone = specContext.getSpecMilestone();
     dataStructureUtil = specContext.getDataStructureUtil();
   }
 
@@ -56,11 +59,10 @@ void shouldBlindAndUnblind() {
     final SignedBeaconBlock blinded = original.blind(spec.getGenesisSchemaDefinitions());
     assertThat(blinded.hashTreeRoot()).isEqualTo(original.hashTreeRoot());
 
-    if (!blinded.getMessage().getBody().isBlinded()) {
+    if (!blinded.getMessage().getBody().isBlinded()
+        && !milestone.isGreaterThanOrEqualTo(SpecMilestone.EIP7732)) {
       // Didn't blind the block so we must have a spec prior to bellatrix that doesn't have payloads
-      assertThat(
-              spec.getGenesisSpec().getMilestone().isGreaterThanOrEqualTo(SpecMilestone.BELLATRIX))
-          .isFalse();
+      assertThat(milestone.isGreaterThanOrEqualTo(SpecMilestone.BELLATRIX)).isFalse();
     } else {
       // Check the blinded block actually matches the schema by serializing it
       assertThatNoException().isThrownBy(blinded::sszSerialize);
@@ -74,10 +76,12 @@ void shouldBlindAndUnblind() {
                           .getJsonTypeDefinition()));
 
       // Otherwise, we should be able to unblind it again
+      final ExecutionPayload executionPayload =
+          milestone.isGreaterThanOrEqualTo(SpecMilestone.EIP7732)
+              ? null
+              : original.getMessage().getBody().getOptionalExecutionPayload().orElseThrow();
       final SignedBeaconBlock unblinded =
-          blinded.unblind(
-              spec.getGenesisSchemaDefinitions(),
-              original.getMessage().getBody().getOptionalExecutionPayload().orElseThrow());
+          blinded.unblind(spec.getGenesisSchemaDefinitions(), executionPayload);
       assertThat(unblinded.hashTreeRoot()).isEqualTo(original.hashTreeRoot());
       assertThat(unblinded.sszSerialize()).isEqualTo(original.sszSerialize());
       assertThatNoException()

diff --git a/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java b/...aconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java
@@ -942,6 +942,8 @@ public void initValidatorApiHandler() {
             voluntaryExitPool,
             blsToExecutionChangePool,
             syncCommitteeContributionPool,
+            executionPayloadHeaderPool,
+            payloadAttestationPool,
             depositProvider,
             eth1DataCache,
             graffitiBuilder,