fix: Fix missing EL/CL with multiple chains (#227)

janjakubnanista · web-flow · commit aa14baf64095 · 2025-04-21T14:47:33.000-07:00
**Description**

- EL/CL names were not unique within an enclave, only within an L2
network. This meant that individual L2 networks were missing clients
diff --git a/src/el_cl_launcher.star b/src/el_cl_launcher.star
@@ -244,20 +244,28 @@ def launch(
             index + 1, len(str(len(participants)))
         )
 
-        el_service_name = "op-el-{0}-{1}-{2}-{3}".format(
-            index_str, el_type, cl_type, l2_services_suffix
+        el_service_name = "op-el-{0}-{1}-{2}-{3}-{4}".format(
+            network_params.network_id, index_str, el_type, cl_type, l2_services_suffix
         )
-        cl_service_name = "op-cl-{0}-{1}-{2}-{3}".format(
-            index_str, cl_type, el_type, l2_services_suffix
+        cl_service_name = "op-cl-{0}-{1}-{2}-{3}-{4}".format(
+            network_params.network_id, index_str, cl_type, el_type, l2_services_suffix
         )
-        el_builder_service_name = "op-el-builder-{0}-{1}-{2}-{3}".format(
-            index_str, el_builder_type, cl_builder_type, l2_services_suffix
+        el_builder_service_name = "op-el-builder-{0}-{1}-{2}-{3}-{4}".format(
+            network_params.network_id,
+            index_str,
+            el_builder_type,
+            cl_builder_type,
+            l2_services_suffix,
         )
-        cl_builder_service_name = "op-cl-builder-{0}-{1}-{2}-{3}".format(
-            index_str, cl_builder_type, el_builder_type, l2_services_suffix
+        cl_builder_service_name = "op-cl-builder-{0}-{1}-{2}-{3}-{4}".format(
+            network_params.network_id,
+            index_str,
+            cl_builder_type,
+            el_builder_type,
+            l2_services_suffix,
         )
-        sidecar_service_name = "op-rollup-boost-{0}-{1}".format(
-            index_str, l2_services_suffix
+        sidecar_service_name = "op-rollup-boost-{0}-{1}-{2}".format(
+            network_params.network_id, index_str, l2_services_suffix
         )
 
         el_context = el_launch_method(
diff --git a/test/el_cl_launcher_test.star b/test/el_cl_launcher_test.star
@@ -75,11 +75,13 @@ def test_launch_with_defaults(plan):
         da_server_context=da_server_context,
     )
 
-    el_service_name = "op-el-1-op-reth-op-node-"
+    el_service_name = "op-el-2151908-1-op-reth-op-node-"
     el_service = plan.get_service(el_service_name)
     el_service_config = kurtosistest.get_service_config(el_service_name)
 
-    cl_service_config = kurtosistest.get_service_config("op-cl-1-op-node-op-reth-")
+    cl_service_config = kurtosistest.get_service_config(
+        "op-cl-2151908-1-op-node-op-reth-"
+    )
     expect.ne(cl_service_config, None)
     expect.eq(cl_service_config.image, "op-node:latest")
     expect.eq(cl_service_config.env_vars, {})
@@ -205,7 +207,7 @@ def test_launch_with_el_op_besu(plan):
         da_server_context=da_server_context,
     )
 
-    el_service_name = "op-el-1-op-besu-op-node-"
+    el_service_name = "op-el-2151908-1-op-besu-op-node-"
     el_service = plan.get_service(el_service_name)
     el_service_config = kurtosistest.get_service_config(el_service_name)
     expect.ne(el_service_config, None)
diff --git a/test/main_test.star b/test/main_test.star
@@ -0,0 +1,46 @@
+main = import_module("/main.star")
+
+
+def test_multiple_chains(plan):
+    main.run(
+        plan,
+        {
+            "optimism_package": {
+                "chains": [
+                    {
+                        "network_params": {
+                            "network_id": "1000",
+                        }
+                    },
+                    {
+                        "network_params": {
+                            "network_id": "2000",
+                        }
+                    },
+                ],
+            },
+        },
+    )
+
+    services = plan.get_services()
+    cl_service_names = [
+        service.name for service in services if service.name.startswith("op-cl-")
+    ]
+    expect.eq(
+        cl_service_names,
+        [
+            "op-cl-1000-1-op-node-op-geth-op-kurtosis",
+            "op-cl-2000-1-op-node-op-geth-op-kurtosis",
+        ],
+    )
+
+    el_service_names = [
+        service.name for service in services if service.name.startswith("op-el-")
+    ]
+    expect.eq(
+        el_service_names,
+        [
+            "op-el-1000-1-op-geth-op-node-op-kurtosis",
+            "op-el-2000-1-op-geth-op-node-op-kurtosis",
+        ],
+    )
