update mischelpers with new parameters

Consensys · Nov 5, 2024 · 357237c · 357237c
1 parent fbfb8a2
commit 357237c
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 3 deletions.
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/Spec.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/Spec.java
@@ -17,6 +17,7 @@
 import static tech.pegasys.teku.infrastructure.time.TimeUtilities.millisToSeconds;
 import static tech.pegasys.teku.infrastructure.time.TimeUtilities.secondsToMillis;
 import static tech.pegasys.teku.spec.SpecMilestone.DENEB;
+import static tech.pegasys.teku.spec.SpecMilestone.ELECTRA;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Preconditions;
@@ -48,9 +49,11 @@
 import tech.pegasys.teku.spec.cache.IndexedAttestationCache;
 import tech.pegasys.teku.spec.config.NetworkingSpecConfig;
 import tech.pegasys.teku.spec.config.NetworkingSpecConfigDeneb;
+import tech.pegasys.teku.spec.config.NetworkingSpecConfigElectra;
 import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.config.SpecConfigAltair;
 import tech.pegasys.teku.spec.config.SpecConfigDeneb;
+import tech.pegasys.teku.spec.config.SpecConfigElectra;
 import tech.pegasys.teku.spec.constants.Domain;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
@@ -220,6 +223,16 @@ public Optional<NetworkingSpecConfigDeneb> getNetworkingConfigDeneb() {
         .map(specConfig -> (NetworkingSpecConfigDeneb) specConfig.getNetworkingConfig());
   }
 
+  /**
+   * Networking config with Electra constants. Use {@link SpecConfigElectra#required(SpecConfig)}
+   * when you are sure that Electra is available, otherwise use this method
+   */
+  public Optional<NetworkingSpecConfigElectra> getNetworkingConfigElectra() {
+    return Optional.ofNullable(forMilestone(ELECTRA))
+        .map(SpecVersion::getConfig)
+        .map(specConfig -> (NetworkingSpecConfigElectra) specConfig.getNetworkingConfig());
+  }
+
   public SchemaDefinitions getGenesisSchemaDefinitions() {
     return getGenesisSpec().getSchemaDefinitions();
   }
@@ -945,9 +958,9 @@ public Optional<Integer> getMaxBlobsPerBlock(final UInt64 slot) {
   }
 
   public UInt64 computeSubnetForBlobSidecar(final BlobSidecar blobSidecar) {
-    final SpecConfig config = atSlot(blobSidecar.getSlot()).getConfig();
-    final SpecConfigDeneb specConfigDeneb = SpecConfigDeneb.required(config);
-    return blobSidecar.getIndex().mod(specConfigDeneb.getBlobSidecarSubnetCount());
+    return blobSidecar
+        .getIndex()
+        .mod(atSlot(blobSidecar.getSlot()).miscHelpers().getBlobSidecarSubnetCount());
   }
 
   public Optional<UInt64> computeFirstSlotWithBlobSupport() {

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/helpers/MiscHelpers.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/logic/common/helpers/MiscHelpers.java
@@ -40,6 +40,7 @@
 import tech.pegasys.teku.spec.constants.NetworkConstants;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.BeaconBlock;
+import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.state.ForkData;
 import tech.pegasys.teku.spec.datastructures.state.SigningData;
 import tech.pegasys.teku.spec.datastructures.state.Validator;
@@ -387,6 +388,22 @@ public UInt64 getMaxRequestBlocks() {
     return UInt64.valueOf(specConfig.getNetworkingConfig().getMaxRequestBlocks());
   }
 
+  public int getMaxRequestBlobSidecars() {
+    throw new UnsupportedOperationException("No Blob Sidecars before Deneb");
+  }
+
+  public int getMaxBlobsPerBlock() {
+    throw new UnsupportedOperationException("No Blob Sidecars before Deneb");
+  }
+
+  public int getBlobSidecarSubnetCount() {
+    throw new UnsupportedOperationException("No Blob Sidecars before Deneb");
+  }
+
+  public int getBlobKzgCommitmentsCount(final SignedBeaconBlock signedBeaconBlock) {
+    throw new UnsupportedOperationException("No Blob KZG Commitments before Deneb");
+  }
+
   public UInt64 getMaxEffectiveBalance(final Validator validator) {
     return specConfig.getMaxEffectiveBalance();
   }

diff --git a/...c/src/main/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/MiscHelpersDeneb.java b/...c/src/main/java/tech/pegasys/teku/spec/logic/versions/deneb/helpers/MiscHelpersDeneb.java
@@ -211,6 +211,22 @@ public Optional<MiscHelpersDeneb> toVersionDeneb() {
     return Optional.of(this);
   }
 
+  @Override
+  public int getMaxRequestBlobSidecars() {
+    return SpecConfigDeneb.required(specConfig).getMaxRequestBlobSidecars();
+  }
+
+  @Override
+  public int getMaxBlobsPerBlock() {
+    return SpecConfigDeneb.required(specConfig).getMaxBlobsPerBlock();
+  }
+
+  @Override
+  public int getBlobSidecarSubnetCount() {
+    return SpecConfigDeneb.required(specConfig).getBlobSidecarSubnetCount();
+  }
+
+  @Override
   public int getBlobKzgCommitmentsCount(final SignedBeaconBlock signedBeaconBlock) {
     return signedBeaconBlock
         .getMessage()

diff --git a/...c/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectra.java b/...c/main/java/tech/pegasys/teku/spec/logic/versions/electra/helpers/MiscHelpersElectra.java
@@ -85,4 +85,19 @@ public boolean isFormerDepositMechanismDisabled(final BeaconState state) {
         .getEth1DepositIndex()
         .equals(BeaconStateElectra.required(state).getDepositRequestsStartIndex());
   }
+
+  @Override
+  public int getMaxRequestBlobSidecars() {
+    return SpecConfigElectra.required(specConfig).getMaxRequestBlobSidecarsElectra();
+  }
+
+  @Override
+  public int getMaxBlobsPerBlock() {
+    return SpecConfigElectra.required(specConfig).getMaxBlobsPerBlockElectra();
+  }
+
+  @Override
+  public int getBlobSidecarSubnetCount() {
+    return SpecConfigElectra.required(specConfig).getBlobSidecarSubnetCountElectra();
+  }
 }