feat: add gossip limit as a configuratable flag (ethereum#856)

Author: barnabasbusa

.github/tests/peerdas-deneb.yaml.norun

@@ -28,8 +28,7 @@ participants:
     cl_extra_params: [--persistNetworkIdentity]
 network_params:
   electra_fork_epoch: 1
-  eip7594_fork_epoch: 1
-  eip7594_fork_version: "0x60000038"
+  fulu_fork_epoch: 2
   preset: minimal
 snooper_enabled: true
 global_log_level: debug

.github/tests/peerdas-electra.yaml.norun .github/tests/peerdas-fulu.yaml.norun.github/tests/peerdas-electra.yaml.norun renamed to .github/tests/peerdas-fulu.yaml.norun

@@ -534,7 +534,7 @@ network_params:
   # Defaults to 256 epoch ~27 hours
   shard_committee_period: 256
 
-  # The epoch at which the deneb/electra/eip7594(peerdas) forks are set to occur. Note: PeerDAS and Electra clients are currently
+  # The epoch at which the deneb/electra/fulu forks are set to occur. Note: PeerDAS and Electra clients are currently
   # working on forks. So set either one of the below forks.
   # Altair fork epoch
   # Defaults to 0
@@ -560,12 +560,6 @@ network_params:
   # Defaults to 100000001
   fulu_fork_epoch: 100000001
 
-  # Eip7594 fork epoch
-  # Defaults to 100000002
-  eip7594_fork_epoch: 100000002
-  # The fork version to set if the eip7594 fork is active
-  eip7594_fork_version: "0x60000038"
-
 
   # Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks)
   # Defaults to "https://snapshots.ethpandaops.io/"
@@ -586,10 +580,10 @@ network_params:
   # Target number of blobs per block for Electra fork
   target_blobs_per_block_electra: 6
 
-  # Maximum number of blobs per block for EIP7594 fork
-  max_blobs_per_block_eip7594: 12
-  # Target number of blobs per block for EIP7594 fork
-  target_blobs_per_block_eip7594: 9
+  # Maximum number of blobs per block for Fulu fork
+  max_blobs_per_block_fulu: 12
+  # Target number of blobs per block for Fulu fork
+  target_blobs_per_block_fulu: 9
 
   # Preset for the network
   # Default: "mainnet"
@@ -628,6 +622,13 @@ network_params:
   # prefunded_accounts: '{"0x25941dC771bB64514Fc8abBce970307Fb9d477e9": {"balance": "10ETH"}, "0x4107be99052d895e3ee461C685b042Aa975ab5c0": {"balance": "1ETH"}}'
   prefunded_accounts: {}
 
+  # Maximum size of gossip messages in bytes
+  # 10 * 2**20 (= 10485760, 10 MiB)
+  # Defaults to 10485760 (10MB)
+  gossip_max_size: 10485760
+
+
+
 # Global parameters for the network
 
 # By default includes

README.md

@@ -88,16 +88,14 @@ network_params:
   deneb_fork_epoch: 0
   electra_fork_epoch: 100000000
   fulu_fork_epoch: 100000001
-  eip7594_fork_epoch: 100000002
-  eip7594_fork_version: "0x60000038"
   network_sync_base_url: https://snapshots.ethpandaops.io/
   data_column_sidecar_subnet_count: 128
   samples_per_slot: 8
   custody_requirement: 4
   max_blobs_per_block_electra: 9
   target_blobs_per_block_electra: 6
-  max_blobs_per_block_eip7594: 12
-  target_blobs_per_block_eip7594: 9
+  max_blobs_per_block_fulu: 12
+  target_blobs_per_block_fulu: 9
   additional_preloaded_contracts: {}
   devnet_repo: ethpandaops
   prefunded_accounts: {}

network_params.yaml

@@ -111,8 +111,6 @@ ELECTRA_FORK_VERSION = "0x60000038"
 ELECTRA_FORK_EPOCH = 100000000
 FULU_FORK_VERSION = "0x70000038"
 FULU_FORK_EPOCH = 100000001
-EIP7594_FORK_VERSION = "0x80000038"
-EIP7594_FORK_EPOCH = 100000002
 
 MAX_LABEL_LENGTH = 63
 
@@ -124,7 +122,7 @@ CONTAINER_REGISTRY = struct(
 
 
 ETHEREUM_GENESIS_GENERATOR = struct(
-    default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:3.4.4",  # Default
+    default_genesis_generator_image="ethpandaops/ethereum-genesis-generator:3.4.7",  # Default
     verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
 )
 

src/package_io/constants.star

@@ -325,8 +325,6 @@ def input_parser(plan, input_args):
             deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
             electra_fork_epoch=result["network_params"]["electra_fork_epoch"],
             fulu_fork_epoch=result["network_params"]["fulu_fork_epoch"],
-            eip7594_fork_epoch=result["network_params"]["eip7594_fork_epoch"],
-            eip7594_fork_version=result["network_params"]["eip7594_fork_version"],
             network=result["network_params"]["network"],
             min_validator_withdrawability_delay=result["network_params"][
                 "min_validator_withdrawability_delay"
@@ -344,18 +342,19 @@ def input_parser(plan, input_args):
             target_blobs_per_block_electra=result["network_params"][
                 "target_blobs_per_block_electra"
             ],
-            max_blobs_per_block_eip7594=result["network_params"][
-                "max_blobs_per_block_eip7594"
+            max_blobs_per_block_fulu=result["network_params"][
+                "max_blobs_per_block_fulu"
             ],
-            target_blobs_per_block_eip7594=result["network_params"][
-                "target_blobs_per_block_eip7594"
+            target_blobs_per_block_fulu=result["network_params"][
+                "target_blobs_per_block_fulu"
             ],
             preset=result["network_params"]["preset"],
             additional_preloaded_contracts=result["network_params"][
                 "additional_preloaded_contracts"
             ],
             devnet_repo=result["network_params"]["devnet_repo"],
             prefunded_accounts=result["network_params"]["prefunded_accounts"],
+            gossip_max_size=result["network_params"]["gossip_max_size"],
         ),
         mev_params=struct(
             mev_relay_image=result["mev_params"]["mev_relay_image"],
@@ -896,20 +895,19 @@ def default_network_params():
         "deneb_fork_epoch": 0,
         "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
         "fulu_fork_epoch": constants.FULU_FORK_EPOCH,
-        "eip7594_fork_epoch": constants.EIP7594_FORK_EPOCH,
-        "eip7594_fork_version": "0x60000038",
         "network_sync_base_url": "https://snapshots.ethpandaops.io/",
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,
         "custody_requirement": 4,
         "max_blobs_per_block_electra": 9,
         "target_blobs_per_block_electra": 6,
-        "max_blobs_per_block_eip7594": 12,
-        "target_blobs_per_block_eip7594": 9,
+        "max_blobs_per_block_fulu": 12,
+        "target_blobs_per_block_fulu": 9,
         "preset": "mainnet",
         "additional_preloaded_contracts": {},
         "devnet_repo": "ethpandaops",
         "prefunded_accounts": {},
+        "gossip_max_size": 10485760,
     }
 
 
@@ -936,20 +934,19 @@ def default_minimal_network_params():
         "deneb_fork_epoch": 0,
         "electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
         "fulu_fork_epoch": constants.FULU_FORK_EPOCH,
-        "eip7594_fork_epoch": constants.EIP7594_FORK_EPOCH,
-        "eip7594_fork_version": "0x60000038",
         "network_sync_base_url": "https://snapshots.ethpandaops.io/",
         "data_column_sidecar_subnet_count": 128,
         "samples_per_slot": 8,
         "custody_requirement": 4,
         "max_blobs_per_block_electra": 9,
         "target_blobs_per_block_electra": 6,
-        "max_blobs_per_block_eip7594": 12,
-        "target_blobs_per_block_eip7594": 9,
+        "max_blobs_per_block_fulu": 12,
+        "target_blobs_per_block_fulu": 9,
         "preset": "minimal",
         "additional_preloaded_contracts": {},
         "devnet_repo": "ethpandaops",
         "prefunded_accounts": {},
+        "gossip_max_size": 10485760,
     }
 
 
@@ -1096,7 +1093,7 @@ def get_default_mev_params(mev_type, preset):
         mev_boost_image = constants.DEFAULT_COMMIT_BOOST_MEV_BOOST_IMAGE
         mev_builder_cl_image = DEFAULT_CL_IMAGES[constants.CL_TYPE.lighthouse]
         mev_builder_extra_data = (
-            "0x436f6d6d69742d426f6f737420f09f93bb"  # Commit-Boost 📻
+            "0x436F6D6D69742D426F6F737420F09F93BB"  # Commit-Boost 📻
         )
 
     return {

src/package_io/input_parser.star

@@ -159,20 +159,19 @@ SUBCATEGORY_PARAMS = {
         "deneb_fork_epoch",
         "electra_fork_epoch",
         "fulu_fork_epoch",
-        "eip7594_fork_epoch",
-        "eip7594_fork_version",
         "network_sync_base_url",
         "data_column_sidecar_subnet_count",
         "samples_per_slot",
         "custody_requirement",
         "max_blobs_per_block_electra",
         "target_blobs_per_block_electra",
-        "max_blobs_per_block_eip7594",
-        "target_blobs_per_block_eip7594",
+        "max_blobs_per_block_fulu",
+        "target_blobs_per_block_fulu",
         "preset",
         "additional_preloaded_contracts",
         "devnet_repo",
         "prefunded_accounts",
+        "gossip_max_size",
     ],
     "blockscout_params": [
         "image",

src/package_io/sanity_check.star

@@ -113,8 +113,6 @@ def new_env_file_for_el_cl_genesis_data(
         "DenebForkEpoch": network_params.deneb_fork_epoch,
         "ElectraForkEpoch": network_params.electra_fork_epoch,
         "FuluForkEpoch": network_params.fulu_fork_epoch,
-        "EIP7594ForkEpoch": network_params.eip7594_fork_epoch,
-        "EIP7594ForkVersion": network_params.eip7594_fork_version,
         "GenesisForkVersion": constants.GENESIS_FORK_VERSION,
         "AltairForkVersion": constants.ALTAIR_FORK_VERSION,
         "BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION,
@@ -130,11 +128,12 @@ def new_env_file_for_el_cl_genesis_data(
         "CustodyRequirement": network_params.custody_requirement,
         "MaxBlobsPerBlockElectra": network_params.max_blobs_per_block_electra,
         "TargetBlobsPerBlockElectra": network_params.target_blobs_per_block_electra,
-        "MaxBlobsPerBlockEIP7594": network_params.max_blobs_per_block_eip7594,
-        "TargetBlobsPerBlockEIP7594": network_params.target_blobs_per_block_eip7594,
+        "MaxBlobsPerBlockFulu": network_params.max_blobs_per_block_fulu,
+        "TargetBlobsPerBlockFulu": network_params.target_blobs_per_block_fulu,
         "Preset": network_params.preset,
         "AdditionalPreloadedContracts": json.encode(
             network_params.additional_preloaded_contracts
         ),
         "PrefundedAccounts": json.encode(network_params.prefunded_accounts),
+        "GossipMaxSize": network_params.gossip_max_size,
     }

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

@@ -19,8 +19,6 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}"
 export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}"
 export FULU_FORK_VERSION="{{ .FuluForkVersion }}"
 export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}"
-export EIP7594_FORK_EPOCH="{{ .EIP7594ForkEpoch }}"
-export EIP7594_FORK_VERSION="{{ .EIP7594ForkVersion }}"
 export WITHDRAWAL_TYPE="0x00"
 export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
 export GENESIS_TIMESTAMP={{ .UnixTimestamp }}
@@ -38,7 +36,9 @@ export SAMPLES_PER_SLOT={{ .SamplesPerSlot }}
 export CUSTODY_REQUIREMENT={{ .CustodyRequirement }}
 export MAX_BLOBS_PER_BLOCK_ELECTRA={{ .MaxBlobsPerBlockElectra }}
 export TARGET_BLOBS_PER_BLOCK_ELECTRA={{ .TargetBlobsPerBlockElectra }}
-export MAX_BLOBS_PER_BLOCK_EIP7594={{ .MaxBlobsPerBlockEIP7594 }}
-export TARGET_BLOBS_PER_BLOCK_EIP7594={{ .TargetBlobsPerBlockEIP7594 }}
+export MAX_BLOBS_PER_BLOCK_FULU={{ .MaxBlobsPerBlockFulu }}
+export TARGET_BLOBS_PER_BLOCK_FULU={{ .TargetBlobsPerBlockFulu }}
 export ADDITIONAL_PRELOADED_CONTRACTS={{ .AdditionalPreloadedContracts }}
 export EL_PREMINE_ADDRS={{ .PrefundedAccounts }}
+export GOSSIP_MAX_SIZE={{ .GossipMaxSize }}
+export MAX_CHUNK_SIZE={{ .GossipMaxSize }}