Introduces SchemaRegistry and related classes

ethereum/spec/src/main/java/tech/pegasys/teku/spec/SpecMilestone.java

@@ -46,6 +46,14 @@ public boolean isGreaterThanOrEqualTo(final SpecMilestone other) {
     return compareTo(other) >= 0;
   }
 
+  public boolean isGreaterThan(final SpecMilestone other) {
+    return compareTo(other) > 0;
+  }
+
+  public boolean isLessThanOrEqualTo(final SpecMilestone other) {
+    return compareTo(other) <= 0;
+  }
+
   /** Returns the milestone prior to this milestone */
   public SpecMilestone getPreviousMilestone() {
     if (equals(PHASE0)) {

ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/AbstractSchemaProvider.java

@@ -0,0 +1,82 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.schemas;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.util.EnumMap;
+import java.util.Map;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.config.SpecConfig;
+import tech.pegasys.teku.spec.schemas.SchemaTypes.SchemaId;
+
+public abstract class AbstractSchemaProvider<T> implements SchemaProvider<T> {
+  private final Map<SpecMilestone, SpecMilestone> milestoneToEffectiveMilestone =
+      new EnumMap<>(SpecMilestone.class);
+  private final SchemaId<T> schemaId;
+
+  protected AbstractSchemaProvider(final SchemaId<T> schemaId) {
+    this.schemaId = schemaId;
+  }
+
+  protected void addMilestoneMapping(
+      final SpecMilestone milestone, final SpecMilestone untilMilestone) {
+    checkArgument(
+        untilMilestone.isGreaterThan(milestone),
+        "%s must be earlier than %s",
+        milestone,
+        untilMilestone);
+
+    SpecMilestone currentMilestone = untilMilestone;
+    while (!currentMilestone.equals(milestone)) {
+
+      checkIfAlreadyMapped(currentMilestone);
+
+      milestoneToEffectiveMilestone.put(currentMilestone, milestone);
+
+      currentMilestone = currentMilestone.getPreviousMilestone();
+    }
+
+    checkIfAlreadyMapped(currentMilestone);
+  }
+
+  private void checkIfAlreadyMapped(final SpecMilestone milestone) {
+    if (milestoneToEffectiveMilestone.containsKey(milestone)) {
+      throw new IllegalArgumentException(
+          String.format(
+              "Milestone %s is already mapped to %s",
+              milestone, milestoneToEffectiveMilestone.get(milestone)));
+    }
+  }
+
+  @Override
+  public SpecMilestone getEffectiveMilestone(final SpecMilestone milestone) {
+    return milestoneToEffectiveMilestone.getOrDefault(milestone, milestone);
+  }
+
+  @Override
+  public T getSchema(final SchemaRegistry registry) {
+    final SpecMilestone milestone = registry.getMilestone();
+    final SpecMilestone effectiveMilestone = getEffectiveMilestone(milestone);
+    return createSchema(registry, effectiveMilestone, registry.getSpecConfig());
+  }
+
+  @Override
+  public SchemaId<T> getSchemaId() {
+    return schemaId;
+  }
+
+  protected abstract T createSchema(
+      SchemaRegistry registry, SpecMilestone baseVersion, SpecConfig specConfig);
+}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaCache.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.schemas;
+
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.Map;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.schemas.SchemaTypes.SchemaId;
+
+public interface SchemaCache {
+  static SchemaCache createDefault() {
+    return new SchemaCache() {
+      private final Map<SpecMilestone, Map<SchemaId<?>, Object>> cache =
+          new EnumMap<>(SpecMilestone.class);
+
+      @SuppressWarnings("unchecked")
+      @Override
+      public <T> T get(final SpecMilestone milestone, final SchemaId<T> schemaId) {
+        return (T) cache.computeIfAbsent(milestone, __ -> new HashMap<>()).get(schemaId);
+      }
+
+      @Override
+      public <T> void put(
+          final SpecMilestone milestone, final SchemaId<T> schemaId, final T schema) {
+        cache.computeIfAbsent(milestone, __ -> new HashMap<>()).put(schemaId, schema);
+      }
+    };
+  }
+
+  <T> T get(SpecMilestone milestone, SchemaId<T> schemaId);
+
+  <T> void put(SpecMilestone milestone, SchemaId<T> schemaId, T schema);
+}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaProvider.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.schemas;
+
+import static tech.pegasys.teku.spec.SpecMilestone.BELLATRIX;
+import static tech.pegasys.teku.spec.SpecMilestone.CAPELLA;
+import static tech.pegasys.teku.spec.SpecMilestone.DENEB;
+import static tech.pegasys.teku.spec.SpecMilestone.ELECTRA;
+
+import java.util.EnumSet;
+import java.util.Set;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.schemas.SchemaTypes.SchemaId;
+
+public interface SchemaProvider<T> {
+  Set<SpecMilestone> ALL_MILESTONES = EnumSet.allOf(SpecMilestone.class);
+  Set<SpecMilestone> FROM_BELLATRIX = from(BELLATRIX);
+  Set<SpecMilestone> FROM_CAPELLA = from(CAPELLA);
+  Set<SpecMilestone> FROM_DENEB = from(DENEB);
+  Set<SpecMilestone> FROM_ELECTRA = from(ELECTRA);
+
+  static Set<SpecMilestone> from(final SpecMilestone milestone) {
+    return EnumSet.copyOf(SpecMilestone.getAllMilestonesFrom(milestone));
+  }
+
+  static Set<SpecMilestone> fromTo(
+      final SpecMilestone fromMilestone, final SpecMilestone toMilestone) {
+    return EnumSet.copyOf(
+        SpecMilestone.getAllMilestonesFrom(fromMilestone).stream()
+            .filter(toMilestone::isLessThanOrEqualTo)
+            .toList());
+  }
+
+  T getSchema(SchemaRegistry registry);
+
+  Set<SpecMilestone> getSupportedMilestones();
+
+  SpecMilestone getEffectiveMilestone(SpecMilestone version);
+
+  SchemaId<T> getSchemaId();
+}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaRegistry.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.schemas;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.HashMap;
+import java.util.Map;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.config.SpecConfig;
+import tech.pegasys.teku.spec.schemas.SchemaTypes.SchemaId;
+
+public class SchemaRegistry {
+  private final Map<SchemaId<?>, SchemaProvider<?>> providers = new HashMap<>();
+  private final SpecMilestone milestone;
+  private final SchemaCache cache;
+  private final SpecConfig specConfig;
+
+  public SchemaRegistry(
+      final SpecMilestone milestone, final SpecConfig specConfig, final SchemaCache cache) {
+    this.milestone = milestone;
+    this.specConfig = specConfig;
+    this.cache = cache;
+  }
+
+  public void registerProvider(final SchemaProvider<?> provider) {
+    providers.put(provider.getSchemaId(), provider);
+  }
+
+  @VisibleForTesting
+  boolean isProviderRegistered(final SchemaProvider<?> provider) {
+    return provider.equals(providers.get(provider.getSchemaId()));
+  }
+
+  @SuppressWarnings("unchecked")
+  public <T> T get(final SchemaId<T> schemaClass) {
+    SchemaProvider<T> provider = (SchemaProvider<T>) providers.get(schemaClass);
+    if (provider == null) {
+      throw new IllegalArgumentException(
+          "No provider registered for schema "
+              + schemaClass
+              + " or it does not support milestone "
+              + milestone);
+    }
+    T schema = cache.get(milestone, schemaClass);
+    if (schema != null) {
+      return schema;
+    }
+    final SpecMilestone effectiveMilestone = provider.getEffectiveMilestone(milestone);
+    if (effectiveMilestone != milestone) {
+      schema = cache.get(effectiveMilestone, schemaClass);
+      if (schema != null) {
+        cache.put(milestone, schemaClass, schema);
+        return schema;
+      }
+    }
+    schema = provider.getSchema(this);
+    cache.put(effectiveMilestone, schemaClass, schema);
+    if (effectiveMilestone != milestone) {
+      cache.put(milestone, schemaClass, schema);
+    }
+    return schema;
+  }
+
+  public SpecMilestone getMilestone() {
+    return milestone;
+  }
+
+  public SpecConfig getSpecConfig() {
+    return specConfig;
+  }
+
+  public void primeRegistry() {
+    for (final SchemaId<?> schemaClass : providers.keySet()) {
+      get(schemaClass);
+    }
+  }
+}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaRegistryBuilder.java

@@ -0,0 +1,57 @@
+/*
+ * Copyright Consensys Software Inc., 2024
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+package tech.pegasys.teku.spec.schemas;
+
+import com.google.common.annotations.VisibleForTesting;
+import java.util.ArrayList;
+import java.util.List;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.config.SpecConfig;
+
+public class SchemaRegistryBuilder {
+  private final List<SchemaProvider<?>> providers = new ArrayList<>();
+  private final SchemaCache cache;
+
+  public static SchemaRegistryBuilder create() {
+    return new SchemaRegistryBuilder();
+  }
+
+  public SchemaRegistryBuilder() {
+    this.cache = SchemaCache.createDefault();
+  }
+
+  @VisibleForTesting
+  SchemaRegistryBuilder(final SchemaCache cache) {
+    this.cache = cache;
+  }
+
+  public <T> SchemaRegistryBuilder addProvider(final SchemaProvider<T> provider) {
+    providers.add(provider);
+    return this;
+  }
+
+  public SchemaRegistry build(final SpecMilestone milestone, final SpecConfig specConfig) {
+    final SchemaRegistry registry = new SchemaRegistry(milestone, specConfig, cache);
+
+    for (final SchemaProvider<?> provider : providers) {
+      if (provider.getSupportedMilestones().contains(milestone)) {
+        registry.registerProvider(provider);
+      }
+    }
+
+    registry.primeRegistry();
+
+    return registry;
+  }
+}