Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(config): add peerdas vars #619

Merged
merged 4 commits into from
May 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,15 @@ network_params:
# The snapshots are taken with https://github.com/ethpandaops/snapshotter
network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/

# The number of data column sidecar subnets used in the gossipsub protocol
data_column_sidecar_subnet_count: 32
# 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

# Preset for the network
# Default: "mainnet"
# Options: "mainnet", "minimal"
Expand Down
4 changes: 4 additions & 0 deletions network_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ network_params:
eip7594_fork_epoch: 100000001
eip7594_fork_version: "0x70000038"
network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/
data_column_sidecar_subnet_count: 32
samples_per_slot: 8
custody_requirement: 1
target_number_of_peers: 70
additional_services:
- tx_spammer
- blob_spammer
Expand Down
2 changes: 1 addition & 1 deletion src/package_io/constants.star
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,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.1.5", # Default
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.6", # 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",
)
Expand Down
14 changes: 14 additions & 0 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,12 @@ def input_parser(plan, input_args):
],
shard_committee_period=result["network_params"]["shard_committee_period"],
network_sync_base_url=result["network_params"]["network_sync_base_url"],
data_column_sidecar_subnet_count=result["network_params"][
"data_column_sidecar_subnet_count"
],
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"],
preset=result["network_params"]["preset"],
),
mev_params=struct(
Expand Down Expand Up @@ -703,6 +709,10 @@ def default_network_params():
"eip7594_fork_epoch": 100000001,
"eip7594_fork_version": "0x70000038",
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/",
"data_column_sidecar_subnet_count": 32,
"samples_per_slot": 8,
"custody_requirement": 1,
"target_number_of_peers": 70,
"preset": "mainnet",
}

Expand All @@ -728,6 +738,10 @@ def default_minimal_network_params():
"eip7594_fork_epoch": 100000001,
"eip7594_fork_version": "0x70000038",
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/",
"data_column_sidecar_subnet_count": 32,
"samples_per_slot": 8,
"custody_requirement": 1,
"target_number_of_peers": 70,
"preset": "minimal",
}

Expand Down
4 changes: 4 additions & 0 deletions src/participant_network.star
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ def launch_participant_network(
latest_block.files_artifacts[0] if latest_block != "" else "",
network_params.min_validator_withdrawability_delay,
network_params.shard_committee_period,
network_params.data_column_sidecar_subnet_count,
network_params.samples_per_slot,
network_params.custody_requirement,
network_params.target_number_of_peers,
network_params.preset,
)
elif network_params.network in constants.PUBLIC_NETWORKS:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ def generate_el_cl_genesis_data(
latest_block,
min_validator_withdrawability_delay,
shard_committee_period,
data_column_sidecar_subnet_count,
samples_per_slot,
custody_requirement,
target_number_of_peers,
preset,
):
files = {}
Expand Down Expand Up @@ -58,6 +62,10 @@ def generate_el_cl_genesis_data(
shadowfork_file,
min_validator_withdrawability_delay,
shard_committee_period,
data_column_sidecar_subnet_count,
samples_per_slot,
custody_requirement,
target_number_of_peers,
preset,
)
genesis_generation_template = shared_utils.new_template_and_data(
Expand Down Expand Up @@ -141,6 +149,10 @@ def new_env_file_for_el_cl_genesis_data(
shadowfork_file,
min_validator_withdrawability_delay,
shard_committee_period,
data_column_sidecar_subnet_count,
samples_per_slot,
custody_requirement,
target_number_of_peers,
preset,
):
return {
Expand All @@ -167,5 +179,9 @@ def new_env_file_for_el_cl_genesis_data(
"ShadowForkFile": shadowfork_file,
"MinValidatorWithdrawabilityDelay": min_validator_withdrawability_delay,
"ShardCommitteePeriod": shard_committee_period,
"DataColumnSidecarSubnetCount": data_column_sidecar_subnet_count,
"SamplesPerSlot": samples_per_slot,
"CustodyRequirement": custody_requirement,
"TargetNumberOfPeers": target_number_of_peers,
"Preset": preset,
}
4 changes: 4 additions & 0 deletions static_files/genesis-generation-config/el-cl/values.env.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,7 @@ export ETH1_FOLLOW_DISTANCE={{ .Eth1FollowDistance }}
export SHADOW_FORK_FILE={{ .ShadowForkFile }}
export MIN_VALIDATOR_WITHDRAWABILITY_DELAY={{ .MinValidatorWithdrawabilityDelay }}
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 }}