Skip to content
2 changes: 0 additions & 2 deletions src/el/erigon/erigon_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,4 @@ def new_erigon_launcher(el_cl_genesis_data, jwt_file, networkid):
el_cl_genesis_data=el_cl_genesis_data,
jwt_file=jwt_file,
networkid=networkid,
osaka_time=el_cl_genesis_data.osaka_time,
osaka_enabled=el_cl_genesis_data.osaka_enabled,
)
14 changes: 10 additions & 4 deletions src/el/geth/geth_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,15 @@ def get_config(
)
)
if constants.NETWORK_NAME.shadowfork in network_params.network: # shadowfork
if launcher.osaka_enabled:
cmd.append("--override.osaka=" + str(launcher.osaka_time))
cmd.append(
"--override.osaka=" + str(launcher.shadowfork_times["osaka_time"])
)
cmd.append(
"--override.bpo1=" + str(launcher.shadowfork_times["bpo_1_time"])
)
cmd.append(
"--override.bpo2=" + str(launcher.shadowfork_times["bpo_2_time"])
)

elif (
network_params.network not in constants.PUBLIC_NETWORKS
Expand Down Expand Up @@ -364,6 +371,5 @@ def new_geth_launcher(
el_cl_genesis_data=el_cl_genesis_data,
jwt_file=jwt_file,
networkid=networkid,
osaka_time=el_cl_genesis_data.osaka_time,
osaka_enabled=el_cl_genesis_data.osaka_enabled,
shadowfork_times=el_cl_genesis_data.shadowfork_times,
)
12 changes: 6 additions & 6 deletions src/package_io/input_parser.star
Original file line number Diff line number Diff line change
Expand Up @@ -1194,13 +1194,13 @@ def default_network_params():
"perfect_peerdas_enabled": False,
"gas_limit": 0,
"bpo_1_epoch": 18446744073709551615,
"bpo_1_max_blobs": 0,
"bpo_1_target_blobs": 0,
"bpo_1_base_fee_update_fraction": 0,
"bpo_1_max_blobs": 15,
"bpo_1_target_blobs": 10,
"bpo_1_base_fee_update_fraction": 8346193,
"bpo_2_epoch": 18446744073709551615,
"bpo_2_max_blobs": 0,
"bpo_2_target_blobs": 0,
"bpo_2_base_fee_update_fraction": 0,
"bpo_2_max_blobs": 21,
"bpo_2_target_blobs": 14,
"bpo_2_base_fee_update_fraction": 11684671,
"bpo_3_epoch": 18446744073709551615,
"bpo_3_max_blobs": 0,
"bpo_3_target_blobs": 0,
Expand Down
2 changes: 1 addition & 1 deletion src/participant_network.star
Original file line number Diff line number Diff line change
Expand Up @@ -603,5 +603,5 @@ def launch_participant_network(
el_cl_data.genesis_validators_root,
el_cl_data.files_artifact_uuid,
network_id,
el_cl_data.osaka_time,
el_cl_data.shadowfork_times["osaka_time"],
)
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
def new_el_cl_genesis_data(
files_artifact_uuid,
genesis_validators_root,
osaka_time=0,
osaka_enabled=False,
shadowfork_times={},
):
return struct(
files_artifact_uuid=files_artifact_uuid,
genesis_validators_root=genesis_validators_root,
osaka_time=osaka_time,
osaka_enabled=osaka_enabled,
shadowfork_times=shadowfork_times,
)
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ def generate_el_cl_genesis_data(
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)
shadowfork_times = {}

osaka_time = plan.run_sh(
name="read-osaka-time",
description="Reading osaka time from genesis",
Expand All @@ -101,20 +103,36 @@ def generate_el_cl_genesis_data(
node_selectors=global_node_selectors,
)

osaka_enabled_check = plan.run_sh(
name="check-osaka-enabled",
description="Check if osaka time is enabled (not false)",
run="test \"$(jq '.config.osakaTime // false' /data/genesis.json | tr -d '\n')\" != \"false\" && echo true || echo false",
bpo_1_time = plan.run_sh(
name="read-bpo-1-time",
description="Reading bpo 1 time from genesis",
run="jq '.config.bpo1Time' /data/genesis.json | tr -d '\n'",
files={"/data": genesis.files_artifacts[0]},
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)

bpo_2_time = plan.run_sh(
name="read-bpo-2-time",
description="Reading bpo 2 time from genesis",
run="jq '.config.bpo2Time' /data/genesis.json | tr -d '\n'",
files={"/data": genesis.files_artifacts[0]},
tolerations=shared_utils.get_tolerations(global_tolerations=global_tolerations),
node_selectors=global_node_selectors,
)

shadowfork_times = {
"osaka_time": osaka_time.output,
"bpo_1_time": bpo_1_time.output,
"bpo_2_time": bpo_2_time.output,
}

plan.print("Shadowfork times: {0}".format(shadowfork_times))

result = el_cl_genesis_data.new_el_cl_genesis_data(
genesis.files_artifacts[0],
genesis_validators_root.output,
osaka_time.output,
osaka_enabled_check.output == "true",
shadowfork_times,
)

return result
Expand Down