8957

CHANGELOG.md

@@ -9,5 +9,6 @@
 ### Breaking Changes
 
 ### Additions and Improvements
+ - Applied spec change to alter `GOSSIP_MAX_SIZE` to `MAX_PAYLOAD_SIZE`.
 
 ### Bug Fixes

data/beaconrestapi/src/test/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/config/mainnetConfig.json

@@ -42,6 +42,7 @@
 "EPOCHS_PER_SLASHINGS_VECTOR" : "8192",
 "MIN_SLASHING_PENALTY_QUOTIENT" : "128",
 "MAX_BLS_TO_EXECUTION_CHANGES" : "16",
+"MAX_PAYLOAD_SIZE" : "10485760",
 "GOSSIP_MAX_SIZE" : "10485760",
 "DOMAIN_BEACON_ATTESTER" : "0x01000000",
 "EPOCHS_PER_SUBNET_SUBSCRIPTION" : "256",

data/provider/src/main/java/tech/pegasys/teku/api/SpecConfigData.java

@@ -56,6 +56,8 @@ public Map<String, String> getConfigMap() {
     configAttributes.put("DOMAIN_SELECTION_PROOF", getDomainSelectionProof().toHexString());
     configAttributes.put("DOMAIN_AGGREGATE_AND_PROOF", getDomainAggregateAndProof().toHexString());
     configAttributes.put("DOMAIN_APPLICATION_BUILDER", getDomainApplicationBuilder().toHexString());
+    // Backwards compatibility with old phase0 constants, otherwise nodes won't start
+    configAttributes.put("GOSSIP_MAX_SIZE", configAttributes.get("MAX_PAYLOAD_SIZE"));
     getDomainSyncCommittee()
         .ifPresent(
             committee -> configAttributes.put("DOMAIN_SYNC_COMMITTEE", committee.toHexString()));

ethereum/networks/src/test/resources/tech/pegasys/teku/networks/test-constants.yaml

@@ -156,7 +156,7 @@ DOMAIN_AGGREGATE_AND_PROOF: 0x06000000
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/DelegatingSpecConfig.java

@@ -318,8 +318,8 @@ public Eth1Address getDepositContractAddress() {
   }
 
   @Override
-  public int getGossipMaxSize() {
-    return specConfig.getGossipMaxSize();
+  public int getMaxPayloadSize() {
+    return specConfig.getMaxPayloadSize();
   }
 
   @Override

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/NetworkingSpecConfig.java

@@ -17,7 +17,7 @@
 
 public interface NetworkingSpecConfig {
 
-  int getGossipMaxSize();
+  int getMaxPayloadSize();
 
   int getMaxChunkSize();
 

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/SpecConfigPhase0.java

@@ -102,7 +102,7 @@ public class SpecConfigPhase0 implements SpecConfig {
   private final Eth1Address depositContractAddress;
 
   // Networking
-  private final int gossipMaxSize;
+  private final int maxPayloadSize;
   private final int maxChunkSize;
   private final int maxRequestBlocks;
   private final int epochsPerSubnetSubscription;
@@ -174,7 +174,7 @@ public SpecConfigPhase0(
       final long depositChainId,
       final long depositNetworkId,
       final Eth1Address depositContractAddress,
-      final int gossipMaxSize,
+      final int maxPayloadSize,
       final int maxChunkSize,
       final int maxRequestBlocks,
       final int epochsPerSubnetSubscription,
@@ -244,7 +244,7 @@ public SpecConfigPhase0(
     this.depositNetworkId = depositNetworkId;
     this.depositContractAddress = depositContractAddress;
     this.squareRootSlotsPerEpoch = MathHelpers.integerSquareRoot(slotsPerEpoch);
-    this.gossipMaxSize = gossipMaxSize;
+    this.maxPayloadSize = maxPayloadSize;
     this.maxChunkSize = maxChunkSize;
     this.maxRequestBlocks = maxRequestBlocks;
     this.epochsPerSubnetSubscription = epochsPerSubnetSubscription;
@@ -561,8 +561,8 @@ public Eth1Address getDepositContractAddress() {
   }
 
   @Override
-  public int getGossipMaxSize() {
-    return gossipMaxSize;
+  public int getMaxPayloadSize() {
+    return maxPayloadSize;
   }
 
   @Override
@@ -683,7 +683,7 @@ public boolean equals(final Object o) {
         && proposerScoreBoost == that.proposerScoreBoost
         && depositChainId == that.depositChainId
         && depositNetworkId == that.depositNetworkId
-        && gossipMaxSize == that.gossipMaxSize
+        && maxPayloadSize == that.maxPayloadSize
         && maxChunkSize == that.maxChunkSize
         && maxRequestBlocks == that.maxRequestBlocks
         && epochsPerSubnetSubscription == that.epochsPerSubnetSubscription
@@ -768,7 +768,7 @@ public int hashCode() {
         depositChainId,
         depositNetworkId,
         depositContractAddress,
-        gossipMaxSize,
+        maxPayloadSize,
         maxChunkSize,
         maxRequestBlocks,
         epochsPerSubnetSubscription,

ethereum/spec/src/main/java/tech/pegasys/teku/spec/config/builder/SpecConfigBuilder.java

@@ -108,7 +108,7 @@ public class SpecConfigBuilder {
   private Eth1Address depositContractAddress;
 
   // Networking
-  private Integer gossipMaxSize;
+  private Integer maxPayloadSize;
   private Integer maxChunkSize;
   private Integer maxRequestBlocks;
   private Integer epochsPerSubnetSubscription;
@@ -146,6 +146,18 @@ public SpecConfigAndParent<SpecConfigElectra> build() {
             rawConfig.put(key, value);
           }
         });
+
+    if (maxPayloadSize == null && rawConfig.containsKey("GOSSIP_MAX_SIZE")) {
+      try {
+        // for compatibility, add this constant if its missing but we got GOSSIP_MAX_SIZE
+        // both need to be able to initialize due to renamed global config constant.
+        final String gossipMaxSize = (String) rawConfig.get("GOSSIP_MAX_SIZE");
+        rawConfig.put("MAX_PAYLOAD_SIZE", gossipMaxSize);
+        maxPayloadSize(Integer.parseInt(gossipMaxSize));
+      } catch (NumberFormatException e) {
+        LOG.error("Failed to parse GOSSIP_MAX_SIZE", e);
+      }
+    }
     validate();
     final SpecConfigAndParent<SpecConfig> config =
         SpecConfigAndParent.of(
@@ -200,7 +212,7 @@ public SpecConfigAndParent<SpecConfigElectra> build() {
                 depositChainId,
                 depositNetworkId,
                 depositContractAddress,
-                gossipMaxSize,
+                maxPayloadSize,
                 maxChunkSize,
                 maxRequestBlocks,
                 epochsPerSubnetSubscription,
@@ -274,7 +286,7 @@ private Map<String, Object> getValidationMap() {
     constants.put("depositNetworkId", depositNetworkId);
     constants.put("depositContractAddress", depositContractAddress);
 
-    constants.put("gossipMaxSize", gossipMaxSize);
+    constants.put("maxPayloadSize", maxPayloadSize);
     constants.put("maxChunkSize", maxChunkSize);
     constants.put("maxRequestBlocks", maxRequestBlocks);
     constants.put("epochsPerSubnetSubscription", epochsPerSubnetSubscription);
@@ -626,8 +638,8 @@ public SpecConfigBuilder depositContractAddress(final Eth1Address depositContrac
     return this;
   }
 
-  public SpecConfigBuilder gossipMaxSize(final Integer gossipMaxSize) {
-    this.gossipMaxSize = gossipMaxSize;
+  public SpecConfigBuilder maxPayloadSize(final Integer maxPayloadSize) {
+    this.maxPayloadSize = maxPayloadSize;
     return this;
   }
 

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/chiado.yaml

@@ -99,7 +99,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0xb97036A26259B7147018913bD58a774cf91acf25
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/ephemery.yaml

@@ -88,7 +88,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/gnosis.yaml

@@ -98,7 +98,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x0B98057eA310F4d31F2a452B414647007d1645d9
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/holesky.yaml

@@ -90,7 +90,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/less-swift.yaml

@@ -101,7 +101,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/lukso.yaml

@@ -120,7 +120,7 @@ EJECTION_BALANCE: 16000000000
 # Extra consensus configuration (Teku)
 # ---------------------------------------------------------------
 # 10 * 2**20 (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `10 * 2**20` (=10485760, 10 MiB)
 MAX_CHUNK_SIZE: 10485760
 # `2**10` (= 1024)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/mainnet.yaml

@@ -107,7 +107,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/minimal.yaml

@@ -107,7 +107,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/sepolia.yaml

@@ -83,7 +83,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x7f02C3E3c98b133055B8B348B2Ac625669Ed295D
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/main/resources/tech/pegasys/teku/spec/config/configs/swift.yaml

@@ -102,7 +102,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x1234567890123456789012345678901234567890
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (=10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/altairForkSpec.json

@@ -82,7 +82,7 @@
   "TERMINAL_TOTAL_DIFFICULTY": "115792089237316195423570985008687907853269984665640564039457584007913129638912",
   "VALIDATOR_REGISTRY_LIMIT": "1099511627776",
   "WHISTLEBLOWER_REWARD_QUOTIENT": "512",
-  "GOSSIP_MAX_SIZE": "10485760",
+  "MAX_PAYLOAD_SIZE": "10485760",
   "MAX_REQUEST_BLOCKS": "1024",
   "EPOCHS_PER_SUBNET_SUBSCRIPTION": "256",
   "MIN_EPOCHS_FOR_BLOCK_REQUESTS": "33024",

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/bellatrixForkSpec.json

@@ -87,7 +87,7 @@
   "TERMINAL_TOTAL_DIFFICULTY": "115792089237316195423570985008687907853269984665640564039457584007913129638912",
   "VALIDATOR_REGISTRY_LIMIT": "1099511627776",
   "WHISTLEBLOWER_REWARD_QUOTIENT": "512",
-  "GOSSIP_MAX_SIZE": "10485760",
+  "MAX_PAYLOAD_SIZE": "10485760",
   "MAX_REQUEST_BLOCKS": "1024",
   "EPOCHS_PER_SUBNET_SUBSCRIPTION": "256",
   "MIN_EPOCHS_FOR_BLOCK_REQUESTS": "33024",

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/missingAltairField.yaml

@@ -211,7 +211,7 @@ SYNC_COMMITTEE_BRANCH_LENGTH: 5
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/invalid/unknownField.yaml

@@ -256,7 +256,7 @@ MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP: 16384
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/mergeForkSpec.json

@@ -87,7 +87,7 @@
   "TERMINAL_TOTAL_DIFFICULTY": "115792089237316195423570985008687907853269984665640564039457584007913129638912",
   "VALIDATOR_REGISTRY_LIMIT": "1099511627776",
   "WHISTLEBLOWER_REWARD_QUOTIENT": "512",
-  "GOSSIP_MAX_SIZE": "10485760",
+  "MAX_PAYLOAD_SIZE": "10485760",
   "MAX_REQUEST_BLOCKS": "1024",
   "EPOCHS_PER_SUBNET_SUBSCRIPTION": "256",
   "MIN_EPOCHS_FOR_BLOCK_REQUESTS": "33024",

ethereum/spec/src/test/resources/tech/pegasys/teku/spec/config/standard/with-overrides.yaml

@@ -82,7 +82,7 @@ DEPOSIT_CONTRACT_ADDRESS: 0x00000000219ab540356cBB839Cbe05303d7705Fa
 # Networking
 # ---------------------------------------------------------------
 # `10 * 2**20` (= 10485760, 10 MiB)
-GOSSIP_MAX_SIZE: 10485760
+MAX_PAYLOAD_SIZE: 10485760
 # `2**10` (= 1024)
 MAX_REQUEST_BLOCKS: 1024
 # `2**8` (= 256)

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyPreparedGossipMessage.java

@@ -124,7 +124,7 @@ public DecodedMessageResult getDecodedMessage() {
       if (valueType == null) {
         return DecodedMessageResult.failed();
       } else {
-        final Bytes decodedMessage = uncompressPayload(networkingConfig.getGossipMaxSize());
+        final Bytes decodedMessage = uncompressPayload(networkingConfig.getMaxPayloadSize());
         return DecodedMessageResult.successful(decodedMessage);
       }
     } catch (DecodingException e) {

networking/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/topics/topichandlers/Eth2TopicHandler.java

@@ -198,7 +198,7 @@ public PreparedGossipMessage prepareMessage(
 
   @Override
   public int getMaxMessageSize() {
-    return networkingConfig.getGossipMaxSize();
+    return networkingConfig.getMaxPayloadSize();
   }
 
   protected MessageT deserialize(final PreparedGossipMessage message) throws DecodingException {

networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyBlockCompressorTest.java

@@ -22,7 +22,7 @@
 
 public class SnappyBlockCompressorTest {
 
-  private static final long GOSSIP_MAX_SIZE = Long.MAX_VALUE;
+  private static final long MAX_PAYLOAD_SIZE = Long.MAX_VALUE;
 
   private final SnappyBlockCompressor compressor = new SnappyBlockCompressor();
 
@@ -33,7 +33,7 @@ public void roundTrip() throws DecodingException {
     final Bytes compressed = compressor.compress(original);
     assertThat(compressed).isNotEqualTo(original);
     final Bytes uncompressed =
-        compressor.uncompress(compressed, SszLengthBounds.ofBytes(0, 1000), GOSSIP_MAX_SIZE);
+        compressor.uncompress(compressed, SszLengthBounds.ofBytes(0, 1000), MAX_PAYLOAD_SIZE);
 
     assertThat(uncompressed).isEqualTo(original);
   }
@@ -43,7 +43,7 @@ public void uncompress_randomData() {
     final Bytes data = Bytes.fromHexString("0x0102");
 
     assertThatThrownBy(
-            () -> compressor.uncompress(data, SszLengthBounds.ofBytes(0, 1000), GOSSIP_MAX_SIZE))
+            () -> compressor.uncompress(data, SszLengthBounds.ofBytes(0, 1000), MAX_PAYLOAD_SIZE))
         .isInstanceOf(DecodingException.class);
   }
 
@@ -53,7 +53,8 @@ void uncompress_uncompressedLengthLongerThanSszLenghtBounds() {
 
     final Bytes compressed = compressor.compress(original);
     assertThatThrownBy(
-            () -> compressor.uncompress(compressed, SszLengthBounds.ofBytes(0, 4), GOSSIP_MAX_SIZE))
+            () ->
+                compressor.uncompress(compressed, SszLengthBounds.ofBytes(0, 4), MAX_PAYLOAD_SIZE))
         .isInstanceOf(DecodingException.class)
         .hasMessageContaining("not within expected bounds");
   }
@@ -67,7 +68,7 @@ void uncompress_uncompressedLengthShorterThanSszLengthBounds() {
     assertThatThrownBy(
             () ->
                 compressor.uncompress(
-                    compressed, SszLengthBounds.ofBytes(100, 200), GOSSIP_MAX_SIZE))
+                    compressed, SszLengthBounds.ofBytes(100, 200), MAX_PAYLOAD_SIZE))
         .isInstanceOf(DecodingException.class)
         .hasMessageContaining("not within expected bounds");
   }

networking/eth2/src/test/java/tech/pegasys/teku/networking/eth2/gossip/encoding/SnappyPreparedGossipMessageTest.java

@@ -164,7 +164,7 @@ public void getMessageId_generateUniqueIdsBasedOnValidityAndMilestone() {
 
   @Test
   public void getDecodedMessage_ShouldPassGossipMaxSizeToUncompressor() throws DecodingException {
-    final long gossipMaxSize = spec.getNetworkingConfig().getGossipMaxSize();
+    final long gossipMaxSize = spec.getNetworkingConfig().getMaxPayloadSize();
     final Uncompressor uncompressor = mock(Uncompressor.class);
     when(uncompressor.uncompress(any(), any(), anyLong())).thenReturn(Bytes.random(1000));