fix: move bootnodoor to additional_services

.github/tests/bootnodoor.yaml

@@ -7,5 +7,5 @@ participants:
     count: 1
 additional_services:
   - dora
-bootnode: bootnodoor
+  - bootnodoor
 

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

@@ -29,7 +29,7 @@ additional_services:
   - apache
   - tracoor
   - spamoor
+  - bootnodoor
 ethereum_metrics_exporter_enabled: true
 snooper_enabled: true
 keymanager_enabled: true
-bootnode: bootnodoor

README.md

@@ -846,6 +846,7 @@ additional_services:
   - blobscan
   - blockscout
   - blutgang
+  - bootnodoor
   - broadcaster
   - checkpointz
   - custom_flood
@@ -952,11 +953,6 @@ bootnodoor_params:
   # A list of optional extra args the bootnodoor container should spin up with
   extra_args: []
 
-# Bootnode type
-# Supported values: "client", "bootnodoor"
-# Defaults to "client"
-bootnode: client
-
 # Configuration place for tempo tracing backend
 tempo_params:
   # How long to retain traces

network_params.yaml

@@ -210,7 +210,6 @@ bootnodoor_params:
   min_mem: 128
   max_mem: 512
   extra_args: []
-bootnode: client
 xatu_sentry_enabled: false
 xatu_sentry_params:
   xatu_sentry_image: ethpandaops/xatu-sentry

src/package_io/input_parser.star

@@ -795,7 +795,6 @@ def input_parser(plan, input_args):
             ],
             other_nat_exit_ip=result["port_publisher"]["other"]["nat_exit_ip"],
         ),
-        bootnode=result["bootnode"],
         bootnodoor_params=struct(
             image=result["bootnodoor_params"]["image"],
             min_cpu=result["bootnodoor_params"]["min_cpu"],
@@ -1222,7 +1221,6 @@ def default_input_args(input_args):
             "public_port_start": None,
         },
         "spamoor_params": get_default_spamoor_params(),
-        "bootnode": "client",
         "bootnodoor_params": get_default_bootnodoor_params(),
     }
 

src/package_io/sanity_check.star

@@ -389,6 +389,7 @@ SUBCATEGORY_PARAMS = {
 }
 
 ADDITIONAL_SERVICES_PARAMS = [
+    "bootnodoor",
     "assertoor",
     "broadcaster",
     "tx_fuzz",
@@ -431,7 +432,6 @@ ADDITIONAL_CATEGORY_PARAMS = {
     "keymanager_enabled": "",
     "checkpoint_sync_enabled": "",
     "checkpoint_sync_url": "",
-    "bootnode": "",
 }
 
 

src/participant_network.star

@@ -145,8 +145,9 @@ def launch_participant_network(
     # Launch bootnodoor if configured
     bootnodoor_enr = None
     bootnodoor_enode = None
-    if args_with_right_defaults.bootnode == "bootnodoor":
+    if "bootnodoor" in args_with_right_defaults.additional_services:
         plan.print("Launching bootnodoor as bootnode service")
+        args_with_right_defaults.additional_services.remove("bootnodoor")
         bootnodoor_enr, bootnodoor_enode = bootnodoor_launcher.launch_bootnodoor(
             plan,
             args_with_right_defaults.bootnodoor_params,