Change to constant

Consensys · Nov 25, 2024 · 9d5ea69 · 9d5ea69
1 parent 8a95412
commit 9d5ea69
Show file tree

Hide file tree

Showing 25 changed files with 18 additions and 107 deletions.
diff --git a/ethereum/networks/src/test/resources/tech/pegasys/teku/networks/test-constants.yaml b/ethereum/networks/src/test/resources/tech/pegasys/teku/networks/test-constants.yaml
@@ -180,5 +180,4 @@ SUBNETS_PER_NODE: 2
 ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
-ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
+ATTESTATION_SUBNET_PREFIX_BITS: 6
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfig.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfig.java
@@ -327,16 +327,6 @@ public int getMaxChunkSize() {
     return specConfig.getMaxChunkSize();
   }
 
-  @Override
-  public int getTtfbTimeout() {
-    return specConfig.getTtfbTimeout();
-  }
-
-  @Override
-  public int getRespTimeout() {
-    return specConfig.getRespTimeout();
-  }
-
   @Override
   public int getAttestationPropagationSlotRange() {
     return specConfig.getAttestationPropagationSlotRange();
@@ -392,11 +382,6 @@ public int getAttestationSubnetPrefixBits() {
     return specConfig.getAttestationSubnetPrefixBits();
   }
 
-  @Override
-  public int getMaxConcurrentRequests() {
-    return specConfig.getMaxConcurrentRequests();
-  }
-
   @Override
   public int getProposerScoreBoost() {
     return specConfig.getProposerScoreBoost();

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/NetworkingSpecConfig.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/NetworkingSpecConfig.java
@@ -27,12 +27,6 @@ public interface NetworkingSpecConfig {
 
   int getMinEpochsForBlockRequests();
 
-  // in seconds
-  int getTtfbTimeout();
-
-  // in seconds
-  int getRespTimeout();
-
   int getAttestationPropagationSlotRange();
 
   // in millis
@@ -54,8 +48,6 @@ public interface NetworkingSpecConfig {
   // int(ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS)
   int getAttestationSubnetPrefixBits();
 
-  int getMaxConcurrentRequests();
-
   default NetworkingSpecConfig getNetworkingConfig() {
     return this;
   }

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigPhase0.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigPhase0.java
@@ -107,8 +107,6 @@ public class SpecConfigPhase0 implements SpecConfig {
   private final int maxRequestBlocks;
   private final int epochsPerSubnetSubscription;
   private final int minEpochsForBlockRequests;
-  private final int ttfbTimeout;
-  private final int respTimeout;
   private final int attestationPropagationSlotRange;
   private final int maximumGossipClockDisparity;
   private final Bytes4 messageDomainInvalidSnappy;
@@ -117,7 +115,6 @@ public class SpecConfigPhase0 implements SpecConfig {
   private final int attestationSubnetCount;
   private final int attestationSubnetExtraBits;
   private final int attestationSubnetPrefixBits;
-  private final int maxConcurrentRequests;
   private final int reorgMaxEpochsSinceFinalization;
   private final int reorgHeadWeightThreshold;
   private final int reorgParentWeightThreshold;
@@ -180,8 +177,6 @@ public SpecConfigPhase0(
       final int maxRequestBlocks,
       final int epochsPerSubnetSubscription,
       final int minEpochsForBlockRequests,
-      final int ttfbTimeout,
-      final int respTimeout,
       final int attestationPropagationSlotRange,
       final int maximumGossipClockDisparity,
       final Bytes4 messageDomainInvalidSnappy,
@@ -190,7 +185,6 @@ public SpecConfigPhase0(
       final int attestationSubnetCount,
       final int attestationSubnetExtraBits,
       final int attestationSubnetPrefixBits,
-      final int maxConcurrentRequests,
       final int reorgMaxEpochsSinceFinalization,
       final int reorgHeadWeightThreshold,
       final int reorgParentWeightThreshold,
@@ -251,8 +245,6 @@ public SpecConfigPhase0(
     this.maxRequestBlocks = maxRequestBlocks;
     this.epochsPerSubnetSubscription = epochsPerSubnetSubscription;
     this.minEpochsForBlockRequests = minEpochsForBlockRequests;
-    this.ttfbTimeout = ttfbTimeout;
-    this.respTimeout = respTimeout;
     this.attestationPropagationSlotRange = attestationPropagationSlotRange;
     this.maximumGossipClockDisparity = maximumGossipClockDisparity;
     this.messageDomainInvalidSnappy = messageDomainInvalidSnappy;
@@ -261,7 +253,6 @@ public SpecConfigPhase0(
     this.attestationSubnetCount = attestationSubnetCount;
     this.attestationSubnetExtraBits = attestationSubnetExtraBits;
     this.attestationSubnetPrefixBits = attestationSubnetPrefixBits;
-    this.maxConcurrentRequests = maxConcurrentRequests;
     this.reorgMaxEpochsSinceFinalization = reorgMaxEpochsSinceFinalization;
     this.reorgHeadWeightThreshold = reorgHeadWeightThreshold;
     this.reorgParentWeightThreshold = reorgParentWeightThreshold;
@@ -588,16 +579,6 @@ public int getMinEpochsForBlockRequests() {
     return minEpochsForBlockRequests;
   }
 
-  @Override
-  public int getTtfbTimeout() {
-    return ttfbTimeout;
-  }
-
-  @Override
-  public int getRespTimeout() {
-    return respTimeout;
-  }
-
   @Override
   public int getAttestationPropagationSlotRange() {
     return attestationPropagationSlotRange;
@@ -638,11 +619,6 @@ public int getAttestationSubnetPrefixBits() {
     return attestationSubnetPrefixBits;
   }
 
-  @Override
-  public int getMaxConcurrentRequests() {
-    return maxConcurrentRequests;
-  }
-
   @Override
   public SpecMilestone getMilestone() {
     return SpecMilestone.PHASE0;
@@ -699,9 +675,6 @@ public boolean equals(final Object o) {
         && attestationSubnetCount == that.attestationSubnetCount
         && attestationSubnetExtraBits == that.attestationSubnetExtraBits
         && attestationSubnetPrefixBits == that.attestationSubnetPrefixBits
-        && maxConcurrentRequests == that.maxConcurrentRequests
-        && ttfbTimeout == that.ttfbTimeout
-        && respTimeout == that.respTimeout
         && attestationPropagationSlotRange == that.attestationPropagationSlotRange
         && maximumGossipClockDisparity == that.maximumGossipClockDisparity
         && Objects.equals(eth1FollowDistance, that.eth1FollowDistance)
@@ -781,16 +754,13 @@ public int hashCode() {
         maxChunkSize,
         maxRequestBlocks,
         epochsPerSubnetSubscription,
-        ttfbTimeout,
-        respTimeout,
         attestationPropagationSlotRange,
         maximumGossipClockDisparity,
         messageDomainInvalidSnappy,
         messageDomainValidSnappy,
         subnetsPerNode,
         attestationSubnetCount,
         attestationSubnetExtraBits,
-        attestationSubnetPrefixBits,
-        maxConcurrentRequests);
+        attestationSubnetPrefixBits);
   }
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigReader.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigReader.java
@@ -70,7 +70,9 @@ public class SpecConfigReader {
           "TRANSITION_TOTAL_DIFFICULTY",
           // Deprecated fields
           "GOSSIP_MAX_SIZE_BELLATRIX",
-          "MAX_CHUNK_SIZE_BELLATRIX");
+          "MAX_CHUNK_SIZE_BELLATRIX",
+          "TTFB_TIMEOUT",
+          "RESP_TIMEOUT");
   private static final ImmutableSet<String> CONSTANT_KEYS =
       ImmutableSet.of(
           // Phase0 constants which may exist in legacy config files, but should now be ignored

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/SpecConfigBuilder.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/SpecConfigBuilder.java
@@ -112,8 +112,6 @@ public class SpecConfigBuilder {
   private Integer maxChunkSize;
   private Integer maxRequestBlocks;
   private Integer epochsPerSubnetSubscription;
-  private Integer ttfbTimeout;
-  private Integer respTimeout;
   private Integer attestationPropagationSlotRange;
   private Integer maximumGossipClockDisparity;
   private Bytes4 messageDomainInvalidSnappy;
@@ -123,7 +121,6 @@ public class SpecConfigBuilder {
   private Integer attestationSubnetCount;
   private Integer attestationSubnetExtraBits;
   private Integer attestationSubnetPrefixBits;
-  private Integer maxConcurrentRequests;
 
   // added after Phase0, so add default values, or will be compatibility issue
   private Integer reorgMaxEpochsSinceFinalization = 2;
@@ -206,8 +203,6 @@ public SpecConfigAndParent<SpecConfigElectra> build() {
                 maxRequestBlocks,
                 epochsPerSubnetSubscription,
                 minEpochsForBlockRequests,
-                ttfbTimeout,
-                respTimeout,
                 attestationPropagationSlotRange,
                 maximumGossipClockDisparity,
                 messageDomainInvalidSnappy,
@@ -216,7 +211,6 @@ public SpecConfigAndParent<SpecConfigElectra> build() {
                 attestationSubnetCount,
                 attestationSubnetExtraBits,
                 attestationSubnetPrefixBits,
-                maxConcurrentRequests,
                 reorgMaxEpochsSinceFinalization,
                 reorgHeadWeightThreshold,
                 reorgParentWeightThreshold,
@@ -281,8 +275,6 @@ private Map<String, Object> getValidationMap() {
     constants.put("maxRequestBlocks", maxRequestBlocks);
     constants.put("epochsPerSubnetSubscription", epochsPerSubnetSubscription);
     constants.put("minEpochsForBlockRequests", minEpochsForBlockRequests);
-    constants.put("ttfbTimeout", ttfbTimeout);
-    constants.put("respTimeout", respTimeout);
     constants.put("attestationPropagationSlotRange", attestationPropagationSlotRange);
     constants.put("maximumGossipClockDisparity", maximumGossipClockDisparity);
     constants.put("messageDomainInvalidSnappy", messageDomainInvalidSnappy);
@@ -291,7 +283,6 @@ private Map<String, Object> getValidationMap() {
     constants.put("attestationSubnetCount", attestationSubnetCount);
     constants.put("attestationSubnetExtraBits", attestationSubnetExtraBits);
     constants.put("attestationSubnetPrefixBits", attestationSubnetPrefixBits);
-    constants.put("maxConcurrentRequests", maxConcurrentRequests);
     constants.put("reorgMaxEpochsSinceFinalization", reorgMaxEpochsSinceFinalization);
     constants.put("reorgHeadWeightThreshold", reorgHeadWeightThreshold);
     constants.put("reorgParentWeightThreshold", reorgParentWeightThreshold);
@@ -654,16 +645,6 @@ public SpecConfigBuilder minEpochsForBlockRequests(final Integer minEpochsForBlo
     return this;
   }
 
-  public SpecConfigBuilder ttfbTimeout(final Integer ttfbTimeout) {
-    this.ttfbTimeout = ttfbTimeout;
-    return this;
-  }
-
-  public SpecConfigBuilder respTimeout(final Integer respTimeout) {
-    this.respTimeout = respTimeout;
-    return this;
-  }
-
   public SpecConfigBuilder attestationPropagationSlotRange(
       final Integer attestationPropagationSlotRange) {
     this.attestationPropagationSlotRange = attestationPropagationSlotRange;
@@ -705,11 +686,6 @@ public SpecConfigBuilder attestationSubnetPrefixBits(final Integer attestationSu
     return this;
   }
 
-  public SpecConfigBuilder maxConcurrentRequests(final Integer maxConcurrentRequests) {
-    this.maxConcurrentRequests = maxConcurrentRequests;
-    return this;
-  }
-
   public SpecConfigBuilder reorgMaxEpochsSinceFinalization(
       final Integer reorgMaxEpochsSinceFinalization) {
     this.reorgMaxEpochsSinceFinalization = reorgMaxEpochsSinceFinalization;

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/constants/NetworkConstants.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/constants/NetworkConstants.java
@@ -20,4 +20,7 @@ public class NetworkConstants {
   public static final int DEFAULT_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY = 128;
 
   public static final int NODE_ID_BITS = 256;
+
+  // https://github.com/ethereum/consensus-specs/pull/3767
+  public static final int MAX_CONCURRENT_REQUESTS = 2;
 }
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml
@@ -124,7 +124,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml
@@ -113,7 +113,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml
@@ -123,7 +123,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/holesky.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/holesky.yaml
@@ -115,7 +115,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml
@@ -126,7 +126,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml
@@ -145,7 +145,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml
@@ -132,7 +132,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml
@@ -132,7 +132,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml
@@ -108,7 +108,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml
@@ -127,7 +127,6 @@ ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
 ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
 
 # Deneb
 # `2**7` (=128)

diff --git a/...eum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/missingAltairField.yaml b/...eum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/missingAltairField.yaml
@@ -235,5 +235,4 @@ SUBNETS_PER_NODE: 2
 ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
-ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
+ATTESTATION_SUBNET_PREFIX_BITS: 6
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/unknownField.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/unknownField.yaml
@@ -280,5 +280,4 @@ SUBNETS_PER_NODE: 2
 ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
-ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
+ATTESTATION_SUBNET_PREFIX_BITS: 6
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/with-overrides.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/with-overrides.yaml
@@ -106,5 +106,4 @@ SUBNETS_PER_NODE: 2
 ATTESTATION_SUBNET_COUNT: 64
 ATTESTATION_SUBNET_EXTRA_BITS: 0
 # ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS
-ATTESTATION_SUBNET_PREFIX_BITS: 6
-MAX_CONCURRENT_REQUESTS: 2
+ATTESTATION_SUBNET_PREFIX_BITS: 6