Rebase on master fixes

Consensys · Oct 2, 2024 · 7514f95 · 7514f95
1 parent 06a1a69
commit 7514f95
Show file tree

Hide file tree

Showing 49 changed files with 432 additions and 627 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
@@ -50,8 +50,8 @@
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadContext;
 import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadResult;
 import tech.pegasys.teku.spec.datastructures.execution.SignedExecutionPayloadHeader;
-import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsBuilderElectra;
 import tech.pegasys.teku.spec.datastructures.execution.versions.eip7732.ExecutionPayloadHeaderEip7732;
+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;
@@ -66,7 +66,6 @@
 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.spec.schemas.SchemaDefinitionsElectra;
 import tech.pegasys.teku.statetransition.OperationPool;
 import tech.pegasys.teku.statetransition.attestation.AggregatingAttestationPool;
@@ -281,7 +280,7 @@ private SafeFuture<Void> setExecutionData(
     if (bodyBuilder.supportsExecutionRequests()) {
       bodyBuilder.executionRequests(
           new ExecutionRequestsBuilderElectra(
-              SchemaDefinitionsElectra.required(schemaDefinitions).getExecutionRequestsSchema())
+                  SchemaDefinitionsElectra.required(schemaDefinitions).getExecutionRequestsSchema())
               .build());
     }
 

diff --git a/...ch/pegasys/teku/validator/coordinator/CachingExecutionPayloadAndBlobSidecarsRevealer.java b/...ch/pegasys/teku/validator/coordinator/CachingExecutionPayloadAndBlobSidecarsRevealer.java
@@ -35,6 +35,7 @@
 import tech.pegasys.teku.spec.datastructures.execution.GetPayloadResponse;
 import tech.pegasys.teku.spec.datastructures.execution.SignedExecutionPayloadEnvelope;
 import tech.pegasys.teku.spec.datastructures.execution.versions.eip7732.ExecutionPayloadHeaderEip7732;
+import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsSchema;
 import tech.pegasys.teku.spec.datastructures.state.beaconstate.BeaconState;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGCommitment;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
@@ -81,11 +82,15 @@ public Optional<ExecutionPayloadEnvelope> revealExecutionPayload(
         schemaDefinitions
             .getBlobKzgCommitmentsSchema()
             .createFromBlobsBundle(getPayloadResponse.getBlobsBundle().orElseThrow());
+    final ExecutionRequestsSchema executionRequestsSchema =
+        schemaDefinitions.getExecutionRequestsSchema();
     final ExecutionPayloadEnvelope executionPayload =
         schemaDefinitions
             .getExecutionPayloadEnvelopeSchema()
             .create(
                 getPayloadResponse.getExecutionPayload(),
+                // EIP7732 TODO: engine-API still in discussion
+                executionRequestsSchema.create(List.of(), List.of(), List.of()),
                 committedHeader.getBuilderIndex(),
                 block.getRoot(),
                 blobKzgCommitments,

diff --git a/...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks.json b/...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks.json
@@ -10,7 +10,7 @@
       "in" : "header",
       "schema" : {
         "type" : "string",
-        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
+        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
         "description" : "Version of the block being submitted, if using SSZ encoding."
       }
     } ],
@@ -38,6 +38,8 @@
               "$ref" : "#/components/schemas/SignedBlindedBlockDeneb"
             }, {
               "$ref" : "#/components/schemas/SignedBlindedBlockElectra"
+            }, {
+              "$ref" : "#/components/schemas/SignedBlindedBlockEip7732"
             } ]
           }
         }

diff --git a/...ech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks_{block_id}.json b/...ech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blinded_blocks_{block_id}.json
@@ -18,20 +18,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blob_sidecars_{block_id}.json b/...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v1_beacon_blob_sidecars_{block_id}.json
@@ -42,7 +42,8 @@
                 "bellatrix",
                 "capella",
                 "deneb",
-                "electra"
+                "electra",
+                "eip7732"
               ],
               "example": "phase0"
             }

diff --git a/...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blinded_blocks.json b/...resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blinded_blocks.json
@@ -20,7 +20,7 @@
       "in" : "header",
       "schema" : {
         "type" : "string",
-        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
+        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
         "description" : "Version of the block being submitted."
       }
     } ],
@@ -48,6 +48,8 @@
               "$ref" : "#/components/schemas/SignedBlindedBlockDeneb"
             }, {
               "$ref" : "#/components/schemas/SignedBlindedBlockElectra"
+            }, {
+              "$ref" : "#/components/schemas/SignedBlindedBlockEip7732"
             } ]
           }
         }

diff --git a/...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks.json b/...on-test/resources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks.json
@@ -20,7 +20,7 @@
       "in" : "header",
       "schema" : {
         "type" : "string",
-        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra" ],
+        "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
         "description" : "Version of the block being submitted."
       }
     } ],
@@ -48,6 +48,8 @@
               "$ref" : "#/components/schemas/SignedBlockContentsDeneb"
             }, {
               "$ref" : "#/components/schemas/SignedBlockContentsElectra"
+            }, {
+              "$ref" : "#/components/schemas/SignedBlockContentsEip7732"
             } ]
           }
         }

diff --git a/...egasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks_{block_id}_attestations.json b/...egasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_blocks_{block_id}_attestations.json
@@ -18,20 +18,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/...ources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attestations.json b/...ources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attestations.json
@@ -27,20 +27,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/.../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attester_slashings.json b/.../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_beacon_pool_attester_slashings.json
@@ -8,20 +8,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/.../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_debug_beacon_states_{state_id}.json b/.../tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_debug_beacon_states_{state_id}.json
@@ -18,20 +18,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_validator_aggregate_attestation.json b/...tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v2_validator_aggregate_attestation.json
@@ -39,20 +39,13 @@
       "200" : {
         "description" : "Request successful",
         "headers" : {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           }
         },

diff --git a/...sources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v3_validator_blocks_{slot}.json b/...sources/tech/pegasys/teku/beaconrestapi/beacon/paths/_eth_v3_validator_blocks_{slot}.json
@@ -56,44 +56,37 @@
     "responses" : {
       "200" : {
         "description" : "Request successful",
-        "headers": {
-          "Eth-Consensus-Version": {
-            "description": "Required in response so client can deserialize returned json or ssz data more effectively.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "phase0",
-                "altair",
-                "bellatrix",
-                "capella",
-                "deneb",
-                "electra"
-              ],
-              "example": "phase0"
+        "headers" : {
+          "Eth-Consensus-Version" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data more effectively.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "enum" : [ "phase0", "altair", "bellatrix", "capella", "deneb", "electra", "eip7732" ],
+              "example" : "phase0"
             }
           },
-          "Eth-Execution-Payload-Blinded": {
-            "description": "Required in response so client can deserialize returned json or ssz data to the correct object.",
-            "required": true,
-            "schema": {
-              "type": "boolean"
+          "Eth-Execution-Payload-Blinded" : {
+            "description" : "Required in response so client can deserialize returned json or ssz data to the correct object.",
+            "required" : true,
+            "schema" : {
+              "type" : "boolean"
             }
           },
-          "Eth-Execution-Payload-Value": {
-            "description": "Execution payload value in Wei. Required in response so client can determine relative value of execution payloads.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "example": "1"
+          "Eth-Execution-Payload-Value" : {
+            "description" : "Execution payload value in Wei. Required in response so client can determine relative value of execution payloads.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "example" : "1"
             }
           },
-          "Eth-Consensus-Block-Value": {
-            "description": "Consensus rewards paid to the proposer for this block, in Wei. Required in response so client can determine relative value of consensus blocks.",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "example": "1"
+          "Eth-Consensus-Block-Value" : {
+            "description" : "Consensus rewards paid to the proposer for this block, in Wei. Required in response so client can determine relative value of consensus blocks.",
+            "required" : true,
+            "schema" : {
+              "type" : "string",
+              "example" : "1"
             }
           }
         },