Skip to content

Commit 6b7a409

Browse files
authored
feat: Adding support for EIP-7732 and EIP-7805 (#880)
- Awaiting a genesis generator update to consume these values
1 parent 8ff3b11 commit 6b7a409

File tree

7 files changed

+29
-17
lines changed

7 files changed

+29
-17
lines changed

.github/tests/fulu.yaml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
participants:
22
- el_type: geth
33
cl_type: teku
4-
- el_type: reth
5-
cl_type: prysm
6-
- el_type: nethermind
7-
cl_type: nimbus
8-
- el_type: besu
9-
cl_type: lighthouse
10-
- el_type: nimbus
11-
cl_type: lodestar
12-
- el_type: erigon
13-
cl_type: grandine
14-
additional_services:
15-
- dora
4+
5+
166
network_params:
177
altair_fork_epoch: 0
188
bellatrix_fork_epoch: 0
199
capella_fork_epoch: 0
2010
deneb_fork_epoch: 0
21-
electra_fork_epoch: 0
22-
fulu_fork_epoch: 1
23-
preset: minimal
11+
electra_fork_epoch: 1
12+
fulu_fork_epoch: 2
13+
eip7732_fork_epoch: 3
14+
eip7805_fork_epoch: 4
15+

.github/tests/mix-with-tools.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ additional_services:
2323
- spamoor_blob
2424
- custom_flood
2525
- blobscan
26-
- blockscout
2726
- dugtrio
2827
- blutgang
2928
- apache

src/package_io/constants.star

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DEFAULT_DORA_IMAGE = "ethpandaops/dora:latest"
8989
DEFAULT_ASSERTOOR_IMAGE = "ethpandaops/assertoor:latest"
9090
DEFAULT_SNOOPER_IMAGE = "ethpandaops/rpc-snooper:latest"
9191
DEFAULT_ETHEREUM_GENESIS_GENERATOR_IMAGE = (
92-
"ethpandaops/ethereum-genesis-generator:3.5.4"
92+
"ethpandaops/ethereum-genesis-generator:3.6.0"
9393
)
9494
DEFAULT_FLASHBOTS_RELAY_IMAGE = "flashbots/mev-boost-relay:0.29.2a3"
9595
DEFAULT_FLASHBOTS_BUILDER_IMAGE = "ethpandaops/reth-rbuilder:develop"
@@ -116,6 +116,11 @@ ELECTRA_FORK_VERSION = "0x60000038"
116116
ELECTRA_FORK_EPOCH = 100000000
117117
FULU_FORK_VERSION = "0x70000038"
118118
FULU_FORK_EPOCH = 100000001
119+
EIP7732_FORK_EPOCH = 100000002
120+
EIP7732_FORK_VERSION = "0x80000038"
121+
EIP7805_FORK_EPOCH = 100000003
122+
EIP7805_FORK_VERSION = "0x90000038"
123+
119124

120125
MAX_LABEL_LENGTH = 63
121126

src/package_io/input_parser.star

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,8 @@ def input_parser(plan, input_args):
329329
deneb_fork_epoch=result["network_params"]["deneb_fork_epoch"],
330330
electra_fork_epoch=result["network_params"]["electra_fork_epoch"],
331331
fulu_fork_epoch=result["network_params"]["fulu_fork_epoch"],
332+
eip7732_fork_epoch=result["network_params"]["eip7732_fork_epoch"],
333+
eip7805_fork_epoch=result["network_params"]["eip7805_fork_epoch"],
332334
network=result["network_params"]["network"],
333335
min_validator_withdrawability_delay=result["network_params"][
334336
"min_validator_withdrawability_delay"
@@ -909,6 +911,8 @@ def default_network_params():
909911
"deneb_fork_epoch": 0,
910912
"electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
911913
"fulu_fork_epoch": constants.FULU_FORK_EPOCH,
914+
"eip7732_fork_epoch": constants.EIP7732_FORK_EPOCH,
915+
"eip7805_fork_epoch": constants.EIP7805_FORK_EPOCH,
912916
"network_sync_base_url": "https://snapshots.ethpandaops.io/",
913917
"data_column_sidecar_subnet_count": 128,
914918
"samples_per_slot": 8,
@@ -948,6 +952,8 @@ def default_minimal_network_params():
948952
"deneb_fork_epoch": 0,
949953
"electra_fork_epoch": constants.ELECTRA_FORK_EPOCH,
950954
"fulu_fork_epoch": constants.FULU_FORK_EPOCH,
955+
"eip7732_fork_epoch": constants.EIP7732_FORK_EPOCH,
956+
"eip7805_fork_epoch": constants.EIP7805_FORK_EPOCH,
951957
"network_sync_base_url": "https://snapshots.ethpandaops.io/",
952958
"data_column_sidecar_subnet_count": 128,
953959
"samples_per_slot": 8,

src/package_io/sanity_check.star

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@ SUBCATEGORY_PARAMS = {
159159
"deneb_fork_epoch",
160160
"electra_fork_epoch",
161161
"fulu_fork_epoch",
162+
"eip7732_fork_epoch",
163+
"eip7805_fork_epoch",
162164
"network_sync_base_url",
163165
"data_column_sidecar_subnet_count",
164166
"samples_per_slot",

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,17 @@ def new_env_file_for_el_cl_genesis_data(
113113
"DenebForkEpoch": network_params.deneb_fork_epoch,
114114
"ElectraForkEpoch": network_params.electra_fork_epoch,
115115
"FuluForkEpoch": network_params.fulu_fork_epoch,
116+
"Eip7732ForkEpoch": network_params.eip7732_fork_epoch,
117+
"Eip7805ForkEpoch": network_params.eip7805_fork_epoch,
116118
"GenesisForkVersion": constants.GENESIS_FORK_VERSION,
117119
"AltairForkVersion": constants.ALTAIR_FORK_VERSION,
118120
"BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION,
119121
"CapellaForkVersion": constants.CAPELLA_FORK_VERSION,
120122
"DenebForkVersion": constants.DENEB_FORK_VERSION,
121123
"ElectraForkVersion": constants.ELECTRA_FORK_VERSION,
122124
"FuluForkVersion": constants.FULU_FORK_VERSION,
125+
"Eip7732ForkVersion": constants.EIP7732_FORK_VERSION,
126+
"Eip7805ForkVersion": constants.EIP7805_FORK_VERSION,
123127
"ShadowForkFile": shadowfork_file,
124128
"MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay,
125129
"ShardCommitteePeriod": network_params.shard_committee_period,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}"
1919
export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}"
2020
export FULU_FORK_VERSION="{{ .FuluForkVersion }}"
2121
export FULU_FORK_EPOCH="{{ .FuluForkEpoch }}"
22+
export EIP7732_FORK_VERSION="{{ .Eip7732ForkVersion }}"
23+
export EIP7732_FORK_EPOCH="{{ .Eip7732ForkEpoch }}"
24+
export EIP7805_FORK_VERSION="{{ .Eip7805ForkVersion }}"
25+
export EIP7805_FORK_EPOCH="{{ .Eip7805ForkEpoch }}"
2226
export WITHDRAWAL_TYPE="0x00"
2327
export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
2428
export GENESIS_TIMESTAMP={{ .UnixTimestamp }}

0 commit comments

Comments
 (0)