Skip to content

Commit cb203ff

Browse files
authored
feat: add eof support (#682)
1 parent 75ed7e1 commit cb203ff

File tree

7 files changed

+48
-106
lines changed

7 files changed

+48
-106
lines changed

.github/tests/eof.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
participants:
2+
- el_type: besu
3+
el_image: ethpandaops/besu:shemnon-eof-cancunEOF-fork
4+
count: 3
5+
cl_type: teku
6+
cl_image: ethpandaops/teku:master
7+
network_params:
8+
electra_fork_epoch: 1
9+
eof_activation_epoch: 2
10+
additional_services:
11+
- dora
12+
- blockscout

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@ network_params:
499499
# The fork version to set if the eip7594 fork is active
500500
eip7594_fork_version: "0x70000038"
501501

502+
# EOF activation fork epoch (EL only fork)
503+
# Defaults to null
504+
eof_activation_fork_epoch: null
505+
502506
# Network sync base url for syncing public networks from a custom snapshot (mostly useful for shadowforks)
503507
# Defaults to "https://ethpandaops-ethereum-node-snapshots.ams3.cdn.digitaloceanspaces.com/
504508
# If you have a local snapshot, you can set this to the local url:

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.2.1", # Default
91+
deneb_genesis="ethpandaops/ethereum-genesis-generator:3.3.0", # 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ def input_parser(plan, input_args):
279279
electra_fork_epoch=result["network_params"]["electra_fork_epoch"],
280280
eip7594_fork_epoch=result["network_params"]["eip7594_fork_epoch"],
281281
eip7594_fork_version=result["network_params"]["eip7594_fork_version"],
282+
eof_activation_epoch=result["network_params"]["eof_activation_epoch"],
282283
network=result["network_params"]["network"],
283284
min_validator_withdrawability_delay=result["network_params"][
284285
"min_validator_withdrawability_delay"
@@ -786,6 +787,7 @@ def default_network_params():
786787
"electra_fork_epoch": 100000000,
787788
"eip7594_fork_epoch": 100000001,
788789
"eip7594_fork_version": "0x70000038",
790+
"eof_activation_epoch": "",
789791
"network_sync_base_url": "https://ethpandaops-ethereum-node-snapshots.ams3.cdn.digitaloceanspaces.com/",
790792
"data_column_sidecar_subnet_count": 32,
791793
"samples_per_slot": 8,

src/participant_network.star

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,29 +90,9 @@ def launch_participant_network(
9090
ethereum_genesis_generator_image,
9191
el_cl_genesis_config_template,
9292
final_genesis_timestamp,
93-
network_id,
94-
network_params.deposit_contract_address,
95-
network_params.seconds_per_slot,
96-
network_params.preregistered_validator_keys_mnemonic,
93+
network_params,
9794
total_number_of_validator_keys,
98-
network_params.genesis_delay,
99-
network_params.max_per_epoch_activation_churn_limit,
100-
network_params.churn_limit_quotient,
101-
network_params.ejection_balance,
102-
network_params.eth1_follow_distance,
103-
network_params.deneb_fork_epoch,
104-
network_params.electra_fork_epoch,
105-
network_params.eip7594_fork_epoch,
106-
network_params.eip7594_fork_version,
10795
latest_block.files_artifacts[0] if latest_block != "" else "",
108-
network_params.min_validator_withdrawability_delay,
109-
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,
114-
network_params.preset,
115-
network_params.additional_preloaded_contracts,
11696
)
11797
elif network_params.network in constants.PUBLIC_NETWORKS:
11898
# We are running a public network

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

Lines changed: 27 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,9 @@ def generate_el_cl_genesis_data(
1414
image,
1515
genesis_generation_config_yml_template,
1616
genesis_unix_timestamp,
17-
network_id,
18-
deposit_contract_address,
19-
seconds_per_slot,
20-
preregistered_validator_keys_mnemonic,
17+
network_params,
2118
total_num_validator_keys_to_preregister,
22-
genesis_delay,
23-
max_per_epoch_activation_churn_limit,
24-
churn_limit_quotient,
25-
ejection_balance,
26-
eth1_follow_distance,
27-
deneb_fork_epoch,
28-
electra_fork_epoch,
29-
eip7594_fork_epoch,
30-
eip7594_fork_version,
3119
latest_block,
32-
min_validator_withdrawability_delay,
33-
shard_committee_period,
34-
data_column_sidecar_subnet_count,
35-
samples_per_slot,
36-
custody_requirement,
37-
target_number_of_peers,
38-
preset,
39-
additional_preloaded_contracts,
4020
):
4121
files = {}
4222
shadowfork_file = ""
@@ -46,29 +26,9 @@ def generate_el_cl_genesis_data(
4626

4727
template_data = new_env_file_for_el_cl_genesis_data(
4828
genesis_unix_timestamp,
49-
network_id,
50-
deposit_contract_address,
51-
seconds_per_slot,
52-
preregistered_validator_keys_mnemonic,
5329
total_num_validator_keys_to_preregister,
54-
genesis_delay,
55-
max_per_epoch_activation_churn_limit,
56-
churn_limit_quotient,
57-
ejection_balance,
58-
eth1_follow_distance,
59-
deneb_fork_epoch,
60-
electra_fork_epoch,
61-
eip7594_fork_epoch,
62-
eip7594_fork_version,
6330
shadowfork_file,
64-
min_validator_withdrawability_delay,
65-
shard_committee_period,
66-
data_column_sidecar_subnet_count,
67-
samples_per_slot,
68-
custody_requirement,
69-
target_number_of_peers,
70-
preset,
71-
additional_preloaded_contracts,
31+
network_params,
7232
)
7333
genesis_generation_template = shared_utils.new_template_and_data(
7434
genesis_generation_config_yml_template, template_data
@@ -138,58 +98,41 @@ def generate_el_cl_genesis_data(
13898

13999
def new_env_file_for_el_cl_genesis_data(
140100
genesis_unix_timestamp,
141-
network_id,
142-
deposit_contract_address,
143-
seconds_per_slot,
144-
preregistered_validator_keys_mnemonic,
145101
total_num_validator_keys_to_preregister,
146-
genesis_delay,
147-
max_per_epoch_activation_churn_limit,
148-
churn_limit_quotient,
149-
ejection_balance,
150-
eth1_follow_distance,
151-
deneb_fork_epoch,
152-
electra_fork_epoch,
153-
eip7594_fork_epoch,
154-
eip7594_fork_version,
155102
shadowfork_file,
156-
min_validator_withdrawability_delay,
157-
shard_committee_period,
158-
data_column_sidecar_subnet_count,
159-
samples_per_slot,
160-
custody_requirement,
161-
target_number_of_peers,
162-
preset,
163-
additional_preloaded_contracts,
103+
network_params,
164104
):
165105
return {
166106
"UnixTimestamp": genesis_unix_timestamp,
167-
"NetworkId": network_id,
168-
"DepositContractAddress": deposit_contract_address,
169-
"SecondsPerSlot": seconds_per_slot,
170-
"PreregisteredValidatorKeysMnemonic": preregistered_validator_keys_mnemonic,
107+
"NetworkId": network_params.network_id,
108+
"DepositContractAddress": network_params.deposit_contract_address,
109+
"SecondsPerSlot": network_params.seconds_per_slot,
110+
"PreregisteredValidatorKeysMnemonic": network_params.preregistered_validator_keys_mnemonic,
171111
"NumValidatorKeysToPreregister": total_num_validator_keys_to_preregister,
172-
"GenesisDelay": genesis_delay,
173-
"MaxPerEpochActivationChurnLimit": max_per_epoch_activation_churn_limit,
174-
"ChurnLimitQuotient": churn_limit_quotient,
175-
"EjectionBalance": ejection_balance,
176-
"Eth1FollowDistance": eth1_follow_distance,
177-
"DenebForkEpoch": deneb_fork_epoch,
178-
"ElectraForkEpoch": electra_fork_epoch,
179-
"EIP7594ForkEpoch": eip7594_fork_epoch,
180-
"EIP7594ForkVersion": eip7594_fork_version,
112+
"GenesisDelay": network_params.genesis_delay,
113+
"MaxPerEpochActivationChurnLimit": network_params.max_per_epoch_activation_churn_limit,
114+
"ChurnLimitQuotient": network_params.churn_limit_quotient,
115+
"EjectionBalance": network_params.ejection_balance,
116+
"Eth1FollowDistance": network_params.eth1_follow_distance,
117+
"DenebForkEpoch": network_params.deneb_fork_epoch,
118+
"ElectraForkEpoch": network_params.electra_fork_epoch,
119+
"EIP7594ForkEpoch": network_params.eip7594_fork_epoch,
120+
"EIP7594ForkVersion": network_params.eip7594_fork_version,
121+
"EOFActivationEpoch": network_params.eof_activation_epoch,
181122
"GenesisForkVersion": constants.GENESIS_FORK_VERSION,
182123
"BellatrixForkVersion": constants.BELLATRIX_FORK_VERSION,
183124
"CapellaForkVersion": constants.CAPELLA_FORK_VERSION,
184125
"DenebForkVersion": constants.DENEB_FORK_VERSION,
185126
"ElectraForkVersion": constants.ELECTRA_FORK_VERSION,
186127
"ShadowForkFile": shadowfork_file,
187-
"MinValidatorWithdrawabilityDelay": min_validator_withdrawability_delay,
188-
"ShardCommitteePeriod": shard_committee_period,
189-
"DataColumnSidecarSubnetCount": data_column_sidecar_subnet_count,
190-
"SamplesPerSlot": samples_per_slot,
191-
"CustodyRequirement": custody_requirement,
192-
"TargetNumberOfPeers": target_number_of_peers,
193-
"Preset": preset,
194-
"AdditionalPreloadedContracts": json.encode(additional_preloaded_contracts),
128+
"MinValidatorWithdrawabilityDelay": network_params.min_validator_withdrawability_delay,
129+
"ShardCommitteePeriod": network_params.shard_committee_period,
130+
"DataColumnSidecarSubnetCount": network_params.data_column_sidecar_subnet_count,
131+
"SamplesPerSlot": network_params.samples_per_slot,
132+
"CustodyRequirement": network_params.custody_requirement,
133+
"TargetNumberOfPeers": network_params.target_number_of_peers,
134+
"Preset": network_params.preset,
135+
"AdditionalPreloadedContracts": json.encode(
136+
network_params.additional_preloaded_contracts
137+
),
195138
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export ELECTRA_FORK_VERSION="{{ .ElectraForkVersion }}"
1616
export ELECTRA_FORK_EPOCH="{{ .ElectraForkEpoch }}"
1717
export EIP7594_FORK_EPOCH="{{ .EIP7594ForkEpoch }}"
1818
export EIP7594_FORK_VERSION="{{ .EIP7594ForkVersion }}"
19+
export EOF_ACTIVATION_EPOCH="{{ .EOFActivationEpoch }}"
1920
export WITHDRAWAL_TYPE="0x00"
2021
export WITHDRAWAL_ADDRESS=0xf97e180c050e5Ab072211Ad2C213Eb5AEE4DF134
2122
export GENESIS_TIMESTAMP={{ .UnixTimestamp }}

0 commit comments

Comments
 (0)