Skip to content

Commit 22f1498

Browse files
Savidbarnabasbusa
andauthored
feat(config): add peerdas vars (ethereum#619)
Co-authored-by: Barnabas Busa <busa.barnabas@gmail.com>
1 parent c12506b commit 22f1498

File tree

7 files changed

+52
-1
lines changed

7 files changed

+52
-1
lines changed

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -528,6 +528,15 @@ network_params:
528528
# The snapshots are taken with https://github.com/ethpandaops/snapshotter
529529
network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/
530530

531+
# The number of data column sidecar subnets used in the gossipsub protocol
532+
data_column_sidecar_subnet_count: 32
533+
# Number of DataColumn random samples a node queries per slot
534+
samples_per_slot: 8
535+
# Minimum number of subnets an honest node custodies and serves samples from
536+
custody_requirement: 1
537+
# Suggested minimum peer count
538+
target_number_of_peers: 70
539+
531540
# Preset for the network
532541
# Default: "mainnet"
533542
# Options: "mainnet", "minimal"

network_params.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ network_params:
7676
eip7594_fork_epoch: 100000001
7777
eip7594_fork_version: "0x70000038"
7878
network_sync_base_url: https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/
79+
data_column_sidecar_subnet_count: 32
80+
samples_per_slot: 8
81+
custody_requirement: 1
82+
target_number_of_peers: 70
7983
additional_services:
8084
- tx_spammer
8185
- blob_spammer

src/package_io/constants.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ EIP7594_FORK_VERSION = "0x70000038"
8888

8989
ETHEREUM_GENESIS_GENERATOR = struct(
9090
capella_genesis="ethpandaops/ethereum-genesis-generator:2.0.12", # Deprecated (no support for minimal config)
91-
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.5", # Default
91+
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.1.6", # Default
9292
verkle_support_genesis="ethpandaops/ethereum-genesis-generator:3.0.0-rc.19", # soon to be deneb genesis, waiting for rebase
9393
verkle_genesis="ethpandaops/ethereum-genesis-generator:verkle-gen-v1.0.0",
9494
)

src/package_io/input_parser.star

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,12 @@ def input_parser(plan, input_args):
278278
],
279279
shard_committee_period=result["network_params"]["shard_committee_period"],
280280
network_sync_base_url=result["network_params"]["network_sync_base_url"],
281+
data_column_sidecar_subnet_count=result["network_params"][
282+
"data_column_sidecar_subnet_count"
283+
],
284+
samples_per_slot=result["network_params"]["samples_per_slot"],
285+
custody_requirement=result["network_params"]["custody_requirement"],
286+
target_number_of_peers=result["network_params"]["target_number_of_peers"],
281287
preset=result["network_params"]["preset"],
282288
),
283289
mev_params=struct(
@@ -703,6 +709,10 @@ def default_network_params():
703709
"eip7594_fork_epoch": 100000001,
704710
"eip7594_fork_version": "0x70000038",
705711
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/",
712+
"data_column_sidecar_subnet_count": 32,
713+
"samples_per_slot": 8,
714+
"custody_requirement": 1,
715+
"target_number_of_peers": 70,
706716
"preset": "mainnet",
707717
}
708718

@@ -728,6 +738,10 @@ def default_minimal_network_params():
728738
"eip7594_fork_epoch": 100000001,
729739
"eip7594_fork_version": "0x70000038",
730740
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.digitaloceanspaces.com/",
741+
"data_column_sidecar_subnet_count": 32,
742+
"samples_per_slot": 8,
743+
"custody_requirement": 1,
744+
"target_number_of_peers": 70,
731745
"preset": "minimal",
732746
}
733747

src/participant_network.star

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ def launch_participant_network(
107107
latest_block.files_artifacts[0] if latest_block != "" else "",
108108
network_params.min_validator_withdrawability_delay,
109109
network_params.shard_committee_period,
110+
network_params.data_column_sidecar_subnet_count,
111+
network_params.samples_per_slot,
112+
network_params.custody_requirement,
113+
network_params.target_number_of_peers,
110114
network_params.preset,
111115
)
112116
elif network_params.network in constants.PUBLIC_NETWORKS:

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ def generate_el_cl_genesis_data(
3131
latest_block,
3232
min_validator_withdrawability_delay,
3333
shard_committee_period,
34+
data_column_sidecar_subnet_count,
35+
samples_per_slot,
36+
custody_requirement,
37+
target_number_of_peers,
3438
preset,
3539
):
3640
files = {}
@@ -58,6 +62,10 @@ def generate_el_cl_genesis_data(
5862
shadowfork_file,
5963
min_validator_withdrawability_delay,
6064
shard_committee_period,
65+
data_column_sidecar_subnet_count,
66+
samples_per_slot,
67+
custody_requirement,
68+
target_number_of_peers,
6169
preset,
6270
)
6371
genesis_generation_template = shared_utils.new_template_and_data(
@@ -141,6 +149,10 @@ def new_env_file_for_el_cl_genesis_data(
141149
shadowfork_file,
142150
min_validator_withdrawability_delay,
143151
shard_committee_period,
152+
data_column_sidecar_subnet_count,
153+
samples_per_slot,
154+
custody_requirement,
155+
target_number_of_peers,
144156
preset,
145157
):
146158
return {
@@ -167,5 +179,9 @@ def new_env_file_for_el_cl_genesis_data(
167179
"ShadowForkFile": shadowfork_file,
168180
"MinValidatorWithdrawabilityDelay": min_validator_withdrawability_delay,
169181
"ShardCommitteePeriod": shard_committee_period,
182+
"DataColumnSidecarSubnetCount": data_column_sidecar_subnet_count,
183+
"SamplesPerSlot": samples_per_slot,
184+
"CustodyRequirement": custody_requirement,
185+
"TargetNumberOfPeers": target_number_of_peers,
170186
"Preset": preset,
171187
}

static_files/genesis-generation-config/el-cl/values.env.tmpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ export ETH1_FOLLOW_DISTANCE={{ .Eth1FollowDistance }}
2727
export SHADOW_FORK_FILE={{ .ShadowForkFile }}
2828
export MIN_VALIDATOR_WITHDRAWABILITY_DELAY={{ .MinValidatorWithdrawabilityDelay }}
2929
export SHARD_COMMITTEE_PERIOD={{ .ShardCommitteePeriod }}
30+
export DATA_COLUMN_SIDECAR_SUBNET_COUNT={{ .DataColumnSidecarSubnetCount }}
31+
export SAMPLES_PER_SLOT={{ .SamplesPerSlot }}
32+
export CUSTODY_REQUIREMENT={{ .CustodyRequirement }}
33+
export TARGET_NUMBER_OF_PEERS={{ .TargetNumberOfPeers }}

0 commit comments

Comments
 (0)