feat: add spammor_blob wrapper v1 to activate with fulu (#948)

Author: barnabasbusa

main.star

@@ -190,6 +190,7 @@ def run(plan, args={}):
         genesis_validators_root,
         el_cl_data_files_artifact_uuid,
         network_id,
+        osaka_time,
     ) = participant_network.launch_participant_network(
         plan,
         args_with_right_defaults,
@@ -690,6 +691,8 @@ def run(plan, args={}):
                 all_el_contexts,
                 args_with_right_defaults.spamoor_blob_params,
                 global_node_selectors,
+                args_with_right_defaults.network_params,
+                osaka_time,
             )
         else:
             fail("Invalid additional service %s" % (additional_service))

src/network_launcher/devnet.star

@@ -4,7 +4,7 @@ el_cl_genesis_data = import_module(
 )
 
 
-def launch(plan, network, prague_time, repo):
+def launch(plan, network, repo):
     # We are running a devnet
     url = shared_utils.calculate_devnet_url(network, repo)
     el_cl_genesis_uuid = plan.upload_files(
@@ -23,7 +23,6 @@ def launch(plan, network, prague_time, repo):
     el_cl_data = el_cl_genesis_data.new_el_cl_genesis_data(
         el_cl_genesis_data_uuid.files_artifacts[0],
         genesis_validators_root,
-        prague_time,
     )
     final_genesis_timestamp = shared_utils.read_genesis_timestamp_from_config(
         plan, el_cl_genesis_data_uuid.files_artifacts[0]

src/network_launcher/ephemery.star

@@ -4,7 +4,7 @@ el_cl_genesis_data = import_module(
 )
 
 
-def launch(plan, prague_time):
+def launch(plan):
     el_cl_genesis_data_uuid = plan.run_sh(
         name="fetch-ephemery-genesis-data",
         description="Creating network configs",
@@ -23,7 +23,6 @@ def launch(plan, prague_time):
     el_cl_data = el_cl_genesis_data.new_el_cl_genesis_data(
         el_cl_genesis_data_uuid.files_artifacts[0],
         genesis_validators_root,
-        prague_time,
     )
     final_genesis_timestamp = shared_utils.read_genesis_timestamp_from_config(
         plan, el_cl_genesis_data_uuid.files_artifacts[0]

src/network_launcher/public_network.star

@@ -5,7 +5,7 @@ el_cl_genesis_data = import_module(
 constants = import_module("../package_io/constants.star")
 
 
-def launch(plan, network, prague_time):
+def launch(plan, network):
     # We are running a public network
     dummy_genesis_data = plan.run_sh(
         name="dummy-genesis-data",
@@ -16,7 +16,6 @@ def launch(plan, network, prague_time):
     el_cl_data = el_cl_genesis_data.new_el_cl_genesis_data(
         dummy_genesis_data.files_artifacts[0],
         constants.GENESIS_VALIDATORS_ROOT[network],
-        prague_time,
     )
     final_genesis_timestamp = constants.GENESIS_TIME[network]
     network_id = constants.NETWORK_ID[network]

src/participant_network.star

@@ -44,7 +44,6 @@ def launch_participant_network(
     network_id = network_params.network_id
     latest_block = ""
     num_participants = len(args_with_right_defaults.participants)
-    prague_time = 0
     shadowfork_block = "latest"
     total_number_of_validator_keys = 0
     if (
@@ -105,7 +104,7 @@ def launch_participant_network(
             final_genesis_timestamp,
             network_id,
             validator_data,
-        ) = launch_ephemery.launch(plan, prague_time)
+        ) = launch_ephemery.launch(plan)
     elif (
         network_params.network in constants.PUBLIC_NETWORKS
         and network_params.network != constants.NETWORK_NAME.ephemery
@@ -116,7 +115,7 @@ def launch_participant_network(
             final_genesis_timestamp,
             network_id,
             validator_data,
-        ) = launch_public_network.launch(plan, network_params.network, prague_time)
+        ) = launch_public_network.launch(plan, network_params.network)
     else:
         # We are running a devnet
         (
@@ -127,7 +126,6 @@ def launch_participant_network(
         ) = launch_devnet.launch(
             plan,
             network_params.network,
-            prague_time,
             network_params.devnet_repo,
         )
 
@@ -444,4 +442,5 @@ def launch_participant_network(
         el_cl_data.genesis_validators_root,
         el_cl_data.files_artifact_uuid,
         network_id,
+        el_cl_data.osaka_time,
     )

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_data.star

@@ -2,9 +2,11 @@ def new_el_cl_genesis_data(
     files_artifact_uuid,
     genesis_validators_root,
     prague_time,
+    osaka_time,
 ):
     return struct(
         files_artifact_uuid=files_artifact_uuid,
         genesis_validators_root=genesis_validators_root,
         prague_time=prague_time,
+        osaka_time=osaka_time,
     )

src/prelaunch_data_generator/el_cl_genesis/el_cl_genesis_generator.star

@@ -92,10 +92,18 @@ def generate_el_cl_genesis_data(
         files={"/data": genesis.files_artifacts[0]},
     )
 
+    osaka_time = plan.run_sh(
+        name="read-osaka-time",
+        description="Reading osaka time from genesis",
+        run="jq .config.osakaTime /data/genesis.json | tr -d '\n'",
+        files={"/data": genesis.files_artifacts[0]},
+    )
+
     result = el_cl_genesis_data.new_el_cl_genesis_data(
         genesis.files_artifacts[0],
         genesis_validators_root.output,
         prague_time.output,
+        osaka_time.output,
     )
 
     return result

src/spamoor_blob/spamoor_blob.star

@@ -1,4 +1,5 @@
 shared_utils = import_module("../shared_utils/shared_utils.star")
+constants = import_module("../package_io/constants.star")
 SERVICE_NAME = "spamoor-blob"
 
 # The min/max CPU/memory that spamoor can use
@@ -14,12 +15,16 @@ def launch_spamoor_blob(
     all_el_contexts,
     spamoor_params,
     global_node_selectors,
+    network_params,
+    osaka_time,
 ):
     config = get_config(
         prefunded_addresses,
         all_el_contexts,
         spamoor_params,
         global_node_selectors,
+        network_params,
+        osaka_time,
     )
     plan.add_service(SERVICE_NAME, config)
 
@@ -29,7 +34,10 @@ def get_config(
     all_el_contexts,
     spamoor_params,
     node_selectors,
+    network_params,
+    osaka_time,
 ):
+    image = spamoor_params.image
     cmd = [
         "{}".format(spamoor_params.scenario),
         "--privkey={}".format(prefunded_addresses[4].private_key),
@@ -38,6 +46,14 @@ def get_config(
         ),
     ]
 
+    if (
+        "peerdas" in network_params.network
+        or network_params.fulu_fork_epoch != constants.FAR_FUTURE_EPOCH
+    ):
+        image = "ethpandaops/spamoor:blob-v1"
+        cmd.append("--fulu-activation={}".format(osaka_time))
+        cmd.append("--blob-v1-percent=100")
+
     if spamoor_params.throughput != None:
         cmd.append("--throughput={}".format(spamoor_params.throughput))
 
@@ -54,7 +70,7 @@ def get_config(
         cmd.extend([param for param in spamoor_params.spamoor_extra_args])
 
     return ServiceConfig(
-        image=spamoor_params.image,
+        image=image,
         cmd=cmd,
         min_cpu=MIN_CPU,
         max_cpu=MAX_CPU,