From 299e36bfab536b64860ca75672b31f72741e7483 Mon Sep 17 00:00:00 2001 From: zapper_95 Date: Wed, 14 May 2025 10:38:49 +0100 Subject: [PATCH 1/4] fix: batcher submissions converted from mins to blocks --- src/batcher/op-batcher/op_batcher_launcher.star | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/batcher/op-batcher/op_batcher_launcher.star b/src/batcher/op-batcher/op_batcher_launcher.star index 34168ef6..3c78e841 100644 --- a/src/batcher/op-batcher/op_batcher_launcher.star +++ b/src/batcher/op-batcher/op_batcher_launcher.star @@ -104,7 +104,8 @@ def get_batcher_config( "--rpc.port=" + str(BATCHER_HTTP_PORT_NUM), "--rpc.enable-admin", "--max-channel-duration=" - + str(altda_deploy_config.da_batch_submission_frequency), + + str(5 * altda_deploy_config.da_batch_submission_frequency), + # There are 5 l1 blocks per minute, so convert it from minutes to blocks "--l1-eth-rpc=" + l1_config_env_vars["L1_RPC_URL"], "--altda.enabled=" + str(da_server_context.enabled), "--altda.da-server=" + da_server_context.http_url, From 684094733ec1529316d9fe2fee7a67b24da45eb7 Mon Sep 17 00:00:00 2001 From: zapper_95 Date: Wed, 14 May 2025 10:39:09 +0100 Subject: [PATCH 2/4] docs: mention it is in minutes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f19e89f8..5b9c0531 100644 --- a/README.md +++ b/README.md @@ -159,7 +159,7 @@ optimism_package: # Specifies how transactions are posted. Allows auto, blobs calldata or custom. da_type: "calldata" - # Determines how frequently the batcher submits aggregated transaction data to L1 (via the batcher transaction). + # Determines how frequently (in minutes) the batcher submits aggregated transaction data to L1 (via the batcher transaction). da_batch_submission_frequency: 1 # Represents the L1 address of the DataAvailabilityChallenge contract. From 9bce1f1225076d6dae598d5cff359914bcab4609 Mon Sep 17 00:00:00 2001 From: zapper_95 Date: Thu, 15 May 2025 09:39:10 +0100 Subject: [PATCH 3/4] fix: check for da server by if server endpoint string is empty --- src/l2.star | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/l2.star b/src/l2.star index a72b8bc4..e93ed0c5 100644 --- a/src/l2.star +++ b/src/l2.star @@ -36,7 +36,17 @@ def launch_l2( # we need to launch da-server before launching the participant network # because op-batcher and op-node(s) need to know the da-server url, if present da_server_context = da_server_launcher.disabled_da_server_context() - if "da_server" in l2_args.additional_services: + + + if "da_server_test" in l2_args.additional_services: + plan.print("Launching test da-server") + da_server_context = da_server_launcher.launch_da_server( + plan, + "da-server-{0}".format(l2_services_suffix), + ) + plan.print("Successfully launched test da-server") + # use custom server endpoint if provided + elif l2_args.da_server_params.server_endpoint != "": plan.print("Adding da-server endpoint") da_server_context = da_server_launcher.get_enabled_da_server_context( plan, @@ -45,13 +55,7 @@ def launch_l2( ) plan.print("Successfully added da-server endpoint") - elif "da_server_test" in l2_args.additional_services: - plan.print("Launching test da-server") - da_server_context = da_server_launcher.launch_da_server( - plan, - "da-server-{0}".format(l2_services_suffix), - ) - plan.print("Successfully launched test da-server") + l2 = participant_network.launch_participant_network( plan, From 21132f8f1f722e070349d6bf3276d69cc79f6581 Mon Sep 17 00:00:00 2001 From: zapper_95 Date: Thu, 15 May 2025 09:40:39 +0100 Subject: [PATCH 4/4] chore: linting --- src/contracts/contract_deployer.star | 2 +- src/l2.star | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/contracts/contract_deployer.star b/src/contracts/contract_deployer.star index 24dcf960..452387e3 100644 --- a/src/contracts/contract_deployer.star +++ b/src/contracts/contract_deployer.star @@ -316,7 +316,7 @@ def deploy_contracts( "/network-data": op_deployer_configure.files_artifacts[0], }, run=" && ".join(apply_cmds) + " 2>&1 | tee /network-data/op-deployer.log", - wait="540s" + wait="540s", ) files = {"/network-data": op_deployer_output.files_artifacts[0]} diff --git a/src/l2.star b/src/l2.star index e93ed0c5..d7825a82 100644 --- a/src/l2.star +++ b/src/l2.star @@ -37,7 +37,6 @@ def launch_l2( # because op-batcher and op-node(s) need to know the da-server url, if present da_server_context = da_server_launcher.disabled_da_server_context() - if "da_server_test" in l2_args.additional_services: plan.print("Launching test da-server") da_server_context = da_server_launcher.launch_da_server( @@ -55,8 +54,6 @@ def launch_l2( ) plan.print("Successfully added da-server endpoint") - - l2 = participant_network.launch_participant_network( plan, l2_args.participants,