Removing ExecutionPayloadV4

Consensys · Oct 2, 2024 · 270ef44 · 270ef44
1 parent a929217
commit 270ef44
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 94 deletions.
diff --git a/...t/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java b/...t/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java
diff --git a/...src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/GetPayloadV4Response.java b/...src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/GetPayloadV4Response.java
@@ -23,7 +23,7 @@
 import tech.pegasys.teku.ethereum.executionclient.serialization.UInt256AsHexSerializer;
 
 public class GetPayloadV4Response {
-  public final ExecutionPayloadV4 executionPayload;
+  public final ExecutionPayloadV3 executionPayload;
 
   @JsonSerialize(using = UInt256AsHexSerializer.class)
   @JsonDeserialize(using = UInt256AsHexDeserializer.class)
@@ -34,7 +34,7 @@ public class GetPayloadV4Response {
   public final boolean shouldOverrideBuilder;
 
   public GetPayloadV4Response(
-      final @JsonProperty("executionPayload") ExecutionPayloadV4 executionPayload,
+      final @JsonProperty("executionPayload") ExecutionPayloadV3 executionPayload,
       final @JsonProperty("blockValue") UInt256 blockValue,
       final @JsonProperty("blobsBundle") BlobsBundleV1 blobsBundle,
       final @JsonProperty("shouldOverrideBuilder") boolean shouldOverrideBuilder) {

diff --git a/.../test/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetPayloadV4Test.java b/.../test/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetPayloadV4Test.java
@@ -31,7 +31,7 @@
 import tech.pegasys.teku.ethereum.executionclient.ExecutionEngineClient;
 import tech.pegasys.teku.ethereum.executionclient.response.InvalidRemoteResponseException;
 import tech.pegasys.teku.ethereum.executionclient.schema.BlobsBundleV1;
-import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV4;
+import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV3;
 import tech.pegasys.teku.ethereum.executionclient.schema.GetPayloadV4Response;
 import tech.pegasys.teku.ethereum.executionclient.schema.Response;
 import tech.pegasys.teku.infrastructure.async.SafeFuture;
@@ -142,7 +142,7 @@ private SafeFuture<Response<GetPayloadV4Response>> dummySuccessfulResponse(
     return SafeFuture.completedFuture(
         new Response<>(
             new GetPayloadV4Response(
-                ExecutionPayloadV4.fromInternalExecutionPayload(executionPayload),
+                ExecutionPayloadV3.fromInternalExecutionPayload(executionPayload),
                 blockValue,
                 BlobsBundleV1.fromInternalBlobsBundle(blobsBundle),
                 false)));

diff --git a/...est/java/tech/pegasys/teku/ethereum/executionlayer/ElectraExecutionClientHandlerTest.java b/...est/java/tech/pegasys/teku/ethereum/executionlayer/ElectraExecutionClientHandlerTest.java
@@ -27,7 +27,6 @@
 import org.junit.jupiter.api.Test;
 import tech.pegasys.teku.ethereum.executionclient.schema.BlobsBundleV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV3;
-import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV4;
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceStateV1;
 import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceUpdatedResult;
 import tech.pegasys.teku.ethereum.executionclient.schema.GetPayloadV4Response;
@@ -65,7 +64,7 @@ void engineGetPayload_shouldCallGetPayloadV4() throws ExecutionException, Interr
         SafeFuture.completedFuture(
             new Response<>(
                 new GetPayloadV4Response(
-                    ExecutionPayloadV4.fromInternalExecutionPayload(
+                    ExecutionPayloadV3.fromInternalExecutionPayload(
                         dataStructureUtil.randomExecutionPayload()),
                     UInt256.MAX_VALUE,
                     BlobsBundleV1.fromInternalBlobsBundle(dataStructureUtil.randomBlobsBundle()),