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

Remove SchemaDefinitionCache from rest builder client #8693

Merged
merged 2 commits into from
Oct 18, 2024
Merged

Remove SchemaDefinitionCache from rest builder client #8693

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d772bbb
remove SchemaDefinitionCache from rest builder client
tbenr Oct 9, 2024
c4429ca
Merge branch 'master' into remove-schemadefinitioncache-from-builder
tbenr Oct 18, 2024
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
26 changes: 13 additions & 13 deletions ...ient/src/main/java/tech/pegasys/teku/ethereum/executionclient/rest/RestBuilderClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
import tech.pegasys.teku.infrastructure.version.VersionProvider;
import tech.pegasys.teku.spec.Spec;
import tech.pegasys.teku.spec.SpecMilestone;
import tech.pegasys.teku.spec.SpecVersion;
import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
import tech.pegasys.teku.spec.datastructures.builder.BuilderPayload;
import tech.pegasys.teku.spec.datastructures.builder.BuilderPayloadSchema;
import tech.pegasys.teku.spec.datastructures.builder.SignedBuilderBid;
import tech.pegasys.teku.spec.datastructures.builder.SignedBuilderBidSchema;
import tech.pegasys.teku.spec.datastructures.builder.SignedValidatorRegistration;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionCache;
import tech.pegasys.teku.spec.schemas.SchemaDefinitionsBellatrix;

public class RestBuilderClient implements BuilderClient {
Expand All @@ -65,13 +65,13 @@ public class RestBuilderClient implements BuilderClient {
cachedBuilderApiSignedBuilderBidResponseType = new ConcurrentHashMap<>();

private final RestClient restClient;
private final SchemaDefinitionCache schemaDefinitionCache;
private final Spec spec;
private final boolean setUserAgentHeader;

public RestBuilderClient(
final RestClient restClient, final Spec spec, final boolean setUserAgentHeader) {
this.restClient = restClient;
this.schemaDefinitionCache = new SchemaDefinitionCache(spec);
this.spec = spec;
this.setUserAgentHeader = setUserAgentHeader;
}

Expand Down Expand Up @@ -109,15 +109,16 @@ public SafeFuture<Response<Optional<SignedBuilderBid>>> getHeader(
urlParams.put("parent_hash", parentHash.toHexString());
urlParams.put("pubkey", pubKey.toBytesCompressed().toHexString());

final SpecMilestone milestone = schemaDefinitionCache.milestoneAtSlot(slot);
final SpecVersion specVersion = spec.atSlot(slot);
final SpecMilestone milestone = specVersion.getMilestone();

final DeserializableTypeDefinition<BuilderApiResponse<SignedBuilderBid>>
responseTypeDefinition =
cachedBuilderApiSignedBuilderBidResponseType.computeIfAbsent(
milestone,
__ -> {
final SchemaDefinitionsBellatrix schemaDefinitionsBellatrix =
getSchemaDefinitionsBellatrix(milestone);
getSchemaDefinitionsBellatrix(specVersion);
final SignedBuilderBidSchema signedBuilderBidSchema =
schemaDefinitionsBellatrix.getSignedBuilderBidSchema();
return BuilderApiResponse.createTypeDefinition(
Expand Down Expand Up @@ -146,10 +147,10 @@ public SafeFuture<Response<BuilderPayload>> getPayload(
final SignedBeaconBlock signedBlindedBeaconBlock) {

final UInt64 blockSlot = signedBlindedBeaconBlock.getSlot();
final SpecMilestone milestone = schemaDefinitionCache.milestoneAtSlot(blockSlot);

final SpecVersion specVersion = spec.atSlot(blockSlot);
final SpecMilestone milestone = specVersion.getMilestone();
final SchemaDefinitionsBellatrix schemaDefinitionsBellatrix =
getSchemaDefinitionsBellatrix(milestone);
getSchemaDefinitionsBellatrix(specVersion);

final DeserializableTypeDefinition<SignedBeaconBlock> requestTypeDefinition =
schemaDefinitionsBellatrix.getSignedBlindedBeaconBlockSchema().getJsonTypeDefinition();
Expand Down Expand Up @@ -195,15 +196,14 @@ private <T extends BuilderPayload> BuilderPayload extractBuilderPayload(
return builderApiResponse.getData();
}

private SchemaDefinitionsBellatrix getSchemaDefinitionsBellatrix(
final SpecMilestone specMilestone) {
return schemaDefinitionCache
.getSchemaDefinition(specMilestone)
private SchemaDefinitionsBellatrix getSchemaDefinitionsBellatrix(final SpecVersion specVersion) {
return specVersion
.getSchemaDefinitions()
.toVersionBellatrix()
.orElseThrow(
() ->
new IllegalArgumentException(
specMilestone
specVersion.getMilestone()
+ " is not a supported milestone for the builder rest api. Milestones >= Bellatrix are supported."));
}
}