From c06d6b8eac32aba183b81b6cfb9520a4338b9bc7 Mon Sep 17 00:00:00 2001 From: Xavier Romero Date: Mon, 23 Dec 2024 12:48:40 +0100 Subject: [PATCH 1/2] Add wait for Bridge-UI --- lib/zkevm_bridge.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/zkevm_bridge.star b/lib/zkevm_bridge.star index 94c6832ad..d153d5db1 100644 --- a/lib/zkevm_bridge.star +++ b/lib/zkevm_bridge.star @@ -52,7 +52,9 @@ def start_bridge_ui(plan, args, config_artifact): def get_bridge_ui_ports(args): ports = { - "web-ui": PortSpec(args["zkevm_bridge_ui_port"], application_protocol="http") + "web-ui": PortSpec( + args["zkevm_bridge_ui_port"], application_protocol="http", wait="1m" + ) } public_ports = ports_package.get_public_ports( ports, "zkevm_bridge_ui_start_port", args From 1af8aa64792776e0ce4387740879b938b1e401dd Mon Sep 17 00:00:00 2001 From: Xavier Romero Date: Mon, 23 Dec 2024 15:10:15 +0100 Subject: [PATCH 2/2] Make Bridge UI optional --- cdk_bridge_infra.star | 21 +++++++++++---------- input_parser.star | 2 ++ main.star | 1 + 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/cdk_bridge_infra.star b/cdk_bridge_infra.star index bf1a8f48d..bb319365d 100644 --- a/cdk_bridge_infra.star +++ b/cdk_bridge_infra.star @@ -2,7 +2,7 @@ zkevm_bridge_package = import_module("./lib/zkevm_bridge.star") databases = import_module("./databases.star") -def run(plan, args, contract_setup_addresses): +def run(plan, args, contract_setup_addresses, deploy_bridge_ui=True): db_configs = databases.get_db_configs( args["deployment_suffix"], args["sequencer_type"] ) @@ -24,16 +24,17 @@ def run(plan, args, contract_setup_addresses): config=bridge_service_config, ) - # Start the bridge UI. - bridge_ui_config_artifact = create_bridge_ui_config_artifact( - plan, args, contract_setup_addresses - ) - zkevm_bridge_package.start_bridge_ui(plan, args, bridge_ui_config_artifact) + if deploy_bridge_ui: + # Start the bridge UI. + bridge_ui_config_artifact = create_bridge_ui_config_artifact( + plan, args, contract_setup_addresses + ) + zkevm_bridge_package.start_bridge_ui(plan, args, bridge_ui_config_artifact) - # Start the bridge UI reverse proxy. This is only relevant / needed if we have a fake l1 - if args["use_local_l1"]: - proxy_config_artifact = create_reverse_proxy_config_artifact(plan, args) - zkevm_bridge_package.start_reverse_proxy(plan, args, proxy_config_artifact) + # Start the bridge UI reverse proxy. This is only relevant / needed if we have a fake l1 + if args["use_local_l1"]: + proxy_config_artifact = create_reverse_proxy_config_artifact(plan, args) + zkevm_bridge_package.start_reverse_proxy(plan, args, proxy_config_artifact) def create_bridge_config_artifact(plan, args, contract_setup_addresses, db_configs): diff --git a/input_parser.star b/input_parser.star index 00c31ebf2..eb61a93cf 100644 --- a/input_parser.star +++ b/input_parser.star @@ -19,6 +19,8 @@ DEFAULT_DEPLOYMENT_STAGES = { "deploy_cdk_central_environment": True, # Deploy CDK bridge infrastructure. "deploy_cdk_bridge_infra": True, + # Deploy CDK bridge UI. + "deploy_cdk_bridge_ui": True, # Deploy the agglayer. "deploy_agglayer": True, # Deploy cdk-erigon node. diff --git a/main.star b/main.star index ddfd43c0b..23869c53c 100644 --- a/main.star +++ b/main.star @@ -134,6 +134,7 @@ def run(plan, args={}): plan, args | {"use_local_l1": deployment_stages.get("deploy_l1", False)}, contract_setup_addresses, + deployment_stages.get("deploy_cdk_bridge_ui", True), ) else: plan.print("Skipping the deployment of cdk/bridge infrastructure")