@@ -14,29 +14,9 @@ def generate_el_cl_genesis_data(
14
14
image ,
15
15
genesis_generation_config_yml_template ,
16
16
genesis_unix_timestamp ,
17
- network_id ,
18
- deposit_contract_address ,
19
- seconds_per_slot ,
20
- preregistered_validator_keys_mnemonic ,
17
+ network_params ,
21
18
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 ,
31
19
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 ,
40
20
):
41
21
files = {}
42
22
shadowfork_file = ""
@@ -46,29 +26,9 @@ def generate_el_cl_genesis_data(
46
26
47
27
template_data = new_env_file_for_el_cl_genesis_data (
48
28
genesis_unix_timestamp ,
49
- network_id ,
50
- deposit_contract_address ,
51
- seconds_per_slot ,
52
- preregistered_validator_keys_mnemonic ,
53
29
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 ,
63
30
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 ,
72
32
)
73
33
genesis_generation_template = shared_utils .new_template_and_data (
74
34
genesis_generation_config_yml_template , template_data
@@ -138,58 +98,41 @@ def generate_el_cl_genesis_data(
138
98
139
99
def new_env_file_for_el_cl_genesis_data (
140
100
genesis_unix_timestamp ,
141
- network_id ,
142
- deposit_contract_address ,
143
- seconds_per_slot ,
144
- preregistered_validator_keys_mnemonic ,
145
101
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 ,
155
102
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 ,
164
104
):
165
105
return {
166
106
"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 ,
171
111
"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 ,
181
122
"GenesisForkVersion" : constants .GENESIS_FORK_VERSION ,
182
123
"BellatrixForkVersion" : constants .BELLATRIX_FORK_VERSION ,
183
124
"CapellaForkVersion" : constants .CAPELLA_FORK_VERSION ,
184
125
"DenebForkVersion" : constants .DENEB_FORK_VERSION ,
185
126
"ElectraForkVersion" : constants .ELECTRA_FORK_VERSION ,
186
127
"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
+ ),
195
138
}
0 commit comments