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.

Sign up for GitHub

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

Refactor ExecutionPayloadResult #8702

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Refactor ExecutionPayloadResult #8702

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
93 changes: 39 additions & 54 deletions ...src/main/java/tech/pegasys/teku/spec/datastructures/execution/ExecutionPayloadResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,43 +21,52 @@
import tech.pegasys.teku.spec.datastructures.builder.BuilderBid;

/**
* In non-blinded flow, both {@link #executionPayloadFuture} and {@link #blobsBundleFuture} would be
* present. The {@link #blobsBundleFuture} will have a value when the future is complete only after
* Deneb, otherwise it will be empty.
* In non-blinded flow, {@link #getPayloadResponseFuture} will be present.
*
* <p>In blinded flow, {@link #builderBidOrFallbackDataFuture} would be present
* <p>In blinded flow, {@link #builderBidOrFallbackDataFuture} would be present.
*/
public class ExecutionPayloadResult {

private final ExecutionPayloadContext executionPayloadContext;
private final Optional<SafeFuture<ExecutionPayload>> executionPayloadFuture;
private final Optional<SafeFuture<Optional<BlobsBundle>>> blobsBundleFuture;
private final Optional<SafeFuture<GetPayloadResponse>> getPayloadResponseFuture;
private final Optional<SafeFuture<BuilderBidOrFallbackData>> builderBidOrFallbackDataFuture;
private final SafeFuture<UInt256> executionPayloadValueFuture;

private ExecutionPayloadResult(
final ExecutionPayloadContext executionPayloadContext,
final Optional<SafeFuture<ExecutionPayload>> executionPayloadFuture,
final Optional<SafeFuture<Optional<BlobsBundle>>> blobsBundleFuture,
final Optional<SafeFuture<BuilderBidOrFallbackData>> builderBidOrFallbackDataFuture,
final SafeFuture<UInt256> executionPayloadValueFuture) {
final Optional<SafeFuture<GetPayloadResponse>> getPayloadResponseFuture,
final Optional<SafeFuture<BuilderBidOrFallbackData>> builderBidOrFallbackDataFuture) {
this.executionPayloadContext = executionPayloadContext;
this.executionPayloadFuture = executionPayloadFuture;
this.blobsBundleFuture = blobsBundleFuture;
this.getPayloadResponseFuture = getPayloadResponseFuture;
this.builderBidOrFallbackDataFuture = builderBidOrFallbackDataFuture;
this.executionPayloadValueFuture = executionPayloadValueFuture;
}

public static ExecutionPayloadResult createForLocalFlow(
final ExecutionPayloadContext executionPayloadContext,
final SafeFuture<GetPayloadResponse> getPayloadResponseFuture) {
return new ExecutionPayloadResult(
executionPayloadContext, Optional.of(getPayloadResponseFuture), Optional.empty());
}

public static ExecutionPayloadResult createForBuilderFlow(
final ExecutionPayloadContext executionPayloadContext,
final SafeFuture<BuilderBidOrFallbackData> builderBidOrFallbackDataFuture) {
return new ExecutionPayloadResult(
executionPayloadContext, Optional.empty(), Optional.of(builderBidOrFallbackDataFuture));
}

public ExecutionPayloadContext getExecutionPayloadContext() {
return executionPayloadContext;
}

public Optional<SafeFuture<ExecutionPayload>> getExecutionPayloadFutureFromLocalFlow() {
return executionPayloadFuture;
return getPayloadResponseFuture.map(
getPayloadResponse ->
getPayloadResponse.thenApply(GetPayloadResponse::getExecutionPayload));
}

public Optional<SafeFuture<Optional<BlobsBundle>>> getBlobsBundleFutureFromLocalFlow() {
return blobsBundleFuture;
return getPayloadResponseFuture.map(
getPayloadResponse -> getPayloadResponse.thenApply(GetPayloadResponse::getBlobsBundle));
}

public Optional<SafeFuture<BuilderBidOrFallbackData>> getBuilderBidOrFallbackDataFuture() {
Expand All @@ -68,31 +77,21 @@ public Optional<SafeFuture<BuilderBidOrFallbackData>> getBuilderBidOrFallbackDat
* @return the value from the local payload, the builder bid or the local fallback payload
*/
public SafeFuture<UInt256> getExecutionPayloadValueFuture() {
return executionPayloadValueFuture;
return getPayloadResponseFuture
.map(
getPayloadResponse ->
getPayloadResponse.thenApply(GetPayloadResponse::getExecutionPayloadValue))
.orElseGet(this::getExecutionPayloadValueFutureFromBuilderFlow);
}

public boolean isFromLocalFlow() {
return executionPayloadFuture.isPresent();
return getPayloadResponseFuture.isPresent();
}

public static ExecutionPayloadResult createForLocalFlow(
final ExecutionPayloadContext executionPayloadContext,
final SafeFuture<GetPayloadResponse> getPayloadResponseFuture) {
final SafeFuture<UInt256> executionPayloadValueFuture =
getPayloadResponseFuture.thenApply(GetPayloadResponse::getExecutionPayloadValue);
return new ExecutionPayloadResult(
executionPayloadContext,
Optional.of(getPayloadResponseFuture.thenApply(GetPayloadResponse::getExecutionPayload)),
Optional.of(getPayloadResponseFuture.thenApply(GetPayloadResponse::getBlobsBundle)),
Optional.empty(),
executionPayloadValueFuture);
}

public static ExecutionPayloadResult createForBuilderFlow(
final ExecutionPayloadContext executionPayloadContext,
final SafeFuture<BuilderBidOrFallbackData> builderBidOrFallbackDataFuture) {
final SafeFuture<UInt256> executionPayloadValueFuture =
builderBidOrFallbackDataFuture.thenApply(
private SafeFuture<UInt256> getExecutionPayloadValueFutureFromBuilderFlow() {
return builderBidOrFallbackDataFuture
.orElseThrow()
.thenApply(
builderBidOrFallbackData ->
builderBidOrFallbackData
.getBuilderBid()
Expand All @@ -104,12 +103,6 @@ public static ExecutionPayloadResult createForBuilderFlow(
builderBidOrFallbackData
.getFallbackDataRequired()
.getExecutionPayloadValue()));
return new ExecutionPayloadResult(
executionPayloadContext,
Optional.empty(),
Optional.empty(),
Optional.of(builderBidOrFallbackDataFuture),
executionPayloadValueFuture);
}

@Override
Expand All @@ -122,30 +115,22 @@ public boolean equals(final Object o) {
}
final ExecutionPayloadResult that = (ExecutionPayloadResult) o;
return Objects.equals(executionPayloadContext, that.executionPayloadContext)
&& Objects.equals(executionPayloadFuture, that.executionPayloadFuture)
&& Objects.equals(blobsBundleFuture, that.blobsBundleFuture)
&& Objects.equals(builderBidOrFallbackDataFuture, that.builderBidOrFallbackDataFuture)
&& Objects.equals(executionPayloadValueFuture, that.executionPayloadValueFuture);
&& Objects.equals(getPayloadResponseFuture, that.getPayloadResponseFuture)
&& Objects.equals(builderBidOrFallbackDataFuture, that.builderBidOrFallbackDataFuture);
}

@Override
public int hashCode() {
return Objects.hash(
executionPayloadContext,
executionPayloadFuture,
blobsBundleFuture,
builderBidOrFallbackDataFuture,
executionPayloadValueFuture);
executionPayloadContext, getPayloadResponseFuture, builderBidOrFallbackDataFuture);
}

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
.add("executionPayloadContext", executionPayloadContext)
.add("executionPayloadFuture", executionPayloadFuture)
.add("blobsBundleFuture", blobsBundleFuture)
.add("getPayloadResponseFuture", getPayloadResponseFuture)
.add("builderBidOrFallbackDataFuture", builderBidOrFallbackDataFuture)
.add("executionPayloadValueFuture", executionPayloadValueFuture)
.toString();
}
}