Merge branch 'main' into rollup-boost

ethpandaops · Dec 6, 2024 · 8dd6cc1 · 8dd6cc1
2 parents f00f1b5 + 0505def
commit 8dd6cc1
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 21 deletions.
diff --git a/network_params.yaml b/network_params.yaml
@@ -63,12 +63,6 @@ ethereum_package:
           "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3",
           "storage": {},
           "nonce": "1"
-        },
-        "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266": {
-          "balance": "10000ETH",
-          "code": "0x",
-          "storage": {},
-          "nonce": "0"
-        },
+        }
       }
     '
diff --git a/src/el/op-besu/op_besu_launcher.star b/src/el/op-besu/op_besu_launcher.star
@@ -206,7 +206,7 @@ def get_config(
 
     # if not sequencer_enabled:
     #     cmd.append(
-    #         "--rollup.sequencerhttp={0}".format(sequencer_context.beacon_http_url)
+    #         "--rollup.sequencerhttp={0}".format(sequencer_context.rpc_http_url)
     #     )
 
     if len(existing_el_clients) > 0:

diff --git a/src/el/op-erigon/op_erigon_launcher.star b/src/el/op-erigon/op_erigon_launcher.star
@@ -194,9 +194,7 @@ def get_config(
     ]
 
     if not sequencer_enabled:
-        cmd.append(
-            "--rollup.sequencerhttp={0}".format(sequencer_context.beacon_http_url)
-        )
+        cmd.append("--rollup.sequencerhttp={0}".format(sequencer_context.rpc_http_url))
 
     if len(existing_el_clients) > 0:
         cmd.append(

diff --git a/src/el/op-geth/op_geth_launcher.star b/src/el/op-geth/op_geth_launcher.star
@@ -209,9 +209,7 @@ def get_config(
     ]
 
     if not sequencer_enabled:
-        cmd.append(
-            "--rollup.sequencerhttp={0}".format(sequencer_context.beacon_http_url)
-        )
+        cmd.append("--rollup.sequencerhttp={0}".format(sequencer_context.rpc_http_url))
 
     if len(existing_el_clients) > 0:
         cmd.append(

diff --git a/src/el/op-nethermind/op_nethermind_launcher.star b/src/el/op-nethermind/op_nethermind_launcher.star
@@ -187,9 +187,7 @@ def get_config(
         "--Metrics.ExposeHost=0.0.0.0",
     ]
     if not sequencer_enabled:
-        cmd.append(
-            "--Optimism.SequencerUrl={0}".format(sequencer_context.beacon_http_url)
-        )
+        cmd.append("--Optimism.SequencerUrl={0}".format(sequencer_context.rpc_http_url))
 
     if len(existing_el_clients) > 0:
         cmd.append(

diff --git a/src/el/op-reth/op_reth_launcher.star b/src/el/op-reth/op_reth_launcher.star
@@ -192,9 +192,7 @@ def get_config(
     ]
 
     if not sequencer_enabled:
-        cmd.append(
-            "--rollup.sequencer-http={0}".format(sequencer_context.beacon_http_url)
-        )
+        cmd.append("--rollup.sequencer-http={0}".format(sequencer_context.rpc_http_url))
 
     if len(existing_el_clients) > 0:
         cmd.append(

diff --git a/src/el_cl_launcher.star b/src/el_cl_launcher.star
@@ -209,7 +209,7 @@ def launch(
             index_str, l2_services_suffix
         )
 
-        sequencer_context = all_cl_contexts[0] if len(all_cl_contexts) > 0 else None
+        sequencer_context = all_el_contexts[0] if len(all_el_contexts) > 0 else None
         el_context = el_launch_method(
             plan,
             el_launcher,