diff --git a/README.md b/README.md index 0b3598785..6bd7387e6 100644 --- a/README.md +++ b/README.md @@ -514,13 +514,13 @@ network_params: network_sync_base_url: https://snapshots.ethpandaops.io/ # The number of data column sidecar subnets used in the gossipsub protocol - data_column_sidecar_subnet_count: 32 + data_column_sidecar_subnet_count: 128 # Number of DataColumn random samples a node queries per slot samples_per_slot: 8 # Minimum number of subnets an honest node custodies and serves samples from - custody_requirement: 1 - # Suggested minimum peer count - target_number_of_peers: 70 + custody_requirement: 4 + # Maximum number of blobs per block + max_blobs_per_block: 6 # Preset for the network # Default: "mainnet" diff --git a/network_params.yaml b/network_params.yaml index aa059c60c..83ba7bbf1 100644 --- a/network_params.yaml +++ b/network_params.yaml @@ -78,10 +78,10 @@ network_params: eip7594_fork_epoch: 100000001 eip7594_fork_version: "0x70000038" network_sync_base_url: https://snapshots.ethpandaops.io/ - data_column_sidecar_subnet_count: 32 + data_column_sidecar_subnet_count: 128 samples_per_slot: 8 - custody_requirement: 1 - target_number_of_peers: 70 + custody_requirement: 4 + max_blobs_per_block: 6 additional_preloaded_contracts: {} devnet_repo: ethpandaops additional_services: [] diff --git a/src/package_io/constants.star b/src/package_io/constants.star index dd7fa27f6..b85be11a5 100644 --- a/src/package_io/constants.star +++ b/src/package_io/constants.star @@ -105,7 +105,7 @@ EIP7594_FORK_VERSION = "0x70000038" ETHEREUM_GENESIS_GENERATOR = struct( capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config) - deneb_genesis="ethpandaops/ethereum-genesis-generator:3.3.5", # Default + deneb_genesis="ethpandaops/ethereum-genesis-generator:3.3.7", # Default verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0", ) diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 0c06e8c35..52c01928d 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -10,7 +10,7 @@ DEFAULT_EL_IMAGES = { "geth": "ethereum/client-go:latest", "erigon": "ethpandaops/erigon:main", "nethermind": "nethermindeth/nethermind:master", - "besu": "ethpandaops/besu:devnets-fix", + "besu": "ethpandaops/besu:main", "reth": "ghcr.io/paradigmxyz/reth", "ethereumjs": "ethpandaops/ethereumjs:master", "nimbus": "ethpandaops/nimbus-eth1:master", @@ -282,7 +282,7 @@ def input_parser(plan, input_args): ], samples_per_slot=result["network_params"]["samples_per_slot"], custody_requirement=result["network_params"]["custody_requirement"], - target_number_of_peers=result["network_params"]["target_number_of_peers"], + max_blobs_per_block=result["network_params"]["max_blobs_per_block"], preset=result["network_params"]["preset"], additional_preloaded_contracts=result["network_params"][ "additional_preloaded_contracts" @@ -795,10 +795,10 @@ def default_network_params(): "eip7594_fork_version": "0x70000038", "eof_activation_epoch": "", "network_sync_base_url": "https://snapshots.ethpandaops.io/", - "data_column_sidecar_subnet_count": 32, + "data_column_sidecar_subnet_count": 128, "samples_per_slot": 8, - "custody_requirement": 1, - "target_number_of_peers": 70, + "custody_requirement": 4, + "max_blobs_per_block": 6, "preset": "mainnet", "additional_preloaded_contracts": {}, "devnet_repo": "ethpandaops", @@ -828,10 +828,10 @@ def default_minimal_network_params(): "eip7594_fork_version": "0x70000038", "eof_activation_epoch": "", "network_sync_base_url": "https://snapshots.ethpandaops.io/", - "data_column_sidecar_subnet_count": 32, + "data_column_sidecar_subnet_count": 128, "samples_per_slot": 8, - "custody_requirement": 1, - "target_number_of_peers": 70, + "custody_requirement": 4, + "max_blobs_per_block": 6, "preset": "minimal", "additional_preloaded_contracts": {}, "devnet_repo": "ethpandaops", diff --git a/src/package_io/sanity_check.star b/src/package_io/sanity_check.star index d6601d653..6a00ff1b6 100644 --- a/src/package_io/sanity_check.star +++ b/src/package_io/sanity_check.star @@ -138,7 +138,7 @@ SUBCATEGORY_PARAMS = { "data_column_sidecar_subnet_count", "samples_per_slot", "custody_requirement", - "target_number_of_peers", + "max_blobs_per_block", "preset", "additional_preloaded_contracts", "devnet_repo", diff --git a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star index ceab4f021..bfe07bce1 100644 --- a/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star +++ b/src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star @@ -124,7 +124,7 @@ def new_env_file_for_el_cl_genesis_data( "DataColumnSidecarSubnetCount": network_params.data_column_sidecar_subnet_count, "SamplesPerSlot": network_params.samples_per_slot, "CustodyRequirement": network_params.custody_requirement, - "TargetNumberOfPeers": network_params.target_number_of_peers, + "MaxBlobsPerBlock": network_params.max_blobs_per_block, "Preset": network_params.preset, "AdditionalPreloadedContracts": json.encode( network_params.additional_preloaded_contracts diff --git a/static_files/genesis-generation-config/el-cl/values.env.tmpl b/static_files/genesis-generation-config/el-cl/values.env.tmpl index 3c882b82e..a828605f8 100644 --- a/static_files/genesis-generation-config/el-cl/values.env.tmpl +++ b/static_files/genesis-generation-config/el-cl/values.env.tmpl @@ -32,5 +32,5 @@ export SHARD_COMMITTEE_PERIOD={{ .ShardCommitteePeriod }} export DATA_COLUMN_SIDECAR_SUBNET_COUNT={{ .DataColumnSidecarSubnetCount }} export SAMPLES_PER_SLOT={{ .SamplesPerSlot }} export CUSTODY_REQUIREMENT={{ .CustodyRequirement }} -export TARGET_NUMBER_OF_PEERS={{ .TargetNumberOfPeers }} +export MAX_BLOBS_PER_BLOCK={{ .MaxBlobsPerBlock }} export ADDITIONAL_PRELOADED_CONTRACTS={{ .AdditionalPreloadedContracts }}