Implement builder_status and scheduled polling

Consensys · May 4, 2022 · 4e5912a · 4e5912a
1 parent c2357c2
commit 4e5912a
Show file tree

Hide file tree

Showing 76 changed files with 1,013 additions and 767 deletions.
diff --git a/beacon/sync/src/testFixtures/java/tech/pegasys/teku/beacon/sync/SyncingNodeManager.java b/beacon/sync/src/testFixtures/java/tech/pegasys/teku/beacon/sync/SyncingNodeManager.java
@@ -44,8 +44,8 @@
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannelStub;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannelStub;
 import tech.pegasys.teku.statetransition.BeaconChainUtil;
 import tech.pegasys.teku.statetransition.block.BlockImportChannel;
 import tech.pegasys.teku.statetransition.block.BlockImportNotifications;
@@ -101,7 +101,7 @@ public static SyncingNodeManager create(
     chainUtil.initializeStorage();
 
     final MergeTransitionBlockValidator transitionBlockValidator =
-        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionEngineChannel.NOOP);
+        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionLayerChannel.NOOP);
     ForkChoice forkChoice =
         new ForkChoice(
             spec,
@@ -116,7 +116,7 @@ public static SyncingNodeManager create(
             recentChainData,
             forkChoice,
             WeakSubjectivityFactory.lenientValidator(),
-            new ExecutionEngineChannelStub(spec, false));
+            new ExecutionLayerChannelStub(spec, false));
 
     BlockValidator blockValidator = new BlockValidator(spec, recentChainData);
     final PendingPool<SignedBeaconBlock> pendingBlocks =

diff --git a/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java b/.../src/main/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactory.java
@@ -38,7 +38,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.SignedVoluntaryExit;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
@@ -59,7 +59,7 @@ public class BlockOperationSelectorFactory {
   private final Eth1DataCache eth1DataCache;
   private final Bytes32 graffiti;
   private final ForkChoiceNotifier forkChoiceNotifier;
-  private final ExecutionEngineChannel executionEngineChannel;
+  private final ExecutionLayerChannel executionLayerChannel;
   private final boolean isMevBoostEnabled;
 
   public BlockOperationSelectorFactory(
@@ -73,7 +73,7 @@ public BlockOperationSelectorFactory(
       final Eth1DataCache eth1DataCache,
       final Bytes32 graffiti,
       final ForkChoiceNotifier forkChoiceNotifier,
-      final ExecutionEngineChannel executionEngineChannel,
+      final ExecutionLayerChannel executionLayerChannel,
       final boolean isMevBoostEnabled) {
     this.spec = spec;
     this.attestationPool = attestationPool;
@@ -85,7 +85,7 @@ public BlockOperationSelectorFactory(
     this.eth1DataCache = eth1DataCache;
     this.graffiti = graffiti;
     this.forkChoiceNotifier = forkChoiceNotifier;
-    this.executionEngineChannel = executionEngineChannel;
+    this.executionLayerChannel = executionLayerChannel;
     this.isMevBoostEnabled = isMevBoostEnabled;
   }
 
@@ -156,7 +156,7 @@ public Consumer<BeaconBlockBodyBuilder> createSelector(
                           .getExecutionPayloadHeaderSchema()
                           .getHeaderOfDefaultPayload(),
                   (payloadId) ->
-                      executionEngineChannel
+                      executionLayerChannel
                           .getPayloadHeader(payloadId, blockSlotState.getSlot())
                           .join()));
           return;
@@ -185,7 +185,9 @@ public Consumer<BeaconBlockBodyBuilder> createSelector(
                       .getExecutionPayloadSchema()
                       .getDefault(),
               (payloadId) ->
-                  executionEngineChannel.getPayload(payloadId, blockSlotState.getSlot()).join()));
+                  executionLayerChannel
+                      .engineGetPayload(payloadId, blockSlotState.getSlot())
+                      .join()));
     };
   }
 
@@ -235,7 +237,7 @@ public Consumer<SignedBeaconBlockUnblinder> createUnblinderSelector() {
       } else {
         bodyUnblinder.setExecutionPayloadSupplier(
             () ->
-                executionEngineChannel.proposeBlindedBlock(
+                executionLayerChannel.proposeBlindedBlock(
                     bodyUnblinder.getSignedBlindedBeaconBlock()));
       }
     };

diff --git a/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryTest.java b/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryTest.java
@@ -51,7 +51,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.SignedVoluntaryExit;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.util.BeaconBlockBodyLists;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.logic.common.statetransition.exceptions.StateTransitionException;
 import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
@@ -72,7 +72,7 @@ class BlockFactoryTest {
   final OperationPool<ProposerSlashing> proposerSlashingPool = mock(OperationPool.class);
   final OperationPool<SignedVoluntaryExit> voluntaryExitPool = mock(OperationPool.class);
   final ForkChoiceNotifier forkChoiceNotifier = mock(ForkChoiceNotifier.class);
-  final ExecutionEngineChannel executionEngine = mock(ExecutionEngineChannel.class);
+  final ExecutionLayerChannel executionLayer = mock(ExecutionLayerChannel.class);
   final SyncCommitteeContributionPool syncCommitteeContributionPool =
       mock(SyncCommitteeContributionPool.class);
   final DepositProvider depositProvider = mock(DepositProvider.class);
@@ -310,7 +310,7 @@ private BeaconBlock assertBlockCreated(
                 eth1DataCache,
                 graffiti,
                 forkChoiceNotifier,
-                executionEngine,
+                executionLayer,
                 isMevBoostEnabled));
 
     when(depositProvider.getDeposits(any(), any())).thenReturn(deposits);
@@ -321,9 +321,9 @@ private BeaconBlock assertBlockCreated(
     when(eth1DataCache.getEth1Vote(any())).thenReturn(ETH1_DATA);
     when(forkChoiceNotifier.getPayloadId(any(), any()))
         .thenReturn(SafeFuture.completedFuture(Optional.of(Bytes8.fromHexStringLenient("0x0"))));
-    when(executionEngine.getPayload(any(), any()))
+    when(executionLayer.engineGetPayload(any(), any()))
         .thenReturn(SafeFuture.completedFuture(executionPayload));
-    when(executionEngine.getPayloadHeader(any(), any()))
+    when(executionLayer.getPayloadHeader(any(), any()))
         .thenReturn(SafeFuture.completedFuture(executionPayloadHeader));
     beaconChainUtil.initializeStorage();
 
@@ -366,16 +366,16 @@ private SignedBeaconBlock assertBlockUnblinded(
       final SignedBeaconBlock beaconBlock, final Spec spec, final boolean isMevBoostEnabled) {
     final BlockFactory blockFactory = createBlockFactory(spec, isMevBoostEnabled);
 
-    when(executionEngine.proposeBlindedBlock(beaconBlock))
+    when(executionLayer.proposeBlindedBlock(beaconBlock))
         .thenReturn(SafeFuture.completedFuture(executionPayload));
 
     final SignedBeaconBlock block =
         blockFactory.unblindSignedBeaconBlockIfBlinded(beaconBlock).join();
 
     if (!beaconBlock.getMessage().getBody().isBlinded()) {
-      verifyNoInteractions(executionEngine);
+      verifyNoInteractions(executionLayer);
     } else {
-      verify(executionEngine).proposeBlindedBlock(beaconBlock);
+      verify(executionLayer).proposeBlindedBlock(beaconBlock);
     }
 
     assertThat(block).isNotNull();
@@ -419,7 +419,7 @@ private BlockFactory createBlockFactory(final Spec spec, final boolean isMevBoos
             eth1DataCache,
             graffiti,
             forkChoiceNotifier,
-            executionEngine,
+            executionLayer,
             isMevBoostEnabled));
   }
 }
diff --git a/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java b/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java
@@ -53,7 +53,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.SignedVoluntaryExit;
 import tech.pegasys.teku.spec.datastructures.operations.versions.altair.SignedContributionAndProof;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.logic.common.operations.validation.AttesterSlashingValidator.AttesterSlashingInvalidReason;
 import tech.pegasys.teku.spec.logic.common.operations.validation.ProposerSlashingValidator.ProposerSlashingInvalidReason;
 import tech.pegasys.teku.spec.logic.common.operations.validation.VoluntaryExitValidator.ExitInvalidReason;
@@ -122,7 +122,7 @@ class BlockOperationSelectorFactoryTest {
   private final BLSSignature randaoReveal = dataStructureUtil.randomSignature();
 
   private final ForkChoiceNotifier forkChoiceNotifier = mock(ForkChoiceNotifier.class);
-  private final ExecutionEngineChannel executionEngine = mock(ExecutionEngineChannel.class);
+  private final ExecutionLayerChannel executionLayer = mock(ExecutionLayerChannel.class);
 
   private final ExecutionPayload defaultExecutionPayload =
       SchemaDefinitionsBellatrix.required(spec.getGenesisSpec().getSchemaDefinitions())
@@ -147,7 +147,7 @@ class BlockOperationSelectorFactoryTest {
           eth1DataCache,
           defaultGraffiti,
           forkChoiceNotifier,
-          executionEngine,
+          executionLayer,
           false);
 
   private final BlockOperationSelectorFactory factoryWithMevBoost =
@@ -162,7 +162,7 @@ class BlockOperationSelectorFactoryTest {
           eth1DataCache,
           defaultGraffiti,
           forkChoiceNotifier,
-          executionEngine,
+          executionLayer,
           true);
 
   @BeforeEach
@@ -309,7 +309,7 @@ void shouldIncludeNonDefaultExecutionPayload() {
 
     when(forkChoiceNotifier.getPayloadId(any(), any()))
         .thenReturn(SafeFuture.completedFuture(Optional.of(payloadId)));
-    when(executionEngine.getPayload(payloadId, slot))
+    when(executionLayer.engineGetPayload(payloadId, slot))
         .thenReturn(SafeFuture.completedFuture(randomExecutionPayload));
 
     factory
@@ -331,7 +331,7 @@ void shouldIncludeExecutionPayloadHeaderIfMevBoostEnabledAndBlindedBlockRequeste
 
     when(forkChoiceNotifier.getPayloadId(any(), any()))
         .thenReturn(SafeFuture.completedFuture(Optional.of(payloadId)));
-    when(executionEngine.getPayloadHeader(payloadId, slot))
+    when(executionLayer.getPayloadHeader(payloadId, slot))
         .thenReturn(SafeFuture.completedFuture(randomExecutionPayloadHeader));
 
     factoryWithMevBoost
@@ -352,7 +352,7 @@ void shouldIncludeExecutionPayloadIfMevBoostEnabledButNoBlindedBlockRequested()
 
     when(forkChoiceNotifier.getPayloadId(any(), any()))
         .thenReturn(SafeFuture.completedFuture(Optional.of(payloadId)));
-    when(executionEngine.getPayload(payloadId, slot))
+    when(executionLayer.engineGetPayload(payloadId, slot))
         .thenReturn(SafeFuture.completedFuture(randomExecutionPayload));
 
     factoryWithMevBoost
@@ -370,7 +370,7 @@ void shouldUnblindSignedBlindedBeaconBlockIfMevBoostEnabled() {
     final CapturingBeaconBlockUnblinder blockUnblinder =
         new CapturingBeaconBlockUnblinder(spec.getGenesisSchemaDefinitions(), blindedSignedBlock);
 
-    when(executionEngine.proposeBlindedBlock(blindedSignedBlock))
+    when(executionLayer.proposeBlindedBlock(blindedSignedBlock))
         .thenReturn(SafeFuture.completedFuture(randomExecutionPayload));
 
     factoryWithMevBoost.createUnblinderSelector().accept(blockUnblinder);
@@ -385,7 +385,7 @@ void shouldThrowUnblindSignedBlindedBeaconBlockIfMevBoostDisabled() {
     final CapturingBeaconBlockUnblinder blockUnblinder =
         new CapturingBeaconBlockUnblinder(spec.getGenesisSchemaDefinitions(), blindedSignedBlock);
 
-    when(executionEngine.proposeBlindedBlock(blindedSignedBlock))
+    when(executionLayer.proposeBlindedBlock(blindedSignedBlock))
         .thenReturn(SafeFuture.completedFuture(randomExecutionPayload));
 
     assertThatThrownBy(() -> factory.createUnblinderSelector().accept(blockUnblinder))

diff --git a/...n-test/java/tech/pegasys/teku/beaconrestapi/AbstractDataBackedRestAPIIntegrationTest.java b/...n-test/java/tech/pegasys/teku/beaconrestapi/AbstractDataBackedRestAPIIntegrationTest.java
@@ -55,7 +55,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.ProposerSlashing;
 import tech.pegasys.teku.spec.datastructures.operations.SignedVoluntaryExit;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
 import tech.pegasys.teku.statetransition.attestation.AttestationManager;
@@ -163,7 +163,7 @@ private void setupStorage(
                 recentChainData,
                 new StubForkChoiceNotifier(),
                 new MergeTransitionBlockValidator(
-                    spec, recentChainData, ExecutionEngineChannel.NOOP));
+                    spec, recentChainData, ExecutionLayerChannel.NOOP));
   }
 
   private void setupAndStartRestAPI(BeaconRestApiConfig config) {

diff --git a/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/EpochTransitionBenchmark.java b/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/EpochTransitionBenchmark.java
@@ -42,7 +42,7 @@
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.MutableBeaconState;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.logic.common.block.AbstractBlockProcessor;
 import tech.pegasys.teku.spec.logic.common.statetransition.epoch.EpochProcessor;
 import tech.pegasys.teku.spec.logic.common.statetransition.epoch.RewardAndPenaltyDeltas;
@@ -109,7 +109,7 @@ public void init() throws Exception {
 
     recentChainData = MemoryOnlyRecentChainData.create(spec);
     final MergeTransitionBlockValidator transitionBlockValidator =
-        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionEngineChannel.NOOP);
+        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionLayerChannel.NOOP);
     ForkChoice forkChoice =
         new ForkChoice(
             spec,
@@ -127,7 +127,7 @@ public void init() throws Exception {
             recentChainData,
             forkChoice,
             wsValidator,
-            ExecutionEngineChannel.NOOP);
+            ExecutionLayerChannel.NOOP);
     blockIterator = BlockIO.createResourceReader(spec, blocksFile).iterator();
     System.out.println("Importing 63 blocks from " + blocksFile);
 

diff --git a/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/ProfilingRun.java b/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/ProfilingRun.java
@@ -38,7 +38,7 @@
 import tech.pegasys.teku.spec.datastructures.state.Validator;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconStateSchema;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.logic.common.block.AbstractBlockProcessor;
 import tech.pegasys.teku.spec.logic.common.statetransition.results.BlockImportResult;
 import tech.pegasys.teku.spec.util.DataStructureUtil;
@@ -90,7 +90,7 @@ public void importBlocks() throws Exception {
       RecentChainData recentChainData = MemoryOnlyRecentChainData.create(spec);
       recentChainData.initializeFromGenesis(initialState, UInt64.ZERO);
       final MergeTransitionBlockValidator transitionBlockValidator =
-          new MergeTransitionBlockValidator(spec, recentChainData, ExecutionEngineChannel.NOOP);
+          new MergeTransitionBlockValidator(spec, recentChainData, ExecutionLayerChannel.NOOP);
       ForkChoice forkChoice =
           new ForkChoice(
               spec,
@@ -107,7 +107,7 @@ public void importBlocks() throws Exception {
               recentChainData,
               forkChoice,
               wsValidator,
-              ExecutionEngineChannel.NOOP);
+              ExecutionLayerChannel.NOOP);
 
       System.out.println("Start blocks import from " + blocksFile);
       int blockCount = 0;
@@ -180,7 +180,7 @@ public void importBlocksMemProfiling() throws Exception {
       recentChainData.initializeFromGenesis(initialState, UInt64.ZERO);
       initialState = null;
       final MergeTransitionBlockValidator transitionBlockValidator =
-          new MergeTransitionBlockValidator(spec, recentChainData, ExecutionEngineChannel.NOOP);
+          new MergeTransitionBlockValidator(spec, recentChainData, ExecutionLayerChannel.NOOP);
       ForkChoice forkChoice =
           new ForkChoice(
               spec,
@@ -195,7 +195,7 @@ public void importBlocksMemProfiling() throws Exception {
               recentChainData,
               forkChoice,
               wsValidator,
-              ExecutionEngineChannel.NOOP);
+              ExecutionLayerChannel.NOOP);
 
       System.out.println("Start blocks import from " + blocksFile);
       int counter = 1;

diff --git a/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/TransitionBenchmark.java b/eth-benchmark-tests/src/jmh/java/tech/pegasys/teku/benchmarks/TransitionBenchmark.java
@@ -37,7 +37,7 @@
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
-import tech.pegasys.teku.spec.executionengine.ExecutionEngineChannel;
+import tech.pegasys.teku.spec.executionlayer.ExecutionLayerChannel;
 import tech.pegasys.teku.spec.logic.common.block.AbstractBlockProcessor;
 import tech.pegasys.teku.spec.logic.common.statetransition.results.BlockImportResult;
 import tech.pegasys.teku.statetransition.BeaconChainUtil;
@@ -89,7 +89,7 @@ public void init() throws Exception {
     wsValidator = WeakSubjectivityFactory.lenientValidator();
     recentChainData = MemoryOnlyRecentChainData.create(spec);
     final MergeTransitionBlockValidator transitionBlockValidator =
-        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionEngineChannel.NOOP);
+        new MergeTransitionBlockValidator(spec, recentChainData, ExecutionLayerChannel.NOOP);
     ForkChoice forkChoice =
         new ForkChoice(
             spec,
@@ -107,7 +107,7 @@ public void init() throws Exception {
             recentChainData,
             forkChoice,
             wsValidator,
-            ExecutionEngineChannel.NOOP);
+            ExecutionLayerChannel.NOOP);
     blockIterator = BlockIO.createResourceReader(spec, blocksFile).iterator();
     System.out.println("Importing blocks from " + blocksFile);
   }