feat: signer info for batcher, challenger, sequencer, proposer

Author: zapper-95

src/batcher/op-batcher/op_batcher_launcher.star

@@ -120,9 +120,6 @@ def get_batcher_config(
     plan.print("Batcher params: " + str(batcher_params))
     plan.print(batcher_params.signer_endpoint)
     plan.print(batcher_params.signer_address)
-
-    # cmd.append("--private-key=" + gs_batcher_private_key)
-
     if batcher_params.private_key:
         cmd.append("--private-key=" + gs_batcher_private_key)
     else:

src/challenger/op-challenger/op_challenger_launcher.star

@@ -109,11 +109,18 @@ def get_challenger_config(
         "--l1-beacon=" + l1_config_env_vars["CL_RPC_URL"],
         "--l1-eth-rpc=" + l1_config_env_vars["L1_RPC_URL"],
         "--l2-eth-rpc=" + el_context.rpc_http_url,
-        "--private-key=" + challenger_key,
         "--rollup-rpc=" + cl_context.beacon_http_url,
         "--trace-type=" + ",".join(challenger_params.cannon_trace_types),
     ]
 
+    if challenger_params.private_key:
+        cmd.append("--private-key=" + challenger_key)
+    else:
+        cmd.append("--signer.endpoint=" + str(challenger_params.signer_endpoint))
+        cmd.append("--signer.address=" + str(challenger_params.signer_address))
+        cmd.append("--signer.tls.enabled=false")
+
+    plan.print(cmd)
     # configure files
 
     files = {

src/cl/hildr/hildr_launcher.star

@@ -79,6 +79,7 @@ def launch(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     # beacon_node_identity_recipe = PostHttpRequestRecipe(
     #     endpoint="/",
@@ -111,6 +112,7 @@ def launch(
         sequencer_enabled,
         observability_helper,
         da_server_context,
+        sequencer_params,
     )
 
     beacon_service = plan.add_service(service_name, config)
@@ -158,6 +160,7 @@ def get_beacon_config(
     sequencer_enabled,
     observability_helper,
     da_server_context,
+    sequencer_params,
 ):
     EXECUTION_ENGINE_ENDPOINT = "http://{0}:{1}".format(
         el_context.ip_addr,
@@ -223,6 +226,7 @@ def get_beacon_config(
         observability.expose_metrics_port(ports)
 
     if sequencer_enabled:
+        # this value is never used so why is it set?????
         sequencer_private_key = util.read_network_config_value(
             plan,
             launcher.deployment_output,
@@ -279,9 +283,10 @@ def get_beacon_config(
     return ServiceConfig(**config_args)
 
 
-def new_hildr_launcher(deployment_output, jwt_file, network_params):
+def new_hildr_launcher(deployment_output, jwt_file, network_params, sequencer_params):
     return struct(
         deployment_output=deployment_output,
         jwt_file=jwt_file,
         network_params=network_params,
+        sequencer_params=sequencer_params,
     )

src/cl/op-node/op_node_builder_launcher.star

@@ -78,6 +78,7 @@ def launch(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     beacon_node_identity_recipe = PostHttpRequestRecipe(
         endpoint="/",
@@ -112,6 +113,7 @@ def launch(
         observability_helper,
         interop_params,
         da_server_context,
+        sequencer_params,
     )
 
     beacon_service = plan.add_service(service_name, config)
@@ -161,6 +163,7 @@ def get_beacon_config(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     ports = dict(get_used_ports(BEACON_DISCOVERY_PORT_NUM))
 
@@ -247,15 +250,18 @@ def get_beacon_config(
         )
 
     if sequencer_enabled:
-        sequencer_private_key = util.read_network_config_value(
-            plan,
-            launcher.deployment_output,
-            "sequencer-{0}".format(launcher.network_params.network_id),
-            ".privateKey",
-        )
+        if not sequencer_params.private_key:
+            env_vars.update(
+                {
+                    "OP_NODE_SIGNER_ADDRESS": str(sequencer_params.signer_address),
+                    "OP_NODE_SIGNER_ENDPOINT": str(sequencer_params.signer_endpoint),
+                    "OP_NODE_SIGNER_TLS_ENABLED": "false",
+                }
+            )
+        else:
+            cmd += ["--p2p.sequencer.key=" + sequencer_params.private_key]
 
         cmd += [
-            "--p2p.sequencer.key=" + sequencer_private_key,
             "--sequencer.enabled",
             "--sequencer.l1-confs=2",
         ]
@@ -314,9 +320,12 @@ def get_beacon_config(
     return ServiceConfig(**config_args)
 
 
-def new_op_node_builder_launcher(deployment_output, jwt_file, network_params):
+def new_op_node_builder_launcher(
+    deployment_output, jwt_file, network_params, sequencer_params
+):
     return struct(
         deployment_output=deployment_output,
         jwt_file=jwt_file,
         network_params=network_params,
+        sequencer_params=sequencer_params,
     )

src/cl/op-node/op_node_launcher.star

@@ -78,6 +78,7 @@ def launch(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     beacon_node_identity_recipe = PostHttpRequestRecipe(
         endpoint="/",
@@ -112,6 +113,7 @@ def launch(
         observability_helper,
         interop_params,
         da_server_context,
+        sequencer_params,
     )
 
     beacon_service = plan.add_service(service_name, config)
@@ -161,6 +163,7 @@ def get_beacon_config(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     ports = dict(get_used_ports(BEACON_DISCOVERY_PORT_NUM))
 
@@ -248,15 +251,18 @@ def get_beacon_config(
         )
 
     if sequencer_enabled:
-        sequencer_private_key = util.read_network_config_value(
-            plan,
-            launcher.deployment_output,
-            "sequencer-{0}".format(launcher.network_params.network_id),
-            ".privateKey",
-        )
+        if not sequencer_params.private_key:
+            env_vars.update(
+                {
+                    "OP_NODE_SIGNER_ADDRESS": str(sequencer_params.signer_address),
+                    "OP_NODE_SIGNER_ENDPOINT": str(sequencer_params.signer_endpoint),
+                    "OP_NODE_SIGNER_TLS_ENABLED": "false",
+                }
+            )
+        else:
+            cmd += ["--p2p.sequencer.key=" + sequencer_params.private_key]
 
         cmd += [
-            "--p2p.sequencer.key=" + sequencer_private_key,
             "--sequencer.enabled",
             "--sequencer.l1-confs=2",
         ]
@@ -315,9 +321,10 @@ def get_beacon_config(
     return ServiceConfig(**config_args)
 
 
-def new_op_node_launcher(deployment_output, jwt_file, network_params):
+def new_op_node_launcher(deployment_output, jwt_file, network_params, sequencer_params):
     return struct(
         deployment_output=deployment_output,
         jwt_file=jwt_file,
         network_params=network_params,
+        sequencer_params=sequencer_params,
     )

src/el_cl_launcher.star

@@ -45,6 +45,7 @@ def launch(
     observability_helper,
     interop_params,
     da_server_context,
+    sequencer_params,
 ):
     el_launchers = {
         "op-geth": {
@@ -118,13 +119,13 @@ def launch(
     cl_launchers = {
         "op-node": {
             "launcher": op_node.new_op_node_launcher(
-                deployment_output, jwt_file, network_params
+                deployment_output, jwt_file, network_params, sequencer_params
             ),
             "launch_method": op_node.launch,
         },
         "hildr": {
             "launcher": hildr.new_hildr_launcher(
-                deployment_output, jwt_file, network_params
+                deployment_output, jwt_file, network_params, sequencer_params
             ),
             "launch_method": hildr.launch,
         },
@@ -133,7 +134,7 @@ def launch(
     cl_builder_launchers = {
         "op-node": {
             "launcher": op_node_builder.new_op_node_builder_launcher(
-                deployment_output, jwt_file, network_params
+                deployment_output, jwt_file, network_params, sequencer_params
             ),
             "launch_method": op_node_builder.launch,
         },
@@ -354,6 +355,7 @@ def launch(
             observability_helper,
             interop_params,
             da_server_context,
+            sequencer_params,
         )
 
         # We need to make sure that el_context and cl_context are first in the list, as down the line all_el_contexts[0]

src/l2.star

@@ -28,6 +28,7 @@ def launch_l2(
     batcher_params = l2_args.batcher_params
     challenger_params = l2_args.challenger_params
     proposer_params = l2_args.proposer_params
+    sequencer_params = l2_args.sequencer_params
     mev_params = l2_args.mev_params
 
     plan.print("Deploying L2 with name {0}".format(network_params.name))
@@ -52,6 +53,7 @@ def launch_l2(
         batcher_params,
         challenger_params,
         proposer_params,
+        sequencer_params,
         mev_params,
         deployment_output,
         l1_config,

src/participant_network.star

@@ -17,6 +17,7 @@ def launch_participant_network(
     batcher_params,
     challenger_params,
     proposer_params,
+    sequencer_params,
     mev_params,
     deployment_output,
     l1_config_env_vars,
@@ -52,6 +53,7 @@ def launch_participant_network(
         observability_helper,
         interop_params,
         da_server_context,
+        sequencer_params,
     )
 
     all_participants = []

src/proposer/op-proposer/op_proposer_launcher.star

@@ -93,14 +93,20 @@ def get_proposer_config(
         "--rpc.port=" + str(PROPOSER_HTTP_PORT_NUM),
         "--rollup-rpc=" + cl_context.beacon_http_url,
         "--game-factory-address=" + str(game_factory_address),
-        "--private-key=" + gs_proposer_private_key,
         "--l1-eth-rpc=" + l1_config_env_vars["L1_RPC_URL"],
         "--allow-non-finalized=true",
         "--game-type={0}".format(proposer_params.game_type),
         "--proposal-interval=" + proposer_params.proposal_interval,
         "--wait-node-sync=true",
     ]
 
+    if proposer_params.private_key:
+        cmd.append("--private-key=" + proposer_params.private_key)
+    else:
+        cmd.append("--signer.endpoint=" + str(proposer_params.signer_endpoint))
+        cmd.append("--signer.address=" + str(proposer_params.signer_address))
+        cmd.append("--signer.tls.enabled=false")
+
     # apply customizations
 
     if observability_helper.enabled: