Merge branch 'master' into update-correlation-penalty-computation-eip…

…7125
Consensys · Sep 25, 2024 · 21c3907 · 21c3907
2 parents 3f90ab3 + ea74160
commit 21c3907
Show file tree

Hide file tree

Showing 116 changed files with 2,746 additions and 2,756 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -68,6 +68,16 @@ executors:
       architecture: "amd64"
       platform: "linux/amd64"
 
+  machine_large_executor_amd64:
+    machine:
+      image: ubuntu-2204:2024.01.1 # https://circleci.com/developer/machine/image/ubuntu-2204
+      docker_layer_caching: true
+    resource_class: large
+    working_directory: ~/project
+    environment:
+      architecture: "amd64"
+      platform: "linux/amd64"
+
   machine_executor_arm64:
     machine:
       image: ubuntu-2204:2024.01.1 # https://circleci.com/developer/machine/image/ubuntu-2204
@@ -354,7 +364,7 @@ jobs:
 
   acceptanceTests:
     parallelism: 5
-    executor: machine_executor_amd64
+    executor: machine_large_executor_amd64
     steps:
       - install_java_21
       - prepare

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@
 - Implemented [PostAggregateAndProofsV2](https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Validator/publishAggregateAndProofsV2) (adding support for Electra)
 - Added support for [Ephemery Testnet](https://github.com/ephemery.dev) `--network=ephemery`
 - Renamed metrics `validator_attestation_publication_delay`,`validator_block_publication_delay` and `beacon_block_import_delay_counter` to include the suffix `_total` added by the current version of prometheus.
+- Updated bootnodes for Holesky network
+- Added new `--p2p-flood-publish-enabled` parameter to control whenever flood publishing behaviour is enabled (applies to all subnets). Previous teku versions always had this behaviour enabled. Default is `true`.
 
 ### Bug Fixes
  - removed a warning from logs about non blinded blocks being requested (#8562)
diff --git a/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java b/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/CapellaUpgradeAcceptanceTest.java
@@ -34,7 +34,7 @@ public class CapellaUpgradeAcceptanceTest extends AcceptanceTestBase {
   @Test
   void shouldUpgradeToCapella() throws Exception {
     final UInt64 currentTime = timeProvider.getTimeInSeconds();
-    final int genesisTime = currentTime.plus(30).intValue(); // magic node startup time
+    final int genesisTime = currentTime.plus(60).intValue(); // magic node startup time
     final int shanghaiTime = genesisTime + 4 * 2; // 4 slots, 2 seconds each
     final Map<String, String> genesisOverrides =
         Map.of("shanghaiTime", String.valueOf(shanghaiTime));
@@ -51,6 +51,15 @@ void shouldUpgradeToCapella() throws Exception {
             genesisOverrides);
     primaryEL.start();
 
+    TekuBeaconNode primaryNode =
+        createTekuBeaconNode(
+            beaconNodeConfigWithForks(genesisTime, primaryEL)
+                .withStartupTargetPeerCount(0)
+                .build());
+
+    primaryNode.start();
+    primaryNode.waitForMilestone(SpecMilestone.CAPELLA);
+
     BesuNode secondaryEL =
         createBesuNode(
             BesuDockerVersion.STABLE,
@@ -64,15 +73,6 @@ void shouldUpgradeToCapella() throws Exception {
     secondaryEL.start();
     secondaryEL.addPeer(primaryEL);
 
-    TekuBeaconNode primaryNode =
-        createTekuBeaconNode(
-            beaconNodeConfigWithForks(genesisTime, primaryEL)
-                .withStartupTargetPeerCount(0)
-                .build());
-
-    primaryNode.start();
-    primaryNode.waitForMilestone(SpecMilestone.CAPELLA);
-
     final int primaryNodeGenesisTime = primaryNode.getGenesisTime().intValue();
 
     TekuBeaconNode lateJoiningNode =

diff --git a/...rc/acceptance-test/java/tech/pegasys/teku/test/acceptance/DenebUpgradeAcceptanceTest.java b/...rc/acceptance-test/java/tech/pegasys/teku/test/acceptance/DenebUpgradeAcceptanceTest.java
@@ -34,7 +34,7 @@ public class DenebUpgradeAcceptanceTest extends AcceptanceTestBase {
   @Test
   void shouldUpgradeToDeneb() throws Exception {
     final UInt64 currentTime = timeProvider.getTimeInSeconds();
-    final int genesisTime = currentTime.plus(30).intValue(); // magic node startup time
+    final int genesisTime = currentTime.plus(60).intValue(); // magic node startup time
     final int epochDuration = 4 * 2; // 4 slots, 2 seconds each for swift
     final int shanghaiTime = genesisTime + epochDuration;
     final Map<String, String> genesisOverrides =
@@ -56,6 +56,15 @@ void shouldUpgradeToDeneb() throws Exception {
             genesisOverrides);
     primaryEL.start();
 
+    TekuBeaconNode primaryNode =
+        createTekuBeaconNode(
+            beaconNodeWithTrustedSetup(genesisTime, primaryEL)
+                .withStartupTargetPeerCount(0)
+                .build());
+
+    primaryNode.start();
+    primaryNode.waitForMilestone(SpecMilestone.DENEB);
+
     BesuNode secondaryEL =
         createBesuNode(
             BesuDockerVersion.STABLE,
@@ -69,15 +78,6 @@ void shouldUpgradeToDeneb() throws Exception {
     secondaryEL.start();
     secondaryEL.addPeer(primaryEL);
 
-    TekuBeaconNode primaryNode =
-        createTekuBeaconNode(
-            beaconNodeWithTrustedSetup(genesisTime, primaryEL)
-                .withStartupTargetPeerCount(0)
-                .build());
-
-    primaryNode.start();
-    primaryNode.waitForMilestone(SpecMilestone.DENEB);
-
     final int primaryNodeGenesisTime = primaryNode.getGenesisTime().intValue();
 
     TekuBeaconNode lateJoiningNode =

diff --git a/.../acceptance-test/java/tech/pegasys/teku/test/acceptance/ElectraUpgradeAcceptanceTest.java b/.../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";

diff --git a/...est/java/tech/pegasys/teku/test/acceptance/ExecutionLayerTriggeredExitAcceptanceTest.java b/...est/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 =

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.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),

diff --git a/...n/java/tech/pegasys/teku/validator/coordinator/performance/DefaultPerformanceTracker.java b/...n/java/tech/pegasys/teku/validator/coordinator/performance/DefaultPerformanceTracker.java
@@ -250,6 +250,11 @@ private SafeFuture<BlockPerformance> getBlockPerformanceForEpoch(final UInt64 cu
 
   private boolean isInHistoricBlockRoots(
       final BeaconState state, final SlotAndBlockRoot producedBlock) {
+    LOG.debug(
+        "Checking if block {} is in historic block roots {} of the state {}",
+        producedBlock,
+        state.getBlockRoots(),
+        state.hashTreeRoot());
     return producedBlock.getSlot().isLessThan(state.getSlot())
         && spec.getBlockRootAtSlot(state, producedBlock.getSlot())
             .equals(producedBlock.getBlockRoot());

diff --git a/.../test/java/tech/pegasys/teku/validator/coordinator/BlockOperationSelectorFactoryTest.java b/.../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;

diff --git a/build.gradle b/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'

diff --git a/...-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconBlockBodyElectra.json b/...-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconBlockBodyElectra.json
@@ -1,7 +1,7 @@
 {
   "title" : "BeaconBlockBodyElectra",
   "type" : "object",
-  "required" : [ "randao_reveal", "eth1_data", "graffiti", "proposer_slashings", "attester_slashings", "attestations", "deposits", "voluntary_exits", "sync_aggregate", "execution_payload", "bls_to_execution_changes", "blob_kzg_commitments" ],
+  "required" : [ "randao_reveal", "eth1_data", "graffiti", "proposer_slashings", "attester_slashings", "attestations", "deposits", "voluntary_exits", "sync_aggregate", "execution_payload", "bls_to_execution_changes", "blob_kzg_commitments", "execution_requests" ],
   "properties" : {
     "randao_reveal" : {
       "type" : "string",
@@ -52,7 +52,7 @@
       "$ref" : "#/components/schemas/SyncAggregate"
     },
     "execution_payload" : {
-      "$ref" : "#/components/schemas/ExecutionPayloadElectra"
+      "$ref" : "#/components/schemas/ExecutionPayloadDeneb"
     },
     "bls_to_execution_changes" : {
       "type" : "array",
@@ -68,6 +68,9 @@
         "description" : "Bytes48 hexadecimal",
         "format" : "bytes"
       }
+    },
+    "execution_requests" : {
+      "$ref" : "#/components/schemas/ExecutionRequests"
     }
   }
 }
diff --git a/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconStateElectra.json b/...tion-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BeaconStateElectra.json
@@ -151,7 +151,7 @@
       "$ref" : "#/components/schemas/SyncCommittee"
     },
     "latest_execution_payload_header" : {
-      "$ref" : "#/components/schemas/ExecutionPayloadHeaderElectra"
+      "$ref" : "#/components/schemas/ExecutionPayloadHeaderDeneb"
     },
     "next_withdrawal_index" : {
       "type" : "string",

diff --git a/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BlindedBlockBodyElectra.json b/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/BlindedBlockBodyElectra.json
@@ -1,7 +1,7 @@
 {
   "title" : "BlindedBlockBodyElectra",
   "type" : "object",
-  "required" : [ "randao_reveal", "eth1_data", "graffiti", "proposer_slashings", "attester_slashings", "attestations", "deposits", "voluntary_exits", "sync_aggregate", "execution_payload_header", "bls_to_execution_changes", "blob_kzg_commitments" ],
+  "required" : [ "randao_reveal", "eth1_data", "graffiti", "proposer_slashings", "attester_slashings", "attestations", "deposits", "voluntary_exits", "sync_aggregate", "execution_payload_header", "bls_to_execution_changes", "blob_kzg_commitments", "execution_requests" ],
   "properties" : {
     "randao_reveal" : {
       "type" : "string",
@@ -52,7 +52,7 @@
       "$ref" : "#/components/schemas/SyncAggregate"
     },
     "execution_payload_header" : {
-      "$ref" : "#/components/schemas/ExecutionPayloadHeaderElectra"
+      "$ref" : "#/components/schemas/ExecutionPayloadHeaderDeneb"
     },
     "bls_to_execution_changes" : {
       "type" : "array",
@@ -68,6 +68,9 @@
         "description" : "Bytes48 hexadecimal",
         "format" : "bytes"
       }
+    },
+    "execution_requests" : {
+      "$ref" : "#/components/schemas/ExecutionRequests"
     }
   }
 }