Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make engine_getBlobsV1 not fork specific #8961

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Loading
Loading