Merge branch 'master' into prometheus-upgrade-1.x

gfukushima · Jan 9, 2025 · b6b9ff1 · b6b9ff1
2 parents 38a916b + c0a17cf
commit b6b9ff1
Show file tree

Hide file tree

Showing 20 changed files with 86 additions and 608 deletions.
diff --git a/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineApiMethod.java b/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineApiMethod.java
@@ -16,8 +16,7 @@
 public enum EngineApiMethod {
   ENGINE_NEW_PAYLOAD("engine_newPayload"),
   ENGINE_GET_PAYLOAD("engine_getPayload"),
-  ENGINE_FORK_CHOICE_UPDATED("engine_forkchoiceUpdated"),
-  ENGINE_GET_BLOBS("engine_getBlobs");
+  ENGINE_FORK_CHOICE_UPDATED("engine_forkchoiceUpdated");
 
   private final String name;
 

diff --git a/...nt/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetBlobsV1.java b/...nt/src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetBlobsV1.java
diff --git a/...src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineJsonRpcMethod.java b/...src/main/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineJsonRpcMethod.java
@@ -28,12 +28,6 @@ default boolean isDeprecated() {
     return false;
   }
 
-  // TODO should be remove once all ELs implement engine_getBlobsV1. It has been added only to
-  // better handle the use case when the method is missing in the EL side
-  default boolean isOptional() {
-    return false;
-  }
-
   default String getVersionedName() {
     return getVersion() == 0 ? getName() : getName() + "V" + getVersion();
   }

diff --git a/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/BlobAndProofV1.java b/...lient/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/BlobAndProofV1.java
@@ -52,11 +52,6 @@ public BlobAndProof asInternalBlobsAndProofs(final BlobSchema blobSchema) {
     return new BlobAndProof(new Blob(blobSchema, blob), new KZGProof(proof));
   }
 
-  public static BlobAndProofV1 fromInternalBlobsBundle(final BlobAndProof blobAndProof) {
-    return new BlobAndProofV1(
-        blobAndProof.blob().getBytes(), blobAndProof.proof().getBytesCompressed());
-  }
-
   @Override
   public boolean equals(final Object o) {
     if (this == o) {

diff --git a/...c/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ConsolidationRequestV1.java b/...c/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ConsolidationRequestV1.java
diff --git a/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositRequestV1.java b/...ent/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/DepositRequestV1.java
diff --git a/...tech/pegasys/teku/ethereum/executionclient/web3j/DefaultExecutionWeb3jClientProvider.java b/...tech/pegasys/teku/ethereum/executionclient/web3j/DefaultExecutionWeb3jClientProvider.java
@@ -23,6 +23,11 @@
 import tech.pegasys.teku.infrastructure.time.TimeProvider;
 
 public class DefaultExecutionWeb3jClientProvider implements ExecutionWeb3jClientProvider {
+  private static final String[] NON_CRITICAL_METHODS =
+      new String[] {
+        "engine_exchangeCapabilities", "engine_getClientVersionV1", "engine_getBlobsV1"
+      };
+
   private final String eeEndpoint;
   private final Duration timeout;
   private final Optional<JwtConfig> jwtConfig;
@@ -58,8 +63,7 @@ private synchronized void buildClient() {
             .jwtConfigOpt(jwtConfig)
             .timeProvider(timeProvider)
             .executionClientEventsPublisher(executionClientEventsPublisher)
-            .nonCriticalMethods(
-                "engine_exchangeCapabilities", "engine_getClientVersionV1", "engine_getBlobsV1")
+            .nonCriticalMethods(NON_CRITICAL_METHODS)
             .build();
     this.alreadyBuilt = true;
   }