Merge branch 'master' into check-network-on-start

Consensys · Sep 26, 2024 · 572d91b · 572d91b
2 parents 34ecc2d + 7066de7
commit 572d91b
Show file tree

Hide file tree

Showing 68 changed files with 1,031 additions and 2,667 deletions.
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/.../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"
     }
   }
 }
diff --git a/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadElectra.json b/...test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/ExecutionPayloadElectra.json