From e92b8068d71fec032e498793ff97e329c3d073e0 Mon Sep 17 00:00:00 2001
From: Alex Ostrovski <slowli@users.noreply.github.com>
Date: Tue, 12 Nov 2024 15:46:49 +0200
Subject: [PATCH] feat(zkstack): Introduce `build` and `wait` subcommands for
 components (#3240)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## What ❔

- Introduces `build` and `wait` subcommands for server, EN and contract
verifier.
- Uses these commands in CI (integration tests job).

## Why ❔

These commands help preventing races between compilation and test logic.

## Checklist

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Documentation comments have been added / updated.
- [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev
lint`.

ci: Eliminate races between compilation and test logic in integration
tests
---
 .github/workflows/ci-core-reusable.yml        |  20 +-
 .../crates/zkstack/completion/_zkstack.zsh    | 375 +++++++++++-
 .../crates/zkstack/completion/zkstack.fish    | 131 ++++-
 .../crates/zkstack/completion/zkstack.sh      | 556 +++++++++++++++++-
 .../crates/zkstack/src/commands/args/mod.rs   |   6 +-
 .../zkstack/src/commands/args/run_server.rs   |  53 +-
 .../crates/zkstack/src/commands/args/wait.rs  | 130 ++++
 .../zkstack/src/commands/consensus/mod.rs     |  78 ++-
 .../src/commands/contract_verifier/build.rs   |  26 +
 .../src/commands/contract_verifier/mod.rs     |  18 +-
 .../src/commands/contract_verifier/run.rs     |   2 +-
 .../src/commands/contract_verifier/wait.rs    |  27 +
 .../src/commands/external_node/build.rs       |  23 +
 .../zkstack/src/commands/external_node/mod.rs |  12 +-
 .../src/commands/external_node/wait.rs        |  35 ++
 .../crates/zkstack/src/commands/server.rs     |  54 +-
 zkstack_cli/crates/zkstack/src/main.rs        |   6 +-
 zkstack_cli/crates/zkstack/src/messages.rs    |  62 +-
 18 files changed, 1516 insertions(+), 98 deletions(-)
 create mode 100644 zkstack_cli/crates/zkstack/src/commands/args/wait.rs
 create mode 100644 zkstack_cli/crates/zkstack/src/commands/contract_verifier/build.rs
 create mode 100644 zkstack_cli/crates/zkstack/src/commands/contract_verifier/wait.rs
 create mode 100644 zkstack_cli/crates/zkstack/src/commands/external_node/build.rs
 create mode 100644 zkstack_cli/crates/zkstack/src/commands/external_node/wait.rs

diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
index da3e2d5abb56..7cada37610c0 100644
--- a/.github/workflows/ci-core-reusable.yml
+++ b/.github/workflows/ci-core-reusable.yml
@@ -357,10 +357,17 @@ jobs:
         run: |
           ci_run zkstack dev test build
 
+      - name: Build tested binaries
+        run: |
+          ci_run zkstack server build
+          ci_run zkstack external-node build
+          ci_run zkstack contract-verifier build
+
       - name: Initialize Contract verifier
         run: |
           ci_run zkstack contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
           ci_run zkstack contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
+          ci_run zkstack contract-verifier wait --chain era --verbose
 
       - name: Run servers
         run: |
@@ -375,10 +382,14 @@ jobs:
             --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
             &> ${{ env.SERVER_LOGS_DIR }}/consensus.log &
 
-          ci_run sleep 5
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack server wait --ignore-prerequisites --verbose --chain consensus
 
-      - name: Setup attester committee for the consensus chain
+      - name: Set up attester committee for the consensus chain
         run: |
+          ci_run zkstack consensus wait-for-registry --ignore-prerequisites --verbose --chain consensus
           ci_run zkstack consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log 
 
       - name: Run integration tests
@@ -417,6 +428,11 @@ jobs:
           ci_run zkstack external-node run --ignore-prerequisites --chain validium &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/validium.log &
           ci_run zkstack external-node run --ignore-prerequisites --chain custom_token &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/custom_token.log &
           ci_run zkstack external-node run --ignore-prerequisites --chain consensus --enable-consensus &> ${{ env.EXTERNAL_NODE_LOGS_DIR }}/consensus.log &
+          
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack external-node wait --ignore-prerequisites --verbose --chain consensus
 
       - name: Run integration tests en
         run: |
diff --git a/zkstack_cli/crates/zkstack/completion/_zkstack.zsh b/zkstack_cli/crates/zkstack/completion/_zkstack.zsh
index d9977d574816..f0e10b465b6a 100644
--- a/zkstack_cli/crates/zkstack/completion/_zkstack.zsh
+++ b/zkstack_cli/crates/zkstack/completion/_zkstack.zsh
@@ -2008,15 +2008,96 @@ _arguments "${_arguments_options[@]}" : \
 '*--additional-args=[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
 '--chain=[Chain to use]:CHAIN:_default' \
 '--genesis[Run server in genesis mode]' \
-'--build[Build server but don'\''t run it]' \
 '--uring[Enables uring support for RocksDB]' \
 '-v[Verbose mode]' \
 '--verbose[Verbose mode]' \
 '--ignore-prerequisites[Ignores prerequisites checks]' \
 '-h[Print help]' \
 '--help[Print help]' \
+":: :_zkstack__server_commands" \
+"*::: :->server" \
+&& ret=0
+
+    case $state in
+    (server)
+        words=($line[1] "${words[@]}")
+        (( CURRENT += 1 ))
+        curcontext="${curcontext%:*:*}:zkstack-server-command-$line[1]:"
+        case $line[1] in
+            (build)
+_arguments "${_arguments_options[@]}" : \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
+'*--components=[Components of server to run]:COMPONENTS:_default' \
+'*-a+[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
+'*--additional-args=[Additional arguments that can be passed through the CLI]:ADDITIONAL_ARGS:_default' \
+'--chain=[Chain to use]:CHAIN:_default' \
+'--genesis[Run server in genesis mode]' \
+'--uring[Enables uring support for RocksDB]' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+'-t+[Wait timeout in seconds]:SECONDS:_default' \
+'--timeout=[Wait timeout in seconds]:SECONDS:_default' \
+'--poll-interval=[Poll interval in milliseconds]:MILLIS:_default' \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
 && ret=0
 ;;
+(help)
+_arguments "${_arguments_options[@]}" : \
+":: :_zkstack__server__help_commands" \
+"*::: :->help" \
+&& ret=0
+
+    case $state in
+    (help)
+        words=($line[1] "${words[@]}")
+        (( CURRENT += 1 ))
+        curcontext="${curcontext%:*:*}:zkstack-server-help-command-$line[1]:"
+        case $line[1] in
+            (build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(help)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+        esac
+    ;;
+esac
+;;
+        esac
+    ;;
+esac
+;;
 (external-node)
 _arguments "${_arguments_options[@]}" : \
 '--chain=[Chain to use]:CHAIN:_default' \
@@ -2060,6 +2141,16 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 && ret=0
 ;;
+(build)
+_arguments "${_arguments_options[@]}" : \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
 (run)
 _arguments "${_arguments_options[@]}" : \
 '*--components=[Components of server to run]:COMPONENTS:_default' \
@@ -2075,6 +2166,19 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 && ret=0
 ;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+'-t+[Wait timeout in seconds]:SECONDS:_default' \
+'--timeout=[Wait timeout in seconds]:SECONDS:_default' \
+'--poll-interval=[Poll interval in milliseconds]:MILLIS:_default' \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" : \
 ":: :_zkstack__external-node__help_commands" \
@@ -2095,10 +2199,18 @@ _arguments "${_arguments_options[@]}" : \
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
+(build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
 (run)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
@@ -2141,8 +2253,31 @@ _arguments "${_arguments_options[@]}" : \
         (( CURRENT += 1 ))
         curcontext="${curcontext%:*:*}:zkstack-contract-verifier-command-$line[1]:"
         case $line[1] in
-            (run)
+            (build)
+_arguments "${_arguments_options[@]}" : \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
+(wait)
 _arguments "${_arguments_options[@]}" : \
+'-t+[Wait timeout in seconds]:SECONDS:_default' \
+'--timeout=[Wait timeout in seconds]:SECONDS:_default' \
+'--poll-interval=[Poll interval in milliseconds]:MILLIS:_default' \
 '--chain=[Chain to use]:CHAIN:_default' \
 '-v[Verbose mode]' \
 '--verbose[Verbose mode]' \
@@ -2179,7 +2314,15 @@ _arguments "${_arguments_options[@]}" : \
         (( CURRENT += 1 ))
         curcontext="${curcontext%:*:*}:zkstack-contract-verifier-help-command-$line[1]:"
         case $line[1] in
-            (run)
+            (build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(wait)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
@@ -2333,6 +2476,19 @@ _arguments "${_arguments_options[@]}" : \
 '--help[Print help]' \
 && ret=0
 ;;
+(wait-for-registry)
+_arguments "${_arguments_options[@]}" : \
+'-t+[Wait timeout in seconds]:SECONDS:_default' \
+'--timeout=[Wait timeout in seconds]:SECONDS:_default' \
+'--poll-interval=[Poll interval in milliseconds]:MILLIS:_default' \
+'--chain=[Chain to use]:CHAIN:_default' \
+'-v[Verbose mode]' \
+'--verbose[Verbose mode]' \
+'--ignore-prerequisites[Ignores prerequisites checks]' \
+'-h[Print help]' \
+'--help[Print help]' \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" : \
 ":: :_zkstack__consensus__help_commands" \
@@ -2353,6 +2509,10 @@ _arguments "${_arguments_options[@]}" : \
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
+(wait-for-registry)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
 (help)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
@@ -2849,8 +3009,32 @@ esac
 ;;
 (server)
 _arguments "${_arguments_options[@]}" : \
+":: :_zkstack__help__server_commands" \
+"*::: :->server" \
+&& ret=0
+
+    case $state in
+    (server)
+        words=($line[1] "${words[@]}")
+        (( CURRENT += 1 ))
+        curcontext="${curcontext%:*:*}:zkstack-help-server-command-$line[1]:"
+        case $line[1] in
+            (build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+        esac
+    ;;
+esac
+;;
 (external-node)
 _arguments "${_arguments_options[@]}" : \
 ":: :_zkstack__help__external-node_commands" \
@@ -2871,9 +3055,17 @@ _arguments "${_arguments_options[@]}" : \
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
+(build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
 (run)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
+;;
+(wait)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
 ;;
         esac
     ;;
@@ -2895,7 +3087,15 @@ _arguments "${_arguments_options[@]}" : \
         (( CURRENT += 1 ))
         curcontext="${curcontext%:*:*}:zkstack-help-contract-verifier-command-$line[1]:"
         case $line[1] in
-            (run)
+            (build)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(run)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
+;;
+(wait)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
 ;;
@@ -2958,6 +3158,10 @@ _arguments "${_arguments_options[@]}" : \
 (get-attester-committee)
 _arguments "${_arguments_options[@]}" : \
 && ret=0
+;;
+(wait-for-registry)
+_arguments "${_arguments_options[@]}" : \
+&& ret=0
 ;;
         esac
     ;;
@@ -3286,6 +3490,7 @@ _zkstack__consensus_commands() {
     local commands; commands=(
 'set-attester-committee:Sets the attester committee in the consensus registry contract to \`consensus.genesis_spec.attesters\` in general.yaml' \
 'get-attester-committee:Fetches the attester committee from the consensus registry contract' \
+'wait-for-registry:Wait until the consensus registry contract is deployed to L2' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack consensus commands' commands "$@"
@@ -3300,6 +3505,7 @@ _zkstack__consensus__help_commands() {
     local commands; commands=(
 'set-attester-committee:Sets the attester committee in the consensus registry contract to \`consensus.genesis_spec.attesters\` in general.yaml' \
 'get-attester-committee:Fetches the attester committee from the consensus registry contract' \
+'wait-for-registry:Wait until the consensus registry contract is deployed to L2' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack consensus help commands' commands "$@"
@@ -3319,11 +3525,21 @@ _zkstack__consensus__help__set-attester-committee_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack consensus help set-attester-committee commands' commands "$@"
 }
+(( $+functions[_zkstack__consensus__help__wait-for-registry_commands] )) ||
+_zkstack__consensus__help__wait-for-registry_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack consensus help wait-for-registry commands' commands "$@"
+}
 (( $+functions[_zkstack__consensus__set-attester-committee_commands] )) ||
 _zkstack__consensus__set-attester-committee_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack consensus set-attester-committee commands' commands "$@"
 }
+(( $+functions[_zkstack__consensus__wait-for-registry_commands] )) ||
+_zkstack__consensus__wait-for-registry_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack consensus wait-for-registry commands' commands "$@"
+}
 (( $+functions[_zkstack__containers_commands] )) ||
 _zkstack__containers_commands() {
     local commands; commands=()
@@ -3332,21 +3548,35 @@ _zkstack__containers_commands() {
 (( $+functions[_zkstack__contract-verifier_commands] )) ||
 _zkstack__contract-verifier_commands() {
     local commands; commands=(
+'build:Build contract verifier binary' \
 'run:Run contract verifier' \
+'wait:Wait for contract verifier to start' \
 'init:Download required binaries for contract verifier' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack contract-verifier commands' commands "$@"
 }
+(( $+functions[_zkstack__contract-verifier__build_commands] )) ||
+_zkstack__contract-verifier__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack contract-verifier build commands' commands "$@"
+}
 (( $+functions[_zkstack__contract-verifier__help_commands] )) ||
 _zkstack__contract-verifier__help_commands() {
     local commands; commands=(
+'build:Build contract verifier binary' \
 'run:Run contract verifier' \
+'wait:Wait for contract verifier to start' \
 'init:Download required binaries for contract verifier' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack contract-verifier help commands' commands "$@"
 }
+(( $+functions[_zkstack__contract-verifier__help__build_commands] )) ||
+_zkstack__contract-verifier__help__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack contract-verifier help build commands' commands "$@"
+}
 (( $+functions[_zkstack__contract-verifier__help__help_commands] )) ||
 _zkstack__contract-verifier__help__help_commands() {
     local commands; commands=()
@@ -3362,6 +3592,11 @@ _zkstack__contract-verifier__help__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack contract-verifier help run commands' commands "$@"
 }
+(( $+functions[_zkstack__contract-verifier__help__wait_commands] )) ||
+_zkstack__contract-verifier__help__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack contract-verifier help wait commands' commands "$@"
+}
 (( $+functions[_zkstack__contract-verifier__init_commands] )) ||
 _zkstack__contract-verifier__init_commands() {
     local commands; commands=()
@@ -3372,6 +3607,11 @@ _zkstack__contract-verifier__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack contract-verifier run commands' commands "$@"
 }
+(( $+functions[_zkstack__contract-verifier__wait_commands] )) ||
+_zkstack__contract-verifier__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack contract-verifier wait commands' commands "$@"
+}
 (( $+functions[_zkstack__dev_commands] )) ||
 _zkstack__dev_commands() {
     local commands; commands=(
@@ -4301,11 +4541,18 @@ _zkstack__external-node_commands() {
     local commands; commands=(
 'configs:Prepare configs for EN' \
 'init:Init databases' \
+'build:Build external node' \
 'run:Run external node' \
+'wait:Wait for external node to start' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack external-node commands' commands "$@"
 }
+(( $+functions[_zkstack__external-node__build_commands] )) ||
+_zkstack__external-node__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack external-node build commands' commands "$@"
+}
 (( $+functions[_zkstack__external-node__configs_commands] )) ||
 _zkstack__external-node__configs_commands() {
     local commands; commands=()
@@ -4316,11 +4563,18 @@ _zkstack__external-node__help_commands() {
     local commands; commands=(
 'configs:Prepare configs for EN' \
 'init:Init databases' \
+'build:Build external node' \
 'run:Run external node' \
+'wait:Wait for external node to start' \
 'help:Print this message or the help of the given subcommand(s)' \
     )
     _describe -t commands 'zkstack external-node help commands' commands "$@"
 }
+(( $+functions[_zkstack__external-node__help__build_commands] )) ||
+_zkstack__external-node__help__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack external-node help build commands' commands "$@"
+}
 (( $+functions[_zkstack__external-node__help__configs_commands] )) ||
 _zkstack__external-node__help__configs_commands() {
     local commands; commands=()
@@ -4341,6 +4595,11 @@ _zkstack__external-node__help__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack external-node help run commands' commands "$@"
 }
+(( $+functions[_zkstack__external-node__help__wait_commands] )) ||
+_zkstack__external-node__help__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack external-node help wait commands' commands "$@"
+}
 (( $+functions[_zkstack__external-node__init_commands] )) ||
 _zkstack__external-node__init_commands() {
     local commands; commands=()
@@ -4351,6 +4610,11 @@ _zkstack__external-node__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack external-node run commands' commands "$@"
 }
+(( $+functions[_zkstack__external-node__wait_commands] )) ||
+_zkstack__external-node__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack external-node wait commands' commands "$@"
+}
 (( $+functions[_zkstack__help_commands] )) ||
 _zkstack__help_commands() {
     local commands; commands=(
@@ -4492,6 +4756,7 @@ _zkstack__help__consensus_commands() {
     local commands; commands=(
 'set-attester-committee:Sets the attester committee in the consensus registry contract to \`consensus.genesis_spec.attesters\` in general.yaml' \
 'get-attester-committee:Fetches the attester committee from the consensus registry contract' \
+'wait-for-registry:Wait until the consensus registry contract is deployed to L2' \
     )
     _describe -t commands 'zkstack help consensus commands' commands "$@"
 }
@@ -4505,6 +4770,11 @@ _zkstack__help__consensus__set-attester-committee_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack help consensus set-attester-committee commands' commands "$@"
 }
+(( $+functions[_zkstack__help__consensus__wait-for-registry_commands] )) ||
+_zkstack__help__consensus__wait-for-registry_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help consensus wait-for-registry commands' commands "$@"
+}
 (( $+functions[_zkstack__help__containers_commands] )) ||
 _zkstack__help__containers_commands() {
     local commands; commands=()
@@ -4513,11 +4783,18 @@ _zkstack__help__containers_commands() {
 (( $+functions[_zkstack__help__contract-verifier_commands] )) ||
 _zkstack__help__contract-verifier_commands() {
     local commands; commands=(
+'build:Build contract verifier binary' \
 'run:Run contract verifier' \
+'wait:Wait for contract verifier to start' \
 'init:Download required binaries for contract verifier' \
     )
     _describe -t commands 'zkstack help contract-verifier commands' commands "$@"
 }
+(( $+functions[_zkstack__help__contract-verifier__build_commands] )) ||
+_zkstack__help__contract-verifier__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help contract-verifier build commands' commands "$@"
+}
 (( $+functions[_zkstack__help__contract-verifier__init_commands] )) ||
 _zkstack__help__contract-verifier__init_commands() {
     local commands; commands=()
@@ -4528,6 +4805,11 @@ _zkstack__help__contract-verifier__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack help contract-verifier run commands' commands "$@"
 }
+(( $+functions[_zkstack__help__contract-verifier__wait_commands] )) ||
+_zkstack__help__contract-verifier__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help contract-verifier wait commands' commands "$@"
+}
 (( $+functions[_zkstack__help__dev_commands] )) ||
 _zkstack__help__dev_commands() {
     local commands; commands=(
@@ -4852,10 +5134,17 @@ _zkstack__help__external-node_commands() {
     local commands; commands=(
 'configs:Prepare configs for EN' \
 'init:Init databases' \
+'build:Build external node' \
 'run:Run external node' \
+'wait:Wait for external node to start' \
     )
     _describe -t commands 'zkstack help external-node commands' commands "$@"
 }
+(( $+functions[_zkstack__help__external-node__build_commands] )) ||
+_zkstack__help__external-node__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help external-node build commands' commands "$@"
+}
 (( $+functions[_zkstack__help__external-node__configs_commands] )) ||
 _zkstack__help__external-node__configs_commands() {
     local commands; commands=()
@@ -4871,6 +5160,11 @@ _zkstack__help__external-node__run_commands() {
     local commands; commands=()
     _describe -t commands 'zkstack help external-node run commands' commands "$@"
 }
+(( $+functions[_zkstack__help__external-node__wait_commands] )) ||
+_zkstack__help__external-node__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help external-node wait commands' commands "$@"
+}
 (( $+functions[_zkstack__help__help_commands] )) ||
 _zkstack__help__help_commands() {
     local commands; commands=()
@@ -4924,9 +5218,28 @@ _zkstack__help__prover__setup-keys_commands() {
 }
 (( $+functions[_zkstack__help__server_commands] )) ||
 _zkstack__help__server_commands() {
-    local commands; commands=()
+    local commands; commands=(
+'build:Builds server' \
+'run:Runs server' \
+'wait:Waits for server to start' \
+    )
     _describe -t commands 'zkstack help server commands' commands "$@"
 }
+(( $+functions[_zkstack__help__server__build_commands] )) ||
+_zkstack__help__server__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help server build commands' commands "$@"
+}
+(( $+functions[_zkstack__help__server__run_commands] )) ||
+_zkstack__help__server__run_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help server run commands' commands "$@"
+}
+(( $+functions[_zkstack__help__server__wait_commands] )) ||
+_zkstack__help__server__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack help server wait commands' commands "$@"
+}
 (( $+functions[_zkstack__help__update_commands] )) ||
 _zkstack__help__update_commands() {
     local commands; commands=()
@@ -5023,9 +5336,59 @@ _zkstack__prover__setup-keys_commands() {
 }
 (( $+functions[_zkstack__server_commands] )) ||
 _zkstack__server_commands() {
-    local commands; commands=()
+    local commands; commands=(
+'build:Builds server' \
+'run:Runs server' \
+'wait:Waits for server to start' \
+'help:Print this message or the help of the given subcommand(s)' \
+    )
     _describe -t commands 'zkstack server commands' commands "$@"
 }
+(( $+functions[_zkstack__server__build_commands] )) ||
+_zkstack__server__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server build commands' commands "$@"
+}
+(( $+functions[_zkstack__server__help_commands] )) ||
+_zkstack__server__help_commands() {
+    local commands; commands=(
+'build:Builds server' \
+'run:Runs server' \
+'wait:Waits for server to start' \
+'help:Print this message or the help of the given subcommand(s)' \
+    )
+    _describe -t commands 'zkstack server help commands' commands "$@"
+}
+(( $+functions[_zkstack__server__help__build_commands] )) ||
+_zkstack__server__help__build_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server help build commands' commands "$@"
+}
+(( $+functions[_zkstack__server__help__help_commands] )) ||
+_zkstack__server__help__help_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server help help commands' commands "$@"
+}
+(( $+functions[_zkstack__server__help__run_commands] )) ||
+_zkstack__server__help__run_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server help run commands' commands "$@"
+}
+(( $+functions[_zkstack__server__help__wait_commands] )) ||
+_zkstack__server__help__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server help wait commands' commands "$@"
+}
+(( $+functions[_zkstack__server__run_commands] )) ||
+_zkstack__server__run_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server run commands' commands "$@"
+}
+(( $+functions[_zkstack__server__wait_commands] )) ||
+_zkstack__server__wait_commands() {
+    local commands; commands=()
+    _describe -t commands 'zkstack server wait commands' commands "$@"
+}
 (( $+functions[_zkstack__update_commands] )) ||
 _zkstack__update_commands() {
     local commands; commands=()
diff --git a/zkstack_cli/crates/zkstack/completion/zkstack.fish b/zkstack_cli/crates/zkstack/completion/zkstack.fish
index be6d5d147e78..dacc27d88089 100644
--- a/zkstack_cli/crates/zkstack/completion/zkstack.fish
+++ b/zkstack_cli/crates/zkstack/completion/zkstack.fish
@@ -525,23 +525,50 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from help" -f -a "init-bellman-cuda" -d 'Initialize bellman-cuda'
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from help" -f -a "compressor-keys" -d 'Download compressor keys'
 complete -c zkstack -n "__fish_zkstack_using_subcommand prover; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l components -d 'Components of server to run' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l chain -d 'Chain to use' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l genesis -d 'Run server in genesis mode'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l build -d 'Build server but don\'t run it'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l uring -d 'Enables uring support for RocksDB'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -s v -l verbose -d 'Verbose mode'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -l ignore-prerequisites -d 'Ignores prerequisites checks'
-complete -c zkstack -n "__fish_zkstack_using_subcommand server" -s h -l help -d 'Print help'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -l chain -d 'Chain to use' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -s v -l verbose -d 'Verbose mode'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -s h -l help -d 'Print help'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -f -a "configs" -d 'Prepare configs for EN'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -f -a "init" -d 'Init databases'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -f -a "run" -d 'Run external node'
-complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init run help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l components -d 'Components of server to run' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l genesis -d 'Run server in genesis mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l uring -d 'Enables uring support for RocksDB'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -f -a "build" -d 'Builds server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -f -a "run" -d 'Runs server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -f -a "wait" -d 'Waits for server to start'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and not __fish_seen_subcommand_from build run wait help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from build" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from build" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from build" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from build" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l components -d 'Components of server to run' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l genesis -d 'Run server in genesis mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l uring -d 'Enables uring support for RocksDB'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from run" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -s t -l timeout -d 'Wait timeout in seconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -l poll-interval -d 'Poll interval in milliseconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from wait" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from help" -f -a "build" -d 'Builds server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from help" -f -a "run" -d 'Runs server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from help" -f -a "wait" -d 'Waits for server to start'
+complete -c zkstack -n "__fish_zkstack_using_subcommand server; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "configs" -d 'Prepare configs for EN'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "init" -d 'Init databases'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "build" -d 'Build external node'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "run" -d 'Run external node'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "wait" -d 'Wait for external node to start'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and not __fish_seen_subcommand_from configs init build run wait help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from configs" -l db-url -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from configs" -l db-name -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from configs" -l l1-rpc-url -r
@@ -554,6 +581,10 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fis
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from init" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from init" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from init" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from build" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from build" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from build" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from build" -s h -l help -d 'Print help'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -l components -d 'Components of server to run' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -l enable-consensus -d 'Enable consensus' -r -f -a "{true\t'',false\t''}"
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -s a -l additional-args -d 'Additional arguments that can be passed through the CLI' -r
@@ -562,26 +593,46 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fis
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from run" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -s t -l timeout -d 'Wait timeout in seconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -l poll-interval -d 'Poll interval in milliseconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from wait" -s h -l help -d 'Print help'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "configs" -d 'Prepare configs for EN'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "init" -d 'Init databases'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "build" -d 'Build external node'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "run" -d 'Run external node'
+complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "wait" -d 'Wait for external node to start'
 complete -c zkstack -n "__fish_zkstack_using_subcommand external-node; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
 complete -c zkstack -n "__fish_zkstack_using_subcommand containers" -s o -l observability -d 'Enable Grafana' -r -f -a "{true\t'',false\t''}"
 complete -c zkstack -n "__fish_zkstack_using_subcommand containers" -l chain -d 'Chain to use' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand containers" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand containers" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand containers" -s h -l help -d 'Print help'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -l chain -d 'Chain to use' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -s v -l verbose -d 'Verbose mode'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -s h -l help -d 'Print help'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -f -a "run" -d 'Run contract verifier'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -f -a "init" -d 'Download required binaries for contract verifier'
-complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from run init help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -f -a "build" -d 'Build contract verifier binary'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -f -a "run" -d 'Run contract verifier'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -f -a "wait" -d 'Wait for contract verifier to start'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -f -a "init" -d 'Download required binaries for contract verifier'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and not __fish_seen_subcommand_from build run wait init help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from build" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from build" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from build" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from build" -s h -l help -d 'Print help'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from run" -l chain -d 'Chain to use' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from run" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from run" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from run" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -s t -l timeout -d 'Wait timeout in seconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -l poll-interval -d 'Poll interval in milliseconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from wait" -s h -l help -d 'Print help'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -l zksolc-version -d 'Version of zksolc to install' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -l zkvyper-version -d 'Version of zkvyper to install' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -l solc-version -d 'Version of solc to install' -r
@@ -592,7 +643,9 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and _
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from init" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from help" -f -a "build" -d 'Build contract verifier binary'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from help" -f -a "run" -d 'Run contract verifier'
+complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from help" -f -a "wait" -d 'Wait for contract verifier to start'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from help" -f -a "init" -d 'Download required binaries for contract verifier'
 complete -c zkstack -n "__fish_zkstack_using_subcommand contract-verifier; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
 complete -c zkstack -n "__fish_zkstack_using_subcommand portal" -l chain -d 'Chain to use' -r
@@ -623,13 +676,14 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand explorer; and __fish_see
 complete -c zkstack -n "__fish_zkstack_using_subcommand explorer; and __fish_seen_subcommand_from help" -f -a "run-backend" -d 'Start explorer backend services (api, data_fetcher, worker) for a given chain. Uses default chain, unless --chain is passed'
 complete -c zkstack -n "__fish_zkstack_using_subcommand explorer; and __fish_seen_subcommand_from help" -f -a "run" -d 'Run explorer app'
 complete -c zkstack -n "__fish_zkstack_using_subcommand explorer; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -l chain -d 'Chain to use' -r
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -s v -l verbose -d 'Verbose mode'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -s h -l help -d 'Print help'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -f -a "set-attester-committee" -d 'Sets the attester committee in the consensus registry contract to `consensus.genesis_spec.attesters` in general.yaml'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -f -a "get-attester-committee" -d 'Fetches the attester committee from the consensus registry contract'
-complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -f -a "set-attester-committee" -d 'Sets the attester committee in the consensus registry contract to `consensus.genesis_spec.attesters` in general.yaml'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -f -a "get-attester-committee" -d 'Fetches the attester committee from the consensus registry contract'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -f -a "wait-for-registry" -d 'Wait until the consensus registry contract is deployed to L2'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and not __fish_seen_subcommand_from set-attester-committee get-attester-committee wait-for-registry help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from set-attester-committee" -l from-file -d 'Sets the attester committee in the consensus registry contract to the committee in the yaml file. File format is definied in `commands/consensus/proto/mod.proto`' -r -F
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from set-attester-committee" -l chain -d 'Chain to use' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from set-attester-committee" -l from-genesis -d 'Sets the attester committee in the consensus registry contract to `consensus.genesis_spec.attesters` in general.yaml'
@@ -640,8 +694,15 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_se
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from get-attester-committee" -s v -l verbose -d 'Verbose mode'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from get-attester-committee" -l ignore-prerequisites -d 'Ignores prerequisites checks'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from get-attester-committee" -s h -l help -d 'Print help'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -s t -l timeout -d 'Wait timeout in seconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -l poll-interval -d 'Poll interval in milliseconds' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -l chain -d 'Chain to use' -r
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -s v -l verbose -d 'Verbose mode'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -l ignore-prerequisites -d 'Ignores prerequisites checks'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from wait-for-registry" -s h -l help -d 'Print help'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from help" -f -a "set-attester-committee" -d 'Sets the attester committee in the consensus registry contract to `consensus.genesis_spec.attesters` in general.yaml'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from help" -f -a "get-attester-committee" -d 'Fetches the attester committee from the consensus registry contract'
+complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from help" -f -a "wait-for-registry" -d 'Wait until the consensus registry contract is deployed to L2'
 complete -c zkstack -n "__fish_zkstack_using_subcommand consensus; and __fish_seen_subcommand_from help" -f -a "help" -d 'Print this message or the help of the given subcommand(s)'
 complete -c zkstack -n "__fish_zkstack_using_subcommand update" -l chain -d 'Chain to use' -r
 complete -c zkstack -n "__fish_zkstack_using_subcommand update" -s c -l only-config -d 'Update only the config files'
@@ -703,13 +764,21 @@ complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_su
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from prover" -f -a "run" -d 'Run prover'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from prover" -f -a "init-bellman-cuda" -d 'Initialize bellman-cuda'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from prover" -f -a "compressor-keys" -d 'Download compressor keys'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from server" -f -a "build" -d 'Builds server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from server" -f -a "run" -d 'Runs server'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from server" -f -a "wait" -d 'Waits for server to start'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from external-node" -f -a "configs" -d 'Prepare configs for EN'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from external-node" -f -a "init" -d 'Init databases'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from external-node" -f -a "build" -d 'Build external node'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from external-node" -f -a "run" -d 'Run external node'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from external-node" -f -a "wait" -d 'Wait for external node to start'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from contract-verifier" -f -a "build" -d 'Build contract verifier binary'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from contract-verifier" -f -a "run" -d 'Run contract verifier'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from contract-verifier" -f -a "wait" -d 'Wait for contract verifier to start'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from contract-verifier" -f -a "init" -d 'Download required binaries for contract verifier'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from explorer" -f -a "init" -d 'Initialize explorer (create database to store explorer data and generate docker compose file with explorer services). Runs for all chains, unless --chain is passed'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from explorer" -f -a "run-backend" -d 'Start explorer backend services (api, data_fetcher, worker) for a given chain. Uses default chain, unless --chain is passed'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from explorer" -f -a "run" -d 'Run explorer app'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from consensus" -f -a "set-attester-committee" -d 'Sets the attester committee in the consensus registry contract to `consensus.genesis_spec.attesters` in general.yaml'
 complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from consensus" -f -a "get-attester-committee" -d 'Fetches the attester committee from the consensus registry contract'
+complete -c zkstack -n "__fish_zkstack_using_subcommand help; and __fish_seen_subcommand_from consensus" -f -a "wait-for-registry" -d 'Wait until the consensus registry contract is deployed to L2'
diff --git a/zkstack_cli/crates/zkstack/completion/zkstack.sh b/zkstack_cli/crates/zkstack/completion/zkstack.sh
index 6261941e10f5..0cf89ed4ef3f 100644
--- a/zkstack_cli/crates/zkstack/completion/zkstack.sh
+++ b/zkstack_cli/crates/zkstack/completion/zkstack.sh
@@ -195,6 +195,9 @@ _zkstack() {
             zkstack__consensus,set-attester-committee)
                 cmd="zkstack__consensus__set__attester__committee"
                 ;;
+            zkstack__consensus,wait-for-registry)
+                cmd="zkstack__consensus__wait__for__registry"
+                ;;
             zkstack__consensus__help,get-attester-committee)
                 cmd="zkstack__consensus__help__get__attester__committee"
                 ;;
@@ -204,6 +207,12 @@ _zkstack() {
             zkstack__consensus__help,set-attester-committee)
                 cmd="zkstack__consensus__help__set__attester__committee"
                 ;;
+            zkstack__consensus__help,wait-for-registry)
+                cmd="zkstack__consensus__help__wait__for__registry"
+                ;;
+            zkstack__contract__verifier,build)
+                cmd="zkstack__contract__verifier__build"
+                ;;
             zkstack__contract__verifier,help)
                 cmd="zkstack__contract__verifier__help"
                 ;;
@@ -213,6 +222,12 @@ _zkstack() {
             zkstack__contract__verifier,run)
                 cmd="zkstack__contract__verifier__run"
                 ;;
+            zkstack__contract__verifier,wait)
+                cmd="zkstack__contract__verifier__wait"
+                ;;
+            zkstack__contract__verifier__help,build)
+                cmd="zkstack__contract__verifier__help__build"
+                ;;
             zkstack__contract__verifier__help,help)
                 cmd="zkstack__contract__verifier__help__help"
                 ;;
@@ -222,6 +237,9 @@ _zkstack() {
             zkstack__contract__verifier__help,run)
                 cmd="zkstack__contract__verifier__help__run"
                 ;;
+            zkstack__contract__verifier__help,wait)
+                cmd="zkstack__contract__verifier__help__wait"
+                ;;
             zkstack__dev,clean)
                 cmd="zkstack__dev__clean"
                 ;;
@@ -663,6 +681,9 @@ _zkstack() {
             zkstack__explorer__help,run-backend)
                 cmd="zkstack__explorer__help__run__backend"
                 ;;
+            zkstack__external__node,build)
+                cmd="zkstack__external__node__build"
+                ;;
             zkstack__external__node,configs)
                 cmd="zkstack__external__node__configs"
                 ;;
@@ -675,6 +696,12 @@ _zkstack() {
             zkstack__external__node,run)
                 cmd="zkstack__external__node__run"
                 ;;
+            zkstack__external__node,wait)
+                cmd="zkstack__external__node__wait"
+                ;;
+            zkstack__external__node__help,build)
+                cmd="zkstack__external__node__help__build"
+                ;;
             zkstack__external__node__help,configs)
                 cmd="zkstack__external__node__help__configs"
                 ;;
@@ -687,6 +714,9 @@ _zkstack() {
             zkstack__external__node__help,run)
                 cmd="zkstack__external__node__help__run"
                 ;;
+            zkstack__external__node__help,wait)
+                cmd="zkstack__external__node__help__wait"
+                ;;
             zkstack__help,autocomplete)
                 cmd="zkstack__help__autocomplete"
                 ;;
@@ -789,12 +819,21 @@ _zkstack() {
             zkstack__help__consensus,set-attester-committee)
                 cmd="zkstack__help__consensus__set__attester__committee"
                 ;;
+            zkstack__help__consensus,wait-for-registry)
+                cmd="zkstack__help__consensus__wait__for__registry"
+                ;;
+            zkstack__help__contract__verifier,build)
+                cmd="zkstack__help__contract__verifier__build"
+                ;;
             zkstack__help__contract__verifier,init)
                 cmd="zkstack__help__contract__verifier__init"
                 ;;
             zkstack__help__contract__verifier,run)
                 cmd="zkstack__help__contract__verifier__run"
                 ;;
+            zkstack__help__contract__verifier,wait)
+                cmd="zkstack__help__contract__verifier__wait"
+                ;;
             zkstack__help__dev,clean)
                 cmd="zkstack__help__dev__clean"
                 ;;
@@ -942,6 +981,9 @@ _zkstack() {
             zkstack__help__explorer,run-backend)
                 cmd="zkstack__help__explorer__run__backend"
                 ;;
+            zkstack__help__external__node,build)
+                cmd="zkstack__help__external__node__build"
+                ;;
             zkstack__help__external__node,configs)
                 cmd="zkstack__help__external__node__configs"
                 ;;
@@ -951,6 +993,9 @@ _zkstack() {
             zkstack__help__external__node,run)
                 cmd="zkstack__help__external__node__run"
                 ;;
+            zkstack__help__external__node,wait)
+                cmd="zkstack__help__external__node__wait"
+                ;;
             zkstack__help__prover,compressor-keys)
                 cmd="zkstack__help__prover__compressor__keys"
                 ;;
@@ -966,6 +1011,15 @@ _zkstack() {
             zkstack__help__prover,setup-keys)
                 cmd="zkstack__help__prover__setup__keys"
                 ;;
+            zkstack__help__server,build)
+                cmd="zkstack__help__server__build"
+                ;;
+            zkstack__help__server,run)
+                cmd="zkstack__help__server__run"
+                ;;
+            zkstack__help__server,wait)
+                cmd="zkstack__help__server__wait"
+                ;;
             zkstack__prover,compressor-keys)
                 cmd="zkstack__prover__compressor__keys"
                 ;;
@@ -1002,6 +1056,30 @@ _zkstack() {
             zkstack__prover__help,setup-keys)
                 cmd="zkstack__prover__help__setup__keys"
                 ;;
+            zkstack__server,build)
+                cmd="zkstack__server__build"
+                ;;
+            zkstack__server,help)
+                cmd="zkstack__server__help"
+                ;;
+            zkstack__server,run)
+                cmd="zkstack__server__run"
+                ;;
+            zkstack__server,wait)
+                cmd="zkstack__server__wait"
+                ;;
+            zkstack__server__help,build)
+                cmd="zkstack__server__help__build"
+                ;;
+            zkstack__server__help,help)
+                cmd="zkstack__server__help__help"
+                ;;
+            zkstack__server__help,run)
+                cmd="zkstack__server__help__run"
+                ;;
+            zkstack__server__help,wait)
+                cmd="zkstack__server__help__wait"
+                ;;
             *)
                 ;;
         esac
@@ -2144,7 +2222,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__consensus)
-            opts="-v -h --verbose --chain --ignore-prerequisites --help set-attester-committee get-attester-committee help"
+            opts="-v -h --verbose --chain --ignore-prerequisites --help set-attester-committee get-attester-committee wait-for-registry help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -2180,7 +2258,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__consensus__help)
-            opts="set-attester-committee get-attester-committee help"
+            opts="set-attester-committee get-attester-committee wait-for-registry help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -2235,6 +2313,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__consensus__help__wait__for__registry)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__consensus__set__attester__committee)
             opts="-v -h --from-genesis --from-file --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -2257,6 +2349,36 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__consensus__wait__for__registry)
+            opts="-t -v -h --timeout --poll-interval --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --timeout)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                -t)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --poll-interval)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__containers)
             opts="-o -v -h --observability --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
@@ -2284,7 +2406,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__contract__verifier)
-            opts="-v -h --verbose --chain --ignore-prerequisites --help run init help"
+            opts="-v -h --verbose --chain --ignore-prerequisites --help build run wait init help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -2301,8 +2423,26 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__contract__verifier__build)
+            opts="-v -h --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__contract__verifier__help)
-            opts="run init help"
+            opts="build run wait init help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -2315,6 +2455,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__contract__verifier__help__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__contract__verifier__help__help)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
@@ -2357,6 +2511,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__contract__verifier__help__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__contract__verifier__init)
             opts="-v -h --zksolc-version --zkvyper-version --solc-version --era-vm-solc-version --vyper-version --only --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -2413,6 +2581,36 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__contract__verifier__wait)
+            opts="-t -v -h --timeout --poll-interval --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --timeout)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                -t)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --poll-interval)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__dev)
             opts="-v -h --verbose --chain --ignore-prerequisites --help database test clean snapshot lint fmt prover contracts config-writer send-transactions status generate-genesis help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
@@ -5140,7 +5338,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__external__node)
-            opts="-v -h --verbose --chain --ignore-prerequisites --help configs init run help"
+            opts="-v -h --verbose --chain --ignore-prerequisites --help configs init build run wait help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -5157,6 +5355,24 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__external__node__build)
+            opts="-v -h --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__external__node__configs)
             opts="-u -v -h --db-url --db-name --l1-rpc-url --use-default --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -5188,7 +5404,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__external__node__help)
-            opts="configs init run help"
+            opts="configs init build run wait help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -5201,6 +5417,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__external__node__help__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__external__node__help__configs)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
@@ -5257,6 +5487,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__external__node__help__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__external__node__init)
             opts="-v -h --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -5309,6 +5553,36 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__external__node__wait)
+            opts="-t -v -h --timeout --poll-interval --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --timeout)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                -t)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --poll-interval)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help)
             opts="autocomplete ecosystem chain dev prover server external-node containers contract-verifier portal explorer consensus update markdown help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
@@ -5590,7 +5864,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__help__consensus)
-            opts="set-attester-committee get-attester-committee"
+            opts="set-attester-committee get-attester-committee wait-for-registry"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -5631,6 +5905,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__consensus__wait__for__registry)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__containers)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -5646,7 +5934,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__help__contract__verifier)
-            opts="run init"
+            opts="build run wait init"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -5659,6 +5947,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__contract__verifier__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__contract__verifier__init)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
@@ -5687,6 +5989,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__contract__verifier__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__dev)
             opts="database test clean snapshot lint fmt prover contracts config-writer send-transactions status generate-genesis"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -6416,7 +6732,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__help__external__node)
-            opts="configs init run"
+            opts="configs init build run wait"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -6429,6 +6745,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__external__node__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__external__node__configs)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
@@ -6471,6 +6801,20 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__external__node__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__help)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -6598,7 +6942,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__help__server)
-            opts=""
+            opts="build run wait"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -6611,6 +6955,48 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__help__server__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__help__server__run)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__help__server__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__help__update)
             opts=""
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
@@ -7028,7 +7414,7 @@ _zkstack() {
             return 0
             ;;
         zkstack__server)
-            opts="-a -v -h --components --genesis --additional-args --build --uring --verbose --chain --ignore-prerequisites --help"
+            opts="-a -v -h --components --genesis --additional-args --uring --verbose --chain --ignore-prerequisites --help build run wait help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
                 COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
                 return 0
@@ -7057,6 +7443,154 @@ _zkstack() {
             COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
             return 0
             ;;
+        zkstack__server__build)
+            opts="-v -h --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__help)
+            opts="build run wait help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__help__build)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__help__help)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__help__run)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__help__wait)
+            opts=""
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 4 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__run)
+            opts="-a -v -h --components --genesis --additional-args --uring --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --components)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --additional-args)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                -a)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
+        zkstack__server__wait)
+            opts="-t -v -h --timeout --poll-interval --verbose --chain --ignore-prerequisites --help"
+            if [[ ${cur} == -* || ${COMP_CWORD} -eq 3 ]] ; then
+                COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+                return 0
+            fi
+            case "${prev}" in
+                --timeout)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                -t)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --poll-interval)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                --chain)
+                    COMPREPLY=($(compgen -f "${cur}"))
+                    return 0
+                    ;;
+                *)
+                    COMPREPLY=()
+                    ;;
+            esac
+            COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+            return 0
+            ;;
         zkstack__update)
             opts="-c -v -h --only-config --verbose --chain --ignore-prerequisites --help"
             if [[ ${cur} == -* || ${COMP_CWORD} -eq 2 ]] ; then
diff --git a/zkstack_cli/crates/zkstack/src/commands/args/mod.rs b/zkstack_cli/crates/zkstack/src/commands/args/mod.rs
index 5fa83aadf51f..477f3a6ae9af 100644
--- a/zkstack_cli/crates/zkstack/src/commands/args/mod.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/args/mod.rs
@@ -1,9 +1,7 @@
-pub use autocomplete::*;
-pub use containers::*;
-pub use run_server::*;
-pub use update::*;
+pub use self::{autocomplete::*, containers::*, run_server::*, update::*, wait::*};
 
 mod autocomplete;
 mod containers;
 mod run_server;
 mod update;
+mod wait;
diff --git a/zkstack_cli/crates/zkstack/src/commands/args/run_server.rs b/zkstack_cli/crates/zkstack/src/commands/args/run_server.rs
index d090c0de03f9..40344c90ad05 100644
--- a/zkstack_cli/crates/zkstack/src/commands/args/run_server.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/args/run_server.rs
@@ -1,22 +1,53 @@
-use clap::Parser;
+use clap::{Parser, Subcommand};
 use serde::{Deserialize, Serialize};
 
-use crate::messages::{
-    MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_BUILD_HELP, MSG_SERVER_COMPONENTS_HELP,
-    MSG_SERVER_GENESIS_HELP, MSG_SERVER_URING_HELP,
+use crate::{
+    commands::args::WaitArgs,
+    messages::{
+        MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_COMPONENTS_HELP, MSG_SERVER_GENESIS_HELP,
+        MSG_SERVER_URING_HELP,
+    },
 };
 
+#[derive(Debug, Parser)]
+#[command(args_conflicts_with_subcommands = true, flatten_help = true)]
+pub struct ServerArgs {
+    #[command(subcommand)]
+    command: Option<ServerCommand>,
+    #[command(flatten)]
+    run: RunServerArgs,
+}
+
+#[derive(Debug, Subcommand)]
+pub enum ServerCommand {
+    /// Builds server
+    Build,
+    /// Runs server
+    Run(RunServerArgs),
+    /// Waits for server to start
+    Wait(WaitArgs),
+}
+
+impl From<ServerArgs> for ServerCommand {
+    fn from(args: ServerArgs) -> Self {
+        args.command.unwrap_or(ServerCommand::Run(args.run))
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize, Parser)]
 pub struct RunServerArgs {
-    #[clap(long, help = MSG_SERVER_COMPONENTS_HELP)]
+    #[arg(long, help = MSG_SERVER_COMPONENTS_HELP)]
     pub components: Option<Vec<String>>,
-    #[clap(long, help = MSG_SERVER_GENESIS_HELP)]
+    #[arg(long, help = MSG_SERVER_GENESIS_HELP)]
     pub genesis: bool,
-    #[clap(long, short)]
-    #[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false, help = MSG_SERVER_ADDITIONAL_ARGS_HELP)]
+    #[arg(
+        long, short,
+        trailing_var_arg = true,
+        allow_hyphen_values = true,
+        hide = false,
+        help = MSG_SERVER_ADDITIONAL_ARGS_HELP
+    )]
     additional_args: Vec<String>,
-    #[clap(long, help = MSG_SERVER_BUILD_HELP)]
-    pub build: bool,
-    #[clap(help=MSG_SERVER_URING_HELP, long, default_missing_value = "true")]
+    #[clap(help = MSG_SERVER_URING_HELP, long, default_missing_value = "true")]
     pub uring: bool,
 }
diff --git a/zkstack_cli/crates/zkstack/src/commands/args/wait.rs b/zkstack_cli/crates/zkstack/src/commands/args/wait.rs
new file mode 100644
index 000000000000..a3a7e32ae8b4
--- /dev/null
+++ b/zkstack_cli/crates/zkstack/src/commands/args/wait.rs
@@ -0,0 +1,130 @@
+use std::{fmt, future::Future, time::Duration};
+
+use anyhow::Context as _;
+use clap::Parser;
+use common::logger;
+use reqwest::StatusCode;
+use serde::{Deserialize, Serialize};
+use tokio::time::MissedTickBehavior;
+
+use crate::messages::{
+    msg_wait_connect_err, msg_wait_non_successful_response, msg_wait_not_healthy,
+    msg_wait_starting_polling, msg_wait_timeout, MSG_WAIT_POLL_INTERVAL_HELP,
+    MSG_WAIT_TIMEOUT_HELP,
+};
+
+#[derive(Debug, Clone, Copy)]
+enum PolledComponent {
+    Prometheus,
+    HealthCheck,
+}
+
+impl fmt::Display for PolledComponent {
+    fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {
+        formatter.write_str(match self {
+            Self::Prometheus => "Prometheus",
+            Self::HealthCheck => "health check",
+        })
+    }
+}
+
+#[derive(Debug, Parser, Serialize, Deserialize)]
+pub struct WaitArgs {
+    #[arg(long, short = 't', value_name = "SECONDS", help = MSG_WAIT_TIMEOUT_HELP)]
+    timeout: Option<u64>,
+    #[arg(long, value_name = "MILLIS", help = MSG_WAIT_POLL_INTERVAL_HELP, default_value_t = 100)]
+    poll_interval: u64,
+}
+
+impl WaitArgs {
+    pub fn poll_interval(&self) -> Duration {
+        Duration::from_millis(self.poll_interval)
+    }
+
+    pub async fn poll_prometheus(&self, port: u16, verbose: bool) -> anyhow::Result<()> {
+        let component = PolledComponent::Prometheus;
+        let url = format!("http://127.0.0.1:{port}/metrics");
+        self.poll_with_timeout(component, self.poll_inner(component, &url, verbose))
+            .await
+    }
+
+    pub async fn poll_health_check(&self, port: u16, verbose: bool) -> anyhow::Result<()> {
+        let component = PolledComponent::HealthCheck;
+        let url = format!("http://127.0.0.1:{port}/health");
+        self.poll_with_timeout(component, self.poll_inner(component, &url, verbose))
+            .await
+    }
+
+    pub async fn poll_with_timeout(
+        &self,
+        component: impl fmt::Display,
+        action: impl Future<Output = anyhow::Result<()>>,
+    ) -> anyhow::Result<()> {
+        match self.timeout {
+            None => action.await,
+            Some(timeout) => tokio::time::timeout(Duration::from_secs(timeout), action)
+                .await
+                .map_err(|_| anyhow::Error::msg(msg_wait_timeout(&component)))?,
+        }
+    }
+
+    async fn poll_inner(
+        &self,
+        component: PolledComponent,
+        url: &str,
+        verbose: bool,
+    ) -> anyhow::Result<()> {
+        let poll_interval = Duration::from_millis(self.poll_interval);
+        let mut interval = tokio::time::interval(poll_interval);
+        interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+        if verbose {
+            logger::debug(msg_wait_starting_polling(&component, url, poll_interval));
+        }
+
+        let client = reqwest::Client::builder()
+            .connect_timeout(poll_interval)
+            .build()
+            .context("failed to build reqwest::Client")?;
+
+        loop {
+            interval.tick().await;
+
+            let response = match client.get(url).send().await {
+                Ok(response) => response,
+                Err(err) if err.is_connect() || err.is_timeout() => {
+                    continue;
+                }
+                Err(err) => {
+                    return Err(
+                        anyhow::Error::new(err).context(msg_wait_connect_err(&component, url))
+                    )
+                }
+            };
+
+            match component {
+                PolledComponent::Prometheus => {
+                    response
+                        .error_for_status()
+                        .with_context(|| msg_wait_non_successful_response(&component))?;
+                    return Ok(());
+                }
+                PolledComponent::HealthCheck => {
+                    if response.status().is_success() {
+                        return Ok(());
+                    }
+
+                    if response.status() == StatusCode::SERVICE_UNAVAILABLE {
+                        if verbose {
+                            logger::debug(msg_wait_not_healthy(url));
+                        }
+                    } else {
+                        response
+                            .error_for_status()
+                            .with_context(|| msg_wait_non_successful_response(&component))?;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/zkstack_cli/crates/zkstack/src/commands/consensus/mod.rs b/zkstack_cli/crates/zkstack/src/commands/consensus/mod.rs
index 1855a5943dc7..7a998efedbf2 100644
--- a/zkstack_cli/crates/zkstack/src/commands/consensus/mod.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/consensus/mod.rs
@@ -3,22 +3,23 @@ use std::{borrow::Borrow, collections::HashMap, path::PathBuf, sync::Arc};
 /// Consensus registry contract operations.
 /// Includes code duplicated from `zksync_node_consensus::registry::abi`.
 use anyhow::Context as _;
-use common::{logger, wallets::Wallet};
+use common::{config::global_config, logger, wallets::Wallet};
 use config::EcosystemConfig;
 use conv::*;
 use ethers::{
     abi::Detokenize,
     contract::{FunctionCall, Multicall},
     middleware::{Middleware, NonceManagerMiddleware, SignerMiddleware},
-    providers::{Http, JsonRpcClient, PendingTransaction, Provider, RawCall as _},
+    providers::{Http, JsonRpcClient, PendingTransaction, Provider, ProviderError, RawCall as _},
     signers::{LocalWallet, Signer as _},
     types::{Address, BlockId, H256},
 };
+use tokio::time::MissedTickBehavior;
 use xshell::Shell;
 use zksync_consensus_crypto::ByteFmt;
 use zksync_consensus_roles::{attester, validator};
 
-use crate::{messages, utils::consensus::parse_attester_committee};
+use crate::{commands::args::WaitArgs, messages, utils::consensus::parse_attester_committee};
 
 mod conv;
 mod proto;
@@ -92,6 +93,8 @@ pub enum Command {
     SetAttesterCommittee(SetAttesterCommitteeCommand),
     /// Fetches the attester committee from the consensus registry contract.
     GetAttesterCommittee,
+    /// Wait until the consensus registry contract is deployed to L2.
+    WaitForRegistry(WaitArgs),
 }
 
 /// Collection of sent transactions.
@@ -210,15 +213,18 @@ impl Setup {
         })
     }
 
+    fn consensus_registry_addr(&self) -> anyhow::Result<Address> {
+        self.contracts
+            .l2
+            .consensus_registry
+            .context(messages::MSG_CONSENSUS_REGISTRY_ADDRESS_NOT_CONFIGURED)
+    }
+
     fn consensus_registry<M: Middleware>(
         &self,
         m: Arc<M>,
     ) -> anyhow::Result<abi::ConsensusRegistry<M>> {
-        let addr = self
-            .contracts
-            .l2
-            .consensus_registry
-            .context(messages::MSG_CONSENSUS_REGISTRY_ADDRESS_NOT_CONFIGURED)?;
+        let addr = self.consensus_registry_addr()?;
         Ok(abi::ConsensusRegistry::new(addr, m))
     }
 
@@ -276,6 +282,58 @@ impl Setup {
         parse_attester_committee(attesters).context("parse_attester_committee()")
     }
 
+    async fn wait_for_registry_contract_inner(
+        &self,
+        args: &WaitArgs,
+        verbose: bool,
+    ) -> anyhow::Result<()> {
+        let addr = self.consensus_registry_addr()?;
+        let provider = self.provider().context("provider()")?;
+        let mut interval = tokio::time::interval(args.poll_interval());
+        interval.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+        if verbose {
+            logger::debug(messages::msg_wait_consensus_registry_started_polling(
+                addr,
+                provider.url(),
+            ));
+        }
+
+        loop {
+            interval.tick().await;
+
+            let code = match provider.get_code(addr, None).await {
+                Ok(code) => code,
+                Err(ProviderError::HTTPError(err)) if err.is_connect() || err.is_timeout() => {
+                    continue;
+                }
+                Err(err) => {
+                    return Err(anyhow::Error::new(err)
+                        .context(messages::MSG_CONSENSUS_REGISTRY_POLL_ERROR))
+                }
+            };
+            if !code.is_empty() {
+                logger::info(messages::msg_consensus_registry_wait_success(
+                    addr,
+                    code.len(),
+                ));
+                return Ok(());
+            }
+        }
+    }
+
+    async fn wait_for_registry_contract(
+        &self,
+        args: &WaitArgs,
+        verbose: bool,
+    ) -> anyhow::Result<()> {
+        args.poll_with_timeout(
+            messages::MSG_CONSENSUS_REGISTRY_WAIT_COMPONENT,
+            self.wait_for_registry_contract_inner(args, verbose),
+        )
+        .await
+    }
+
     async fn set_attester_committee(&self, want: &attester::Committee) -> anyhow::Result<()> {
         let provider = self.provider().context("provider()")?;
         let block_id = self.last_block(&provider).await.context("last_block()")?;
@@ -410,6 +468,10 @@ impl Command {
                 let got = setup.get_attester_committee().await?;
                 print_attesters(&got);
             }
+            Self::WaitForRegistry(args) => {
+                let verbose = global_config().verbose;
+                setup.wait_for_registry_contract(&args, verbose).await?;
+            }
         }
         Ok(())
     }
diff --git a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/build.rs b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/build.rs
new file mode 100644
index 000000000000..0ba72f6b2257
--- /dev/null
+++ b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/build.rs
@@ -0,0 +1,26 @@
+use anyhow::Context;
+use common::{cmd::Cmd, logger};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use crate::messages::{
+    MSG_BUILDING_CONTRACT_VERIFIER, MSG_CHAIN_NOT_FOUND_ERR,
+    MSG_FAILED_TO_BUILD_CONTRACT_VERIFIER_ERR,
+};
+
+pub(crate) async fn build(shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem = EcosystemConfig::from_file(shell)?;
+    let chain = ecosystem
+        .load_current_chain()
+        .context(MSG_CHAIN_NOT_FOUND_ERR)?;
+    let _dir_guard = shell.push_dir(&chain.link_to_code);
+
+    logger::info(MSG_BUILDING_CONTRACT_VERIFIER);
+
+    let mut cmd = Cmd::new(cmd!(
+        shell,
+        "cargo build --release --bin zksync_contract_verifier"
+    ));
+    cmd = cmd.with_force_run();
+    cmd.run().context(MSG_FAILED_TO_BUILD_CONTRACT_VERIFIER_ERR)
+}
diff --git a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/mod.rs b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/mod.rs
index 78bdc5fae7ec..e36e6ba62e7b 100644
--- a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/mod.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/mod.rs
@@ -1,22 +1,32 @@
-use args::init::InitContractVerifierArgs;
 use clap::Subcommand;
 use xshell::Shell;
 
-pub mod args;
-pub mod init;
-pub mod run;
+use self::args::init::InitContractVerifierArgs;
+use crate::commands::args::WaitArgs;
+
+mod args;
+mod build;
+mod init;
+mod run;
+mod wait;
 
 #[derive(Subcommand, Debug)]
 pub enum ContractVerifierCommands {
+    /// Build contract verifier binary
+    Build,
     /// Run contract verifier
     Run,
+    /// Wait for contract verifier to start
+    Wait(WaitArgs),
     /// Download required binaries for contract verifier
     Init(InitContractVerifierArgs),
 }
 
 pub(crate) async fn run(shell: &Shell, args: ContractVerifierCommands) -> anyhow::Result<()> {
     match args {
+        ContractVerifierCommands::Build => build::build(shell).await,
         ContractVerifierCommands::Run => run::run(shell).await,
+        ContractVerifierCommands::Wait(args) => wait::wait(shell, args).await,
         ContractVerifierCommands::Init(args) => init::run(shell, args).await,
     }
 }
diff --git a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/run.rs b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/run.rs
index 9913ec817e90..ebc33840bdea 100644
--- a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/run.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/run.rs
@@ -22,7 +22,7 @@ pub(crate) async fn run(shell: &Shell) -> anyhow::Result<()> {
 
     let mut cmd = Cmd::new(cmd!(
         shell,
-        "cargo run --bin zksync_contract_verifier -- --config-path={config_path} --secrets-path={secrets_path}"
+        "cargo run --release --bin zksync_contract_verifier -- --config-path={config_path} --secrets-path={secrets_path}"
     ));
     cmd = cmd.with_force_run();
     cmd.run().context(MSG_FAILED_TO_RUN_CONTRACT_VERIFIER_ERR)
diff --git a/zkstack_cli/crates/zkstack/src/commands/contract_verifier/wait.rs b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/wait.rs
new file mode 100644
index 000000000000..011c888d3041
--- /dev/null
+++ b/zkstack_cli/crates/zkstack/src/commands/contract_verifier/wait.rs
@@ -0,0 +1,27 @@
+use anyhow::Context as _;
+use common::{config::global_config, logger};
+use config::EcosystemConfig;
+use xshell::Shell;
+
+use crate::{commands::args::WaitArgs, messages::MSG_CHAIN_NOT_FOUND_ERR};
+
+pub(crate) async fn wait(shell: &Shell, args: WaitArgs) -> anyhow::Result<()> {
+    let ecosystem = EcosystemConfig::from_file(shell)?;
+    let chain = ecosystem
+        .load_current_chain()
+        .context(MSG_CHAIN_NOT_FOUND_ERR)?;
+    let verbose = global_config().verbose;
+
+    let prometheus_port = chain
+        .get_general_config()?
+        .contract_verifier
+        .as_ref()
+        .context("contract verifier config not specified")?
+        .prometheus_port;
+    logger::info("Waiting for contract verifier to become alive");
+    args.poll_prometheus(prometheus_port, verbose).await?;
+    logger::info(format!(
+        "Contract verifier is alive with Prometheus server bound to :{prometheus_port}"
+    ));
+    Ok(())
+}
diff --git a/zkstack_cli/crates/zkstack/src/commands/external_node/build.rs b/zkstack_cli/crates/zkstack/src/commands/external_node/build.rs
new file mode 100644
index 000000000000..ff15c0c77f30
--- /dev/null
+++ b/zkstack_cli/crates/zkstack/src/commands/external_node/build.rs
@@ -0,0 +1,23 @@
+use anyhow::Context;
+use common::{cmd::Cmd, logger};
+use config::EcosystemConfig;
+use xshell::{cmd, Shell};
+
+use crate::messages::{MSG_BUILDING_EN, MSG_CHAIN_NOT_FOUND_ERR, MSG_FAILED_TO_BUILD_EN_ERR};
+
+pub(crate) async fn build(shell: &Shell) -> anyhow::Result<()> {
+    let ecosystem = EcosystemConfig::from_file(shell)?;
+    let chain = ecosystem
+        .load_current_chain()
+        .context(MSG_CHAIN_NOT_FOUND_ERR)?;
+    let _dir_guard = shell.push_dir(&chain.link_to_code);
+
+    logger::info(MSG_BUILDING_EN);
+
+    let mut cmd = Cmd::new(cmd!(
+        shell,
+        "cargo build --release --bin zksync_external_node"
+    ));
+    cmd = cmd.with_force_run();
+    cmd.run().context(MSG_FAILED_TO_BUILD_EN_ERR)
+}
diff --git a/zkstack_cli/crates/zkstack/src/commands/external_node/mod.rs b/zkstack_cli/crates/zkstack/src/commands/external_node/mod.rs
index 095566d24e87..7bd366d5871c 100644
--- a/zkstack_cli/crates/zkstack/src/commands/external_node/mod.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/external_node/mod.rs
@@ -1,12 +1,16 @@
-use args::{prepare_configs::PrepareConfigArgs, run::RunExternalNodeArgs};
 use clap::Parser;
 use serde::{Deserialize, Serialize};
 use xshell::Shell;
 
+use self::args::{prepare_configs::PrepareConfigArgs, run::RunExternalNodeArgs};
+use crate::commands::args::WaitArgs;
+
 mod args;
+mod build;
 mod init;
 mod prepare_configs;
 mod run;
+mod wait;
 
 #[derive(Debug, Serialize, Deserialize, Parser)]
 pub enum ExternalNodeCommands {
@@ -14,14 +18,20 @@ pub enum ExternalNodeCommands {
     Configs(PrepareConfigArgs),
     /// Init databases
     Init,
+    /// Build external node
+    Build,
     /// Run external node
     Run(RunExternalNodeArgs),
+    /// Wait for external node to start
+    Wait(WaitArgs),
 }
 
 pub async fn run(shell: &Shell, commands: ExternalNodeCommands) -> anyhow::Result<()> {
     match commands {
         ExternalNodeCommands::Configs(args) => prepare_configs::run(shell, args),
         ExternalNodeCommands::Init => init::run(shell).await,
+        ExternalNodeCommands::Build => build::build(shell).await,
         ExternalNodeCommands::Run(args) => run::run(shell, args).await,
+        ExternalNodeCommands::Wait(args) => wait::wait(shell, args).await,
     }
 }
diff --git a/zkstack_cli/crates/zkstack/src/commands/external_node/wait.rs b/zkstack_cli/crates/zkstack/src/commands/external_node/wait.rs
new file mode 100644
index 000000000000..72568c36f363
--- /dev/null
+++ b/zkstack_cli/crates/zkstack/src/commands/external_node/wait.rs
@@ -0,0 +1,35 @@
+use anyhow::Context as _;
+use common::{config::global_config, logger};
+use config::{traits::ReadConfigWithBasePath, EcosystemConfig};
+use xshell::Shell;
+use zksync_config::configs::GeneralConfig;
+
+use crate::{
+    commands::args::WaitArgs,
+    messages::{msg_waiting_for_en_success, MSG_CHAIN_NOT_INITIALIZED, MSG_WAITING_FOR_EN},
+};
+
+pub async fn wait(shell: &Shell, args: WaitArgs) -> anyhow::Result<()> {
+    let ecosystem_config = EcosystemConfig::from_file(shell)?;
+    let chain_config = ecosystem_config
+        .load_current_chain()
+        .context(MSG_CHAIN_NOT_INITIALIZED)?;
+    let verbose = global_config().verbose;
+
+    let en_path = chain_config
+        .external_node_config_path
+        .clone()
+        .context("External node is not initialized")?;
+    let general_config = GeneralConfig::read_with_base_path(shell, &en_path)?;
+    let health_check_port = general_config
+        .api_config
+        .as_ref()
+        .context("no API config")?
+        .healthcheck
+        .port;
+
+    logger::info(MSG_WAITING_FOR_EN);
+    args.poll_health_check(health_check_port, verbose).await?;
+    logger::info(msg_waiting_for_en_success(health_check_port));
+    Ok(())
+}
diff --git a/zkstack_cli/crates/zkstack/src/commands/server.rs b/zkstack_cli/crates/zkstack/src/commands/server.rs
index be7a676a8252..10f267fb8526 100644
--- a/zkstack_cli/crates/zkstack/src/commands/server.rs
+++ b/zkstack_cli/crates/zkstack/src/commands/server.rs
@@ -1,5 +1,7 @@
 use anyhow::Context;
 use common::{
+    cmd::Cmd,
+    config::global_config,
     logger,
     server::{Server, ServerMode},
 };
@@ -7,25 +9,38 @@ use config::{
     traits::FileConfigWithDefaultName, ChainConfig, ContractsConfig, EcosystemConfig,
     GeneralConfig, GenesisConfig, SecretsConfig, WalletsConfig,
 };
-use xshell::Shell;
+use xshell::{cmd, Shell};
 
 use crate::{
-    commands::args::RunServerArgs,
-    messages::{MSG_CHAIN_NOT_INITIALIZED, MSG_FAILED_TO_RUN_SERVER_ERR, MSG_STARTING_SERVER},
+    commands::args::{RunServerArgs, ServerArgs, ServerCommand, WaitArgs},
+    messages::{
+        msg_waiting_for_server_success, MSG_BUILDING_SERVER, MSG_CHAIN_NOT_INITIALIZED,
+        MSG_FAILED_TO_BUILD_SERVER_ERR, MSG_FAILED_TO_RUN_SERVER_ERR, MSG_STARTING_SERVER,
+        MSG_WAITING_FOR_SERVER,
+    },
 };
 
-pub fn run(shell: &Shell, args: RunServerArgs) -> anyhow::Result<()> {
+pub async fn run(shell: &Shell, args: ServerArgs) -> anyhow::Result<()> {
     let ecosystem_config = EcosystemConfig::from_file(shell)?;
-
     let chain_config = ecosystem_config
         .load_current_chain()
         .context(MSG_CHAIN_NOT_INITIALIZED)?;
 
-    logger::info(MSG_STARTING_SERVER);
+    match ServerCommand::from(args) {
+        ServerCommand::Run(args) => run_server(args, &chain_config, shell),
+        ServerCommand::Build => build_server(&chain_config, shell),
+        ServerCommand::Wait(args) => wait_for_server(args, &chain_config).await,
+    }
+}
 
-    run_server(args, &chain_config, shell)?;
+fn build_server(chain_config: &ChainConfig, shell: &Shell) -> anyhow::Result<()> {
+    let _dir_guard = shell.push_dir(&chain_config.link_to_code);
 
-    Ok(())
+    logger::info(MSG_BUILDING_SERVER);
+
+    let mut cmd = Cmd::new(cmd!(shell, "cargo build --release --bin zksync_server"));
+    cmd = cmd.with_force_run();
+    cmd.run().context(MSG_FAILED_TO_BUILD_SERVER_ERR)
 }
 
 fn run_server(
@@ -33,17 +48,13 @@ fn run_server(
     chain_config: &ChainConfig,
     shell: &Shell,
 ) -> anyhow::Result<()> {
+    logger::info(MSG_STARTING_SERVER);
     let server = Server::new(
         args.components.clone(),
         chain_config.link_to_code.clone(),
         args.uring,
     );
 
-    if args.build {
-        server.build(shell)?;
-        return Ok(());
-    }
-
     let mode = if args.genesis {
         ServerMode::Genesis
     } else {
@@ -62,3 +73,20 @@ fn run_server(
         )
         .context(MSG_FAILED_TO_RUN_SERVER_ERR)
 }
+
+async fn wait_for_server(args: WaitArgs, chain_config: &ChainConfig) -> anyhow::Result<()> {
+    let verbose = global_config().verbose;
+
+    let health_check_port = chain_config
+        .get_general_config()?
+        .api_config
+        .as_ref()
+        .context("no API config")?
+        .healthcheck
+        .port;
+
+    logger::info(MSG_WAITING_FOR_SERVER);
+    args.poll_health_check(health_check_port, verbose).await?;
+    logger::info(msg_waiting_for_server_success(health_check_port));
+    Ok(())
+}
diff --git a/zkstack_cli/crates/zkstack/src/main.rs b/zkstack_cli/crates/zkstack/src/main.rs
index 3ebe26a4fa21..8a115201fc81 100644
--- a/zkstack_cli/crates/zkstack/src/main.rs
+++ b/zkstack_cli/crates/zkstack/src/main.rs
@@ -15,7 +15,7 @@ use config::EcosystemConfig;
 use xshell::Shell;
 
 use crate::commands::{
-    args::RunServerArgs, chain::ChainCommands, consensus, ecosystem::EcosystemCommands,
+    args::ServerArgs, chain::ChainCommands, consensus, ecosystem::EcosystemCommands,
     explorer::ExplorerCommands, external_node::ExternalNodeCommands, prover::ProverCommands,
 };
 
@@ -57,7 +57,7 @@ pub enum ZkStackSubcommands {
     #[command(subcommand, alias = "p")]
     Prover(ProverCommands),
     /// Run server
-    Server(RunServerArgs),
+    Server(ServerArgs),
     /// External Node related commands
     #[command(subcommand, alias = "en")]
     ExternalNode(ExternalNodeCommands),
@@ -136,7 +136,7 @@ async fn run_subcommand(zkstack_args: ZkStack) -> anyhow::Result<()> {
         ZkStackSubcommands::Chain(args) => commands::chain::run(&shell, *args).await?,
         ZkStackSubcommands::Dev(args) => commands::dev::run(&shell, args).await?,
         ZkStackSubcommands::Prover(args) => commands::prover::run(&shell, args).await?,
-        ZkStackSubcommands::Server(args) => commands::server::run(&shell, args)?,
+        ZkStackSubcommands::Server(args) => commands::server::run(&shell, args).await?,
         ZkStackSubcommands::Containers(args) => commands::containers::run(&shell, args)?,
         ZkStackSubcommands::ExternalNode(args) => {
             commands::external_node::run(&shell, args).await?
diff --git a/zkstack_cli/crates/zkstack/src/messages.rs b/zkstack_cli/crates/zkstack/src/messages.rs
index 516194ef721e..bedcb233b19f 100644
--- a/zkstack_cli/crates/zkstack/src/messages.rs
+++ b/zkstack_cli/crates/zkstack/src/messages.rs
@@ -1,9 +1,10 @@
-use std::path::Path;
+use std::{fmt, path::Path, time::Duration};
 
 use ethers::{
-    types::{H160, U256},
+    types::{Address, H160, U256},
     utils::format_ether,
 };
+use url::Url;
 use zksync_consensus_roles::attester;
 
 pub(super) const MSG_SETUP_KEYS_DOWNLOAD_SELECTION_PROMPT: &str =
@@ -264,7 +265,6 @@ pub(super) const MSG_ENABLE_CONSENSUS_HELP: &str = "Enable consensus";
 pub(super) const MSG_SERVER_GENESIS_HELP: &str = "Run server in genesis mode";
 pub(super) const MSG_SERVER_ADDITIONAL_ARGS_HELP: &str =
     "Additional arguments that can be passed through the CLI";
-pub(super) const MSG_SERVER_BUILD_HELP: &str = "Build server but don't run it";
 pub(super) const MSG_SERVER_URING_HELP: &str = "Enables uring support for RocksDB";
 
 /// Accept ownership related messages
@@ -284,6 +284,13 @@ pub(super) const MSG_OBSERVABILITY_RUN_PROMPT: &str = "Do you want to run observ
 pub(super) const MSG_STARTING_SERVER: &str = "Starting server";
 pub(super) const MSG_FAILED_TO_RUN_SERVER_ERR: &str = "Failed to start server";
 pub(super) const MSG_PREPARING_EN_CONFIGS: &str = "Preparing External Node config";
+pub(super) const MSG_BUILDING_SERVER: &str = "Building server";
+pub(super) const MSG_FAILED_TO_BUILD_SERVER_ERR: &str = "Failed to build server";
+pub(super) const MSG_WAITING_FOR_SERVER: &str = "Waiting for server to start";
+
+pub(super) fn msg_waiting_for_server_success(health_check_port: u16) -> String {
+    format!("Server is alive with health check server on :{health_check_port}")
+}
 
 /// Portal related messages
 pub(super) const MSG_PORTAL_FAILED_TO_FIND_ANY_CHAIN_ERR: &str =
@@ -351,7 +358,14 @@ pub(super) const MSG_CONSENSUS_CONFIG_MISSING_ERR: &str = "Consensus config is m
 pub(super) const MSG_CONSENSUS_SECRETS_MISSING_ERR: &str = "Consensus secrets config is missing";
 pub(super) const MSG_CONSENSUS_SECRETS_NODE_KEY_MISSING_ERR: &str = "Consensus node key is missing";
 
+pub(super) const MSG_BUILDING_EN: &str = "Building external node";
+pub(super) const MSG_FAILED_TO_BUILD_EN_ERR: &str = "Failed to build external node";
 pub(super) const MSG_STARTING_EN: &str = "Starting external node";
+pub(super) const MSG_WAITING_FOR_EN: &str = "Waiting for external node to start";
+
+pub(super) fn msg_waiting_for_en_success(health_check_port: u16) -> String {
+    format!("External node is alive with health check server on :{health_check_port}")
+}
 
 /// Prover related messages
 pub(super) const MSG_GENERATING_SK_SPINNER: &str = "Generating setup keys...";
@@ -429,7 +443,10 @@ pub(super) fn msg_bucket_created(bucket_name: &str) -> String {
 }
 
 /// Contract verifier related messages
+pub(super) const MSG_BUILDING_CONTRACT_VERIFIER: &str = "Building contract verifier";
 pub(super) const MSG_RUNNING_CONTRACT_VERIFIER: &str = "Running contract verifier";
+pub(super) const MSG_FAILED_TO_BUILD_CONTRACT_VERIFIER_ERR: &str =
+    "Failed to build contract verifier";
 pub(super) const MSG_FAILED_TO_RUN_CONTRACT_VERIFIER_ERR: &str = "Failed to run contract verifier";
 pub(super) const MSG_INVALID_ARCH_ERR: &str = "Invalid arch";
 pub(super) const MSG_GET_ZKSOLC_RELEASES_ERR: &str = "Failed to get zksolc releases";
@@ -478,6 +495,34 @@ pub(super) const MSG_DIFF_EN_GENERAL_CONFIG: &str =
     "Added the following fields to the external node generalconfig:";
 pub(super) const MSG_UPDATING_ERA_OBSERVABILITY_SPINNER: &str = "Updating era observability...";
 
+/// Wait-related messages
+pub(super) const MSG_WAIT_TIMEOUT_HELP: &str = "Wait timeout in seconds";
+pub(super) const MSG_WAIT_POLL_INTERVAL_HELP: &str = "Poll interval in milliseconds";
+
+pub(super) fn msg_wait_starting_polling(
+    component: &impl fmt::Display,
+    url: &str,
+    poll_interval: Duration,
+) -> String {
+    format!("Starting polling {component} at `{url}` each {poll_interval:?}")
+}
+
+pub(super) fn msg_wait_timeout(component: &impl fmt::Display) -> String {
+    format!("timed out polling {component}")
+}
+
+pub(super) fn msg_wait_connect_err(component: &impl fmt::Display, url: &str) -> String {
+    format!("failed to connect to {component} at `{url}`")
+}
+
+pub(super) fn msg_wait_non_successful_response(component: &impl fmt::Display) -> String {
+    format!("non-successful {component} response")
+}
+
+pub(super) fn msg_wait_not_healthy(url: &str) -> String {
+    format!("Node at `{url}` is not healthy")
+}
+
 pub(super) fn msg_diff_genesis_config(chain: &str) -> String {
     format!(
         "Found differences between chain {chain} and era genesis configs. Consider updating the chain {chain} genesis config and re-running genesis. Diff:"
@@ -516,9 +561,20 @@ pub(super) const MSG_CONSENSUS_REGISTRY_ADDRESS_NOT_CONFIGURED: &str =
     "consensus registry address not configured";
 pub(super) const MSG_CONSENSUS_GENESIS_SPEC_ATTESTERS_MISSING_IN_GENERAL_YAML: &str =
     "consensus.genesis_spec.attesters missing in general.yaml";
+pub(super) const MSG_CONSENSUS_REGISTRY_POLL_ERROR: &str = "failed querying L2 node";
+pub(super) const MSG_CONSENSUS_REGISTRY_WAIT_COMPONENT: &str = "main node HTTP RPC";
+
 pub(super) fn msg_setting_attester_committee_failed(
     got: &attester::Committee,
     want: &attester::Committee,
 ) -> String {
     format!("setting attester committee failed: got {got:?}, want {want:?}")
 }
+
+pub(super) fn msg_wait_consensus_registry_started_polling(addr: Address, url: &Url) -> String {
+    format!("Starting polling L2 HTTP RPC at {url} for code at {addr:?}")
+}
+
+pub(super) fn msg_consensus_registry_wait_success(addr: Address, code_len: usize) -> String {
+    format!("Consensus registry is deployed at {addr:?}: {code_len} bytes")
+}