fix: use read pk value since devnet will not have role.private key. Fixed assertion by re-ordering expected result

Author: zapper-95

src/batcher/op-batcher/op_batcher_launcher.star

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

src/challenger/op-challenger/op_challenger_launcher.star

@@ -113,7 +113,7 @@ def get_challenger_config(
         "--trace-type=" + ",".join(challenger_params.cannon_trace_types),
     ]
 
-    if challenger_params.private_key:
+    if not challenger_params.signer_address:
         cmd.append("--private-key=" + challenger_key)
     else:
         cmd.append("--signer.endpoint=" + str(challenger_params.signer_endpoint))

src/cl/op-node/op_node_builder_launcher.star

@@ -250,7 +250,14 @@ def get_beacon_config(
         )
 
     if sequencer_enabled:
-        if not sequencer_params.private_key:
+        sequencer_private_key = util.read_network_config_value(
+            plan,
+            launcher.deployment_output,
+            "sequencer-{0}".format(launcher.network_params.network_id),
+            ".privateKey",
+        )
+
+        if sequencer_params.signer_address:
             env_vars.update(
                 {
                     "OP_NODE_SIGNER_ADDRESS": str(sequencer_params.signer_address),
@@ -259,7 +266,7 @@ def get_beacon_config(
                 }
             )
         else:
-            cmd += ["--p2p.sequencer.key=" + sequencer_params.private_key]
+            cmd += ["--p2p.sequencer.key=" + sequencer_private_key]
 
         cmd += [
             "--sequencer.enabled",

src/cl/op-node/op_node_launcher.star

@@ -251,7 +251,14 @@ def get_beacon_config(
         )
 
     if sequencer_enabled:
-        if not sequencer_params.private_key:
+        sequencer_private_key = util.read_network_config_value(
+            plan,
+            launcher.deployment_output,
+            "sequencer-{0}".format(launcher.network_params.network_id),
+            ".privateKey",
+        )
+
+        if sequencer_params.signer_address:
             env_vars.update(
                 {
                     "OP_NODE_SIGNER_ADDRESS": str(sequencer_params.signer_address),
@@ -260,7 +267,7 @@ def get_beacon_config(
                 }
             )
         else:
-            cmd += ["--p2p.sequencer.key=" + sequencer_params.private_key]
+            cmd += ["--p2p.sequencer.key=" + sequencer_private_key]
 
         cmd += [
             "--sequencer.enabled",

src/proposer/op-proposer/op_proposer_launcher.star

@@ -100,8 +100,8 @@ def get_proposer_config(
         "--wait-node-sync=true",
     ]
 
-    if proposer_params.private_key:
-        cmd.append("--private-key=" + proposer_params.private_key)
+    if not proposer_params.signer_address:
+        cmd.append("--private-key=" + gs_proposer_private_key)
     else:
         cmd.append("--signer.endpoint=" + str(proposer_params.signer_endpoint))
         cmd.append("--signer.address=" + str(proposer_params.signer_address))

test/el_cl_launcher_test.star

@@ -39,7 +39,7 @@ def test_launch_with_defaults(plan):
                             "cl_type": "op-node",
                             "cl_image": "op-node:latest",
                         }
-                    ]
+                    ],
                 }
             ]
         },
@@ -73,6 +73,7 @@ def test_launch_with_defaults(plan):
         observability_helper=observability_helper,
         interop_params=parsed_input_args.interop,
         da_server_context=da_server_context,
+        sequencer_params=chain.sequencer_params,
     )
 
     el_service_name = "op-el-1-op-reth-op-node-"
@@ -168,7 +169,7 @@ def test_launch_with_el_op_besu(plan):
                             "el_type": "op-besu",
                             "el_image": "op-besu:latest",
                         }
-                    ]
+                    ],
                 }
             ]
         },
@@ -202,6 +203,7 @@ def test_launch_with_el_op_besu(plan):
         observability_helper=observability_helper,
         interop_params=parsed_input_args.interop,
         da_server_context=da_server_context,
+        sequencer_params=chain.sequencer_params,
     )
 
     el_service_name = "op-el-1-op-besu-op-node-"

test/op_challenger_launcher_test.star

@@ -92,6 +92,6 @@ def test_launch_with_defaults(plan):
     expect.eq(
         challenger_service_config.cmd,
         [
-            "mkdir -p /data/op-challenger/op-challenger-data && op-challenger --cannon-l2-genesis=/network-configs/genesis-2151908.json --cannon-rollup-config=/network-configs/rollup-2151908.json --game-factory-address=challenger_private_key --datadir=/data/op-challenger/op-challenger-data --l1-beacon=CL_RPC_URL --l1-eth-rpc=L1_RPC_URL --l2-eth-rpc=rpc_http_url --private-key=challenger_private_key --rollup-rpc=beacon_http_url --trace-type=cannon,permissioned --metrics.enabled --metrics.addr=0.0.0.0 --metrics.port=9001 --cannon-prestates-url=https://storage.googleapis.com/oplabs-network-data/proofs/op-program/cannon"
+            "mkdir -p /data/op-challenger/op-challenger-data && op-challenger --cannon-l2-genesis=/network-configs/genesis-2151908.json --cannon-rollup-config=/network-configs/rollup-2151908.json --game-factory-address=challenger_private_key --datadir=/data/op-challenger/op-challenger-data --l1-beacon=CL_RPC_URL --l1-eth-rpc=L1_RPC_URL --l2-eth-rpc=rpc_http_url --rollup-rpc=beacon_http_url --trace-type=cannon,permissioned --private-key=challenger_private_key --metrics.enabled --metrics.addr=0.0.0.0 --metrics.port=9001 --cannon-prestates-url=https://storage.googleapis.com/oplabs-network-data/proofs/op-program/cannon"
         ],
     )