From 81ed42f8cd42c217fb01b2c4edeb513f180c0e2f Mon Sep 17 00:00:00 2001
From: Paul Harris <paul.harris@consensys.net>
Date: Fri, 2 Jun 2023 11:08:41 +1000
Subject: [PATCH] Fixed gossipMaxSize and maxChunkSize to use bellatrix
 derivitives and be in presets properly. (#7217)

Signed-off-by: Paul Harris <paul.harris@consensys.net>
---
 .../config/DelegatingSpecConfigBellatrix.java | 10 +++++++
 .../teku/spec/config/SpecConfigBellatrix.java |  4 +++
 .../spec/config/SpecConfigBellatrixImpl.java  | 26 +++++++++++++++++--
 .../teku/spec/config/SpecConfigPhase0.java    |  6 ++++-
 .../spec/config/builder/BellatrixBuilder.java | 19 +++++++++++++-
 .../teku/spec/config/configs/mainnet.yaml     |  4 ---
 .../teku/spec/config/configs/minimal.yaml     |  4 ---
 .../spec/config/presets/gnosis/bellatrix.yaml |  6 ++---
 .../spec/config/presets/gnosis/phase0.yaml    | 10 ++++++-
 .../config/presets/mainnet/bellatrix.yaml     |  6 ++---
 .../spec/config/presets/mainnet/phase0.yaml   | 10 ++++++-
 .../config/presets/minimal/bellatrix.yaml     |  6 ++---
 .../spec/config/presets/minimal/phase0.yaml   | 10 ++++++-
 .../spec/config/presets/swift/bellatrix.yaml  |  6 ++---
 .../spec/config/presets/swift/phase0.yaml     | 10 ++++++-
 .../spec/config/SpecConfigBellatrixTest.java  |  3 ++-
 .../standard/presets/mainnet/bellatrix.yaml   |  6 ++---
 .../standard/presets/mainnet/phase0.yaml      | 10 ++++++-
 .../standard/presets/minimal/bellatrix.yaml   |  6 ++---
 .../standard/presets/minimal/phase0.yaml      | 10 ++++++-
 .../standard/presets/swift/bellatrix.yaml     |  6 ++---
 .../config/standard/presets/swift/phase0.yaml | 10 ++++++-
 .../eth2/Eth2P2PNetworkBuilder.java           |  5 +++-
 .../GossipForkSubscriptionsBellatrix.java     |  8 ++++++
 .../GossipForkSubscriptionsCapella.java       |  4 +--
 .../GossipForkSubscriptionsDeneb.java         |  4 +--
 .../GossipForkSubscriptionsPhase0.java        | 24 ++++++++---------
 .../BlobSidecarsByRootMessageHandlerTest.java |  6 +++--
 28 files changed, 176 insertions(+), 63 deletions(-)

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigBellatrix.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigBellatrix.java
index f0df2744c42..0bc8e98cdd2 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigBellatrix.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfigBellatrix.java
@@ -97,4 +97,14 @@ public UInt256 getTerminalTotalDifficulty() {
   public int getSafeSlotsToImportOptimistically() {
     return specConfigBellatrix.getSafeSlotsToImportOptimistically();
   }
+
+  @Override
+  public int getGossipMaxSizeBellatrix() {
+    return specConfigBellatrix.getGossipMaxSizeBellatrix();
+  }
+
+  @Override
+  public int getMaxChunkSizeBellatrix() {
+    return specConfigBellatrix.getMaxChunkSizeBellatrix();
+  }
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrix.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrix.java
index 70cbda5c1ef..093cd35d335 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrix.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrix.java
@@ -59,4 +59,8 @@ static SpecConfigBellatrix required(SpecConfig specConfig) {
   UInt256 getTerminalTotalDifficulty();
 
   int getSafeSlotsToImportOptimistically();
+
+  int getGossipMaxSizeBellatrix();
+
+  int getMaxChunkSizeBellatrix();
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixImpl.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixImpl.java
index 394f7ebc487..8d39251faca 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixImpl.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixImpl.java
@@ -42,6 +42,10 @@ public class SpecConfigBellatrixImpl extends DelegatingSpecConfigAltair
   // Optimistic Sync
   private final int safeSlotsToImportOptimistically;
 
+  // network
+  private final int gossipMaxSizeBellatrix;
+  private final int maxChunkSizeBellatrix;
+
   public SpecConfigBellatrixImpl(
       final SpecConfigAltair specConfig,
       final Bytes4 bellatrixForkVersion,
@@ -56,7 +60,9 @@ public SpecConfigBellatrixImpl(
       final UInt256 terminalTotalDifficulty,
       final Bytes32 terminalBlockHash,
       final UInt64 terminalBlockHashActivationEpoch,
-      final int safeSlotsToImportOptimistically) {
+      final int safeSlotsToImportOptimistically,
+      final int gossipMaxSizeBellatrix,
+      final int maxChunkSizeBellatrix) {
     super(specConfig);
     this.bellatrixForkVersion = bellatrixForkVersion;
     this.bellatrixForkEpoch = bellatrixForkEpoch;
@@ -71,6 +77,8 @@ public SpecConfigBellatrixImpl(
     this.terminalBlockHash = terminalBlockHash;
     this.terminalBlockHashActivationEpoch = terminalBlockHashActivationEpoch;
     this.safeSlotsToImportOptimistically = safeSlotsToImportOptimistically;
+    this.gossipMaxSizeBellatrix = gossipMaxSizeBellatrix;
+    this.maxChunkSizeBellatrix = maxChunkSizeBellatrix;
   }
 
   public static SpecConfigBellatrix required(final SpecConfig specConfig) {
@@ -148,6 +156,16 @@ public int getSafeSlotsToImportOptimistically() {
     return safeSlotsToImportOptimistically;
   }
 
+  @Override
+  public int getGossipMaxSizeBellatrix() {
+    return gossipMaxSizeBellatrix;
+  }
+
+  @Override
+  public int getMaxChunkSizeBellatrix() {
+    return maxChunkSizeBellatrix;
+  }
+
   @Override
   public Optional<SpecConfigBellatrix> toVersionBellatrix() {
     return Optional.of(this);
@@ -169,6 +187,8 @@ public boolean equals(final Object o) {
         && maxTransactionsPerPayload == that.maxTransactionsPerPayload
         && bytesPerLogsBloom == that.bytesPerLogsBloom
         && maxExtraDataBytes == that.maxExtraDataBytes
+        && gossipMaxSizeBellatrix == that.gossipMaxSizeBellatrix
+        && maxChunkSizeBellatrix == that.maxChunkSizeBellatrix
         && Objects.equals(bellatrixForkVersion, that.bellatrixForkVersion)
         && Objects.equals(bellatrixForkEpoch, that.bellatrixForkEpoch)
         && Objects.equals(
@@ -193,6 +213,8 @@ public int hashCode() {
         maxExtraDataBytes,
         terminalTotalDifficulty,
         terminalBlockHash,
-        terminalBlockHashActivationEpoch);
+        terminalBlockHashActivationEpoch,
+        gossipMaxSizeBellatrix,
+        maxChunkSizeBellatrix);
   }
 }
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
index a8db413c0f3..1748a84d35e 100644
--- 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
@@ -549,6 +549,8 @@ public boolean equals(final Object o) {
         && proposerScoreBoost == that.proposerScoreBoost
         && depositChainId == that.depositChainId
         && depositNetworkId == that.depositNetworkId
+        && gossipMaxSize == that.gossipMaxSize
+        && maxChunkSize == that.maxChunkSize
         && Objects.equals(eth1FollowDistance, that.eth1FollowDistance)
         && Objects.equals(minGenesisTime, that.minGenesisTime)
         && Objects.equals(hysteresisQuotient, that.hysteresisQuotient)
@@ -621,6 +623,8 @@ public int hashCode() {
         depositChainId,
         depositNetworkId,
         depositContractAddress,
-        progressiveBalancesMode);
+        progressiveBalancesMode,
+        gossipMaxSize,
+        maxChunkSize);
   }
 }
diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/BellatrixBuilder.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/BellatrixBuilder.java
index af192fb86b6..e6c63bb20f7 100644
--- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/BellatrixBuilder.java
+++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/BellatrixBuilder.java
@@ -48,6 +48,9 @@ public class BellatrixBuilder implements ForkConfigBuilder<SpecConfigAltair, Spe
   // Optimistic Sync
   private int safeSlotsToImportOptimistically = DEFAULT_SAFE_SLOTS_TO_IMPORT_OPTIMISTICALLY;
 
+  private int gossipMaxSizeBellatrix;
+  private int maxChunkSizeBellatrix;
+
   BellatrixBuilder() {}
 
   @Override
@@ -66,7 +69,9 @@ public SpecConfigBellatrix build(final SpecConfigAltair specConfig) {
         terminalTotalDifficulty,
         terminalBlockHash,
         terminalBlockHashActivationEpoch,
-        safeSlotsToImportOptimistically);
+        safeSlotsToImportOptimistically,
+        gossipMaxSizeBellatrix,
+        maxChunkSizeBellatrix);
   }
 
   @Override
@@ -87,6 +92,8 @@ public void validate() {
     SpecBuilderUtil.validateConstant("maxTransactionsPerPayload", maxTransactionsPerPayload);
     SpecBuilderUtil.validateConstant("bytesPerLogsBloom", bytesPerLogsBloom);
     SpecBuilderUtil.validateConstant("maxExtraDataBytes", maxExtraDataBytes);
+    SpecBuilderUtil.validateConstant("gossipMaxSizeBellatrix", gossipMaxSizeBellatrix);
+    SpecBuilderUtil.validateConstant("maxChunkSizeBellatrix", maxChunkSizeBellatrix);
 
     // temporary, provide default values for backward compatibility
     if (terminalTotalDifficulty == null) {
@@ -182,4 +189,14 @@ public BellatrixBuilder safeSlotsToImportOptimistically(
     this.safeSlotsToImportOptimistically = safeSlotsToImportOptimistically;
     return this;
   }
+
+  public BellatrixBuilder gossipMaxSizeBellatrix(final int gossipMaxSizeBellatrix) {
+    this.gossipMaxSizeBellatrix = gossipMaxSizeBellatrix;
+    return this;
+  }
+
+  public BellatrixBuilder maxChunkSizeBellatrix(final int maxChunkSizeBellatrix) {
+    this.maxChunkSizeBellatrix = maxChunkSizeBellatrix;
+    return this;
+  }
 }
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
index 74314b9c656..745c3615cee 100644
--- 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
@@ -97,16 +97,12 @@ DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
 
 # Networking
 # ---------------------------------------------------------------
-# `2**20` (= 1048576, 1 MiB)
-GOSSIP_MAX_SIZE: 1048576
 # `2**10` (= 1024)
 #MAX_REQUEST_BLOCKS: 1024
 ## `2**8` (= 256)
 #EPOCHS_PER_SUBNET_SUBSCRIPTION: 256
 ## `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 33024, ~5 months)
 #MIN_EPOCHS_FOR_BLOCK_REQUESTS: 33024
-# `2**20` (=1048576, 1 MiB)
-MAX_CHUNK_SIZE: 1048576
 ## 5s
 #TTFB_TIMEOUT: 5
 ## 10s
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
index 532cdcc12a4..b23e70ec447 100644
--- 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
@@ -96,16 +96,12 @@ DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
 
 # Networking
 # ---------------------------------------------------------------
-# `2**20` (= 1048576, 1 MiB)
-GOSSIP_MAX_SIZE: 1048576
 # `2**10` (= 1024)
 #MAX_REQUEST_BLOCKS: 1024
 ## `2**8` (= 256)
 #EPOCHS_PER_SUBNET_SUBSCRIPTION: 256
 ## [customized] `MIN_VALIDATOR_WITHDRAWABILITY_DELAY + CHURN_LIMIT_QUOTIENT // 2` (= 272)
 #MIN_EPOCHS_FOR_BLOCK_REQUESTS: 272
-# `2**20` (=1048576, 1 MiB)
-MAX_CHUNK_SIZE: 1048576
 ## 5s
 #TTFB_TIMEOUT: 5
 ## 10s
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/bellatrix.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/bellatrix.yaml
index 5f66126d0e0..685707ec6bb 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/bellatrix.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/bellatrix.yaml
@@ -24,7 +24,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/phase0.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/phase0.yaml
index e3657471823..d46631d0dbe 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/phase0.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/gnosis/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/bellatrix.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/bellatrix.yaml
index fa3ffad950f..fcfdc627070 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/bellatrix.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/phase0.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/phase0.yaml
index c359059f2e1..23ec7f16bb1 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/phase0.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/mainnet/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/bellatrix.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/bellatrix.yaml
index 5cd272cec30..cb131f67eea 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/bellatrix.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/phase0.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/phase0.yaml
index 636445e8a69..6ed74892f98 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/phase0.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/minimal/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/bellatrix.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/bellatrix.yaml
index 5cd272cec30..cb131f67eea 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/bellatrix.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/phase0.yaml b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/phase0.yaml
index da11380f236..2ea9aa2e76f 100644
--- a/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/phase0.yaml
+++ b/ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/presets/swift/phase0.yaml
@@ -95,4 +95,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixTest.java b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixTest.java
index 59f43c2d76d..86b4b63916a 100644
--- a/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixTest.java
+++ b/ethereum/spec/src/test/java/tech/pegasys/teku/spec/config/SpecConfigBellatrixTest.java
@@ -38,7 +38,6 @@ public void equals_mainnet() {
   public void equals_sameRandomValues() {
     SpecConfigAltair altair =
         SpecConfigLoader.loadConfig("mainnet").toVersionAltair().orElseThrow();
-    ;
     SpecConfigBellatrix configA = createRandomBellatrixConfig(altair, 1);
     SpecConfigBellatrix configB = createRandomBellatrixConfig(altair, 1);
 
@@ -94,6 +93,8 @@ private SpecConfigBellatrix createRandomBellatrixConfig(
         dataStructureUtil.randomUInt256(),
         dataStructureUtil.randomBytes32(),
         dataStructureUtil.randomUInt64(),
+        dataStructureUtil.randomPositiveInt(),
+        dataStructureUtil.randomPositiveInt(),
         dataStructureUtil.randomPositiveInt());
   }
 }
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/bellatrix.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/bellatrix.yaml
index fa3ffad950f..fcfdc627070 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/bellatrix.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/phase0.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/phase0.yaml
index c359059f2e1..23ec7f16bb1 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/phase0.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/mainnet/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/bellatrix.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/bellatrix.yaml
index 5cd272cec30..cb131f67eea 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/bellatrix.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/phase0.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/phase0.yaml
index 636445e8a69..6ed74892f98 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/phase0.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/minimal/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/bellatrix.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/bellatrix.yaml
index 5cd272cec30..cb131f67eea 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/bellatrix.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/bellatrix.yaml
@@ -23,7 +23,7 @@ MAX_EXTRA_DATA_BYTES: 32
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+GOSSIP_MAX_SIZE_BELLATRIX: 10485760
 
-# `10 * 2**20` (= 10485760, 10 MiB)
-MAX_CHUNK_SIZE: 10485760
\ No newline at end of file
+# `10 * 2**20` (= 10,485,760, 10 MiB)
+MAX_CHUNK_SIZE_BELLATRIX: 10485760
\ No newline at end of file
diff --git a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/phase0.yaml b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/phase0.yaml
index 3ee65f0983a..96a1f039278 100644
--- a/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/phase0.yaml
+++ b/ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/presets/swift/phase0.yaml
@@ -91,4 +91,12 @@ MAX_ATTESTATIONS: 128
 # 2**4 (= 16)
 MAX_DEPOSITS: 16
 # 2**4 (= 16)
-MAX_VOLUNTARY_EXITS: 16
\ No newline at end of file
+MAX_VOLUNTARY_EXITS: 16
+
+
+# Networking
+# ---------------------------------------------------------------
+# `2**20` (= 1048576, 1 MiB)
+GOSSIP_MAX_SIZE: 1048576
+# `2**20` (=1048576, 1 MiB)
+MAX_CHUNK_SIZE: 1048576
\ No newline at end of file
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/Eth2P2PNetworkBuilder.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/Eth2P2PNetworkBuilder.java
index 92c993867c4..64fbe0c7ac8 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/Eth2P2PNetworkBuilder.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/Eth2P2PNetworkBuilder.java
@@ -65,6 +65,7 @@
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.SpecMilestone;
 import tech.pegasys.teku.spec.config.Constants;
+import tech.pegasys.teku.spec.config.SpecConfigBellatrix;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.SignedBlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
@@ -135,7 +136,9 @@ public Eth2P2PNetwork build() {
     final RpcEncoding rpcEncoding =
         RpcEncoding.createSszSnappyEncoding(
             spec.isMilestoneSupported(SpecMilestone.BELLATRIX)
-                ? spec.forMilestone(SpecMilestone.BELLATRIX).getConfig().getMaxChunkSize()
+                ? SpecConfigBellatrix.required(
+                        spec.forMilestone(SpecMilestone.BELLATRIX).getConfig())
+                    .getMaxChunkSizeBellatrix()
                 : spec.forMilestone(SpecMilestone.PHASE0).getConfig().getMaxChunkSize());
     if (statusMessageFactory == null) {
       statusMessageFactory = new StatusMessageFactory(combinedChainDataClient.getRecentChainData());
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsBellatrix.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsBellatrix.java
index 9d6a94b533e..724b3652b40 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsBellatrix.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsBellatrix.java
@@ -19,6 +19,8 @@
 import tech.pegasys.teku.networking.eth2.gossip.topics.OperationProcessor;
 import tech.pegasys.teku.networking.p2p.discovery.DiscoveryNetwork;
 import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.spec.SpecMilestone;
+import tech.pegasys.teku.spec.config.SpecConfigBellatrix;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
@@ -66,4 +68,10 @@ public GossipForkSubscriptionsBellatrix(
         signedContributionAndProofOperationProcessor,
         syncCommitteeMessageOperationProcessor);
   }
+
+  @Override
+  protected int getMessageMaxSize() {
+    return SpecConfigBellatrix.required(spec.forMilestone(SpecMilestone.BELLATRIX).getConfig())
+        .getGossipMaxSizeBellatrix();
+  }
 }
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsCapella.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsCapella.java
index 8506f74591c..ea295a9c316 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsCapella.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsCapella.java
@@ -23,7 +23,6 @@
 import tech.pegasys.teku.networking.eth2.gossip.topics.OperationProcessor;
 import tech.pegasys.teku.networking.p2p.discovery.DiscoveryNetwork;
 import tech.pegasys.teku.spec.Spec;
-import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
@@ -93,7 +92,6 @@ void addSignedBlsToExecutionChangeGossipManager(final ForkInfo forkInfo) {
       final SchemaDefinitionsCapella schemaDefinitions =
           SchemaDefinitionsCapella.required(
               spec.atEpoch(getActivationEpoch()).getSchemaDefinitions());
-      final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
 
       final SignedBlsToExecutionChangeGossipManager gossipManager =
           new SignedBlsToExecutionChangeGossipManager(
@@ -104,7 +102,7 @@ void addSignedBlsToExecutionChangeGossipManager(final ForkInfo forkInfo) {
               gossipEncoding,
               forkInfo,
               signedBlsToExecutionChangeOperationProcessor,
-              specConfig.getGossipMaxSize());
+              getMessageMaxSize());
 
       addGossipManager(gossipManager);
       this.signedBlsToExecutionChangeGossipManager = Optional.of(gossipManager);
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsDeneb.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsDeneb.java
index 8a5d75ce3dc..e9cac815c67 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsDeneb.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsDeneb.java
@@ -21,7 +21,6 @@
 import tech.pegasys.teku.networking.eth2.gossip.topics.OperationProcessor;
 import tech.pegasys.teku.networking.p2p.discovery.DiscoveryNetwork;
 import tech.pegasys.teku.spec.Spec;
-import tech.pegasys.teku.spec.config.SpecConfig;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.SignedBlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
@@ -91,7 +90,6 @@ protected void addGossipManagers(final ForkInfo forkInfo) {
   }
 
   void addBlobSidecarGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     blobSidecarGossipManager =
         BlobSidecarGossipManager.create(
             recentChainData,
@@ -101,7 +99,7 @@ void addBlobSidecarGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             blobSidecarProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(blobSidecarGossipManager);
   }
 
diff --git a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsPhase0.java b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsPhase0.java
index 34554a64294..90b462ae4ed 100644
--- a/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsPhase0.java
+++ b/networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/forks/versions/GossipForkSubscriptionsPhase0.java
@@ -32,7 +32,7 @@
 import tech.pegasys.teku.networking.eth2.gossip.topics.OperationProcessor;
 import tech.pegasys.teku.networking.p2p.discovery.DiscoveryNetwork;
 import tech.pegasys.teku.spec.Spec;
-import tech.pegasys.teku.spec.config.SpecConfig;
+import tech.pegasys.teku.spec.SpecMilestone;
 import tech.pegasys.teku.spec.datastructures.attestation.ValidatableAttestation;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.operations.AttesterSlashing;
@@ -114,7 +114,6 @@ public final void startGossip(
   }
 
   void addAttestationGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     AttestationSubnetSubscriptions attestationSubnetSubscriptions =
         new AttestationSubnetSubscriptions(
             spec,
@@ -124,7 +123,7 @@ void addAttestationGossipManager(final ForkInfo forkInfo) {
             recentChainData,
             attestationProcessor,
             forkInfo,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
 
     attestationGossipManager =
         new AttestationGossipManager(metricsSystem, attestationSubnetSubscriptions);
@@ -132,7 +131,6 @@ void addAttestationGossipManager(final ForkInfo forkInfo) {
   }
 
   void addBlockGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     blockGossipManager =
         new BlockGossipManager(
             recentChainData,
@@ -142,12 +140,11 @@ void addBlockGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             blockProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(blockGossipManager);
   }
 
   void addAggregateGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     aggregateGossipManager =
         new AggregateGossipManager(
             spec,
@@ -157,12 +154,11 @@ void addAggregateGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             aggregateProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(aggregateGossipManager);
   }
 
   void addVoluntaryExitGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     voluntaryExitGossipManager =
         new VoluntaryExitGossipManager(
             recentChainData,
@@ -171,12 +167,11 @@ void addVoluntaryExitGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             voluntaryExitProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(voluntaryExitGossipManager);
   }
 
   void addProposerSlashingGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     proposerSlashingGossipManager =
         new ProposerSlashingGossipManager(
             recentChainData,
@@ -185,12 +180,11 @@ void addProposerSlashingGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             proposerSlashingProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(proposerSlashingGossipManager);
   }
 
   void addAttesterSlashingGossipManager(final ForkInfo forkInfo) {
-    final SpecConfig specConfig = spec.atEpoch(getActivationEpoch()).getConfig();
     attesterSlashingGossipManager =
         new AttesterSlashingGossipManager(
             spec,
@@ -200,7 +194,7 @@ void addAttesterSlashingGossipManager(final ForkInfo forkInfo) {
             gossipEncoding,
             forkInfo,
             attesterSlashingProcessor,
-            specConfig.getGossipMaxSize());
+            getMessageMaxSize());
     addGossipManager(attesterSlashingGossipManager);
   }
 
@@ -264,4 +258,8 @@ public void subscribeToAttestationSubnetId(final int subnetId) {
   public void unsubscribeFromAttestationSubnetId(final int subnetId) {
     attestationGossipManager.unsubscribeFromSubnetId(subnetId);
   }
+
+  protected int getMessageMaxSize() {
+    return spec.forMilestone(SpecMilestone.PHASE0).getConfig().getGossipMaxSize();
+  }
 }
diff --git a/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootMessageHandlerTest.java b/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootMessageHandlerTest.java
index 14d20b585a8..b0cab1368c5 100644
--- a/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootMessageHandlerTest.java
+++ b/networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/rpc/beaconchain/methods/BlobSidecarsByRootMessageHandlerTest.java
@@ -44,6 +44,7 @@
 import tech.pegasys.teku.networking.eth2.rpc.core.encodings.RpcEncoding;
 import tech.pegasys.teku.spec.Spec;
 import tech.pegasys.teku.spec.TestSpecFactory;
+import tech.pegasys.teku.spec.config.SpecConfigBellatrix;
 import tech.pegasys.teku.spec.config.SpecConfigDeneb;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc.BlobIdentifier;
@@ -56,8 +57,9 @@ public class BlobSidecarsByRootMessageHandlerTest {
   private final UInt64 denebForkEpoch = UInt64.valueOf(1);
 
   private final Spec spec = TestSpecFactory.createMinimalWithDenebForkEpoch(denebForkEpoch);
-  private final RpcEncoding rpcEncoding =
-      RpcEncoding.createSszSnappyEncoding(spec.getGenesisSpecConfig().getMaxChunkSize());
+  private final int maxChunkSize =
+      SpecConfigBellatrix.required(spec.getGenesisSpecConfig()).getMaxChunkSizeBellatrix();
+  private final RpcEncoding rpcEncoding = RpcEncoding.createSszSnappyEncoding(maxChunkSize);
 
   private final String protocolId =
       BeaconChainMethodIds.getBlobSidecarsByRootMethodId(1, rpcEncoding);