Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion src/batcher/op-batcher/op_batcher_launcher.star
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/contracts/contract_deployer.star
Original file line number Diff line number Diff line change
Expand Up @@ -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]}
Expand Down
19 changes: 10 additions & 9 deletions src/l2.star
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,23 @@ 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:
plan.print("Adding da-server endpoint")
da_server_context = da_server_launcher.get_enabled_da_server_context(
plan,
"da-server-{0}".format(l2_services_suffix),
l2_args.da_server_params.server_endpoint,
)
plan.print("Successfully added da-server endpoint")

elif "da_server_test" 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,
"da-server-{0}".format(l2_services_suffix),
l2_args.da_server_params.server_endpoint,
)
plan.print("Successfully added da-server endpoint")

l2 = participant_network.launch_participant_network(
plan,
Expand Down