feat(zkstack): Split chain and ecosystem layers

.github/workflows/ci-core-reusable.yml

@@ -75,7 +75,7 @@ jobs:
         run: ci_run yarn l1-contracts test
 
       - name: Download compilers for contract verifier tests
-        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
+        run: ci_run zkstack chain 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
 
       - name: Rust unit tests
         run: |
@@ -156,7 +156,7 @@ jobs:
       - name: Run server
         run: |
           ci_run zkstack dev config-writer --path ${{ matrix.vm_mode == 'NEW' && 'etc/env/file_based/overrides/tests/loadtest-new.yaml' || 'etc/env/file_based/overrides/tests/loadtest-old.yaml' }} --chain legacy
-          ci_run zkstack server --uring --chain=legacy --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
+          ci_run zkstack chain server --uring --chain=legacy --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
           ci_run sleep 60
 
       - name: Perform loadtest
@@ -359,38 +359,38 @@ jobs:
 
       - name: Build tested binaries
         run: |
-          ci_run zkstack server build
+          ci_run zkstack chain server build
           ci_run zkstack external-node build
-          ci_run zkstack contract-verifier build
+          ci_run zkstack chain 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
+          ci_run zkstack chain 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 chain contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
+          ci_run zkstack chain contract-verifier wait --chain era --verbose
 
       - name: Run servers
         run: |
           # Override config for part of chains to test the default config as well
           ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain era
           ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain validium
 
-          ci_run zkstack server --ignore-prerequisites --chain era &> ${{ env.SERVER_LOGS_DIR }}/rollup.log &
-          ci_run zkstack server --ignore-prerequisites --chain validium &> ${{ env.SERVER_LOGS_DIR }}/validium.log &
-          ci_run zkstack server --ignore-prerequisites --chain custom_token &> ${{ env.SERVER_LOGS_DIR }}/custom_token.log &
-          ci_run zkstack server --ignore-prerequisites --chain consensus \
+          ci_run zkstack chain server --ignore-prerequisites --chain era &> ${{ env.SERVER_LOGS_DIR }}/rollup.log &
+          ci_run zkstack chain server --ignore-prerequisites --chain validium &> ${{ env.SERVER_LOGS_DIR }}/validium.log &
+          ci_run zkstack chain server --ignore-prerequisites --chain custom_token &> ${{ env.SERVER_LOGS_DIR }}/custom_token.log &
+          ci_run zkstack chain server --ignore-prerequisites --chain consensus \
             --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 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
+          ci_run zkstack chain server wait --ignore-prerequisites --verbose --chain era
+          ci_run zkstack chain server wait --ignore-prerequisites --verbose --chain validium
+          ci_run zkstack chain server wait --ignore-prerequisites --verbose --chain custom_token
+          ci_run zkstack chain server wait --ignore-prerequisites --verbose --chain consensus
 
       - 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 
+          ci_run zkstack chain consensus wait-for-registry --ignore-prerequisites --verbose --chain consensus
+          ci_run zkstack chain consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log 
 
       - name: Run integration tests
         run: |

.github/workflows/ci-prover-e2e.yml

@@ -65,7 +65,7 @@ jobs:
           ci_run zkstack prover setup-keys --mode=download --region=us --verbose
       - name: Run server
         run: |
-          ci_run zkstack server --uring --chain=proving_chain --components=api,tree,eth,state_keeper,commitment_generator,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip &>prover_logs/server.log &
+          ci_run zkstack chain server --uring --chain=proving_chain --components=api,tree,eth,state_keeper,commitment_generator,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip &>prover_logs/server.log &
       - name: Run Gateway
         run: |
           ci_run zkstack prover run --component=gateway --docker=false &>prover_logs/gateway.log &

core/lib/contract_verifier/src/tests/real.rs

@@ -1,4 +1,4 @@
-//! Tests using real compiler toolchains. Should be prepared by calling `zkstack contract-verifier init`
+//! Tests using real compiler toolchains. Should be prepared by calling `zkstack chain contract-verifier init`
 //! with at least one `solc` and `zksolc` version. If there are no compilers, the tests will be ignored
 //! unless the `RUN_CONTRACT_VERIFICATION_TEST` env var is set to `true`, in which case the tests will fail.
 
@@ -90,7 +90,7 @@ fn assert_no_compilers_expected() {
         env::var("RUN_CONTRACT_VERIFICATION_TEST").ok().as_deref(),
         Some("true"),
         "Expected pre-installed compilers since `RUN_CONTRACT_VERIFICATION_TEST=true`, but they are not installed. \
-         Use `zkstack contract-verifier init` to install compilers"
+         Use `zkstack chain contract-verifier init` to install compilers"
     );
     println!("No compilers found, skipping the test");
 }

core/tests/revert-test/tests/utils.ts

@@ -63,7 +63,7 @@ export function runServerInBackground({
 }): ChildProcessWithoutNullStreams {
     let command = '';
     if (useZkStack) {
-        command = 'zkstack server';
+        command = 'zkstack chain server';
         if (chain) {
             command += ` --chain ${chain}`;
         }

core/tests/ts-integration/src/utils.ts

@@ -29,7 +29,7 @@ export function runServerInBackground({
 }): ChildProcessWithoutNullStreams {
     let command = '';
     if (useZkStack) {
-        command = 'zkstack server';
+        command = 'zkstack chain server';
         if (chain) {
             command += ` --chain ${chain}`;
         }

core/tests/upgrade-test/tests/utils.ts

@@ -19,7 +19,7 @@ export function runServerInBackground({
     let command = '';
 
     if (useZkStack) {
-        command = 'zkstack server';
+        command = 'zkstack chain server';
         command += chain ? ` --chain ${chain}` : '';
     } else {
         command = 'cd $ZKSYNC_HOME && cargo run --bin zksync_server --release --';

docs/guides/advanced/01_initialization.md

@@ -96,7 +96,7 @@ If everything goes well, you should see that L1 blocks are being produced.
 Now we can start the main server:
 
 ```bash
-zkstack server
+zkstack chain server
 ```
 
 This will actually run a cargo binary (`zksync_server`).

docs/guides/launch.md

@@ -106,7 +106,7 @@ documentation for safe ways to customize your setup.
 Run server:
 
 ```bash
-zkstack server
+zkstack chain server
 ```
 
 The server's configuration files can be found in `/chains/<chain_name>/configs` directory. These files are created when
@@ -123,7 +123,7 @@ To manually modify configuration files:
 5. Restart the relevant services for changes to take effect:
 
 ```bash
-zkstack server
+zkstack chain server
 ```
 
 > NOTE: Manual changes to configuration files may be overwritten if the ecosystem is reinitialized or the chain is
@@ -176,7 +176,7 @@ cargo run --release --bin zksync_commitment_generator
 ## Running the contract verifier
 
 ```bash
-zkstack contract-verifier run
+zkstack chain contract-verifier run
 ```
 
 ## Troubleshooting

prover/docs/03_launch.md

@@ -35,7 +35,7 @@ We will be running a bunch of binaries, it's recommended to run each in a separa
 ### Server
 
 ```bash
-zkstack server --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,da_dispatcher,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip
+zkstack chain server --components=api,tree,eth,state_keeper,housekeeper,commitment_generator,da_dispatcher,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip
 ```
 
 ### Prover gateway

zkstack_cli/README.md

@@ -166,7 +166,7 @@ by a third party).
 To run the chain:
 
 ```bash
-zkstack server
+zkstack chain server
 ```
 
 You can specify the component you want to run using `--components` flag
@@ -214,13 +214,13 @@ For `witness-generator`, specify the round with `--round <round>`. Rounds:
 Download required binaries (`solc`, `zksolc`, `vyper`, `zkvyper`):
 
 ```bash
-zkstack contract-verifier init
+zkstack chain contract-verifier init
 ```
 
 Run the contract verifier:
 
 ```bash
-zkstack contract-verifier run
+zkstack chain contract-verifier run
 ```
 
 ### External Node

zkstack_cli/crates/config/src/chain.rs

@@ -3,6 +3,7 @@ use std::{
     path::{Path, PathBuf},
 };
 
+use anyhow::{bail, Context};
 use serde::{Deserialize, Serialize, Serializer};
 use types::{BaseToken, L1BatchCommitmentMode, L1Network, ProverMode, WalletCreation};
 use xshell::Shell;
@@ -18,7 +19,8 @@ use crate::{
         FileConfigWithDefaultName, ReadConfig, ReadConfigWithBasePath, SaveConfig,
         SaveConfigWithBasePath, ZkStackConfig,
     },
-    ContractsConfig, GeneralConfig, GenesisConfig, SecretsConfig, WalletsConfig,
+    utils::find_file,
+    ContractsConfig, EcosystemConfig, GeneralConfig, GenesisConfig, SecretsConfig, WalletsConfig,
 };
 
 /// Chain configuration file. This file is created in the chain
@@ -33,6 +35,8 @@ pub struct ChainConfigInternal {
     pub prover_version: ProverMode,
     pub configs: PathBuf,
     pub rocks_db_path: PathBuf,
+    pub l1_network: Option<L1Network>,
+    pub link_to_code: Option<PathBuf>,
     pub external_node_config_path: Option<PathBuf>,
     pub artifacts_path: Option<PathBuf>,
     pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
@@ -100,6 +104,7 @@ impl ChainConfig {
         }
         anyhow::bail!("Wallets configs has not been found");
     }
+
     pub fn get_contracts_config(&self) -> anyhow::Result<ContractsConfig> {
         ContractsConfig::read_with_base_path(self.get_shell(), &self.configs)
     }
@@ -156,13 +161,69 @@ impl ChainConfig {
             rocks_db_path: self.rocks_db_path.clone(),
             external_node_config_path: self.external_node_config_path.clone(),
             artifacts_path: Some(self.artifacts.clone()),
+            l1_network: Some(self.l1_network),
+            link_to_code: Some(self.link_to_code.clone()),
             l1_batch_commit_data_generator_mode: self.l1_batch_commit_data_generator_mode,
             base_token: self.base_token.clone(),
             wallet_creation: self.wallet_creation,
             legacy_bridge: self.legacy_bridge,
             evm_emulator: self.evm_emulator,
         }
     }
+
+    pub(crate) fn from_internal(
+        chain_internal: ChainConfigInternal,
+        shell: Shell,
+    ) -> anyhow::Result<Self> {
+        let l1_network = chain_internal.l1_network.context("L1 Network not found")?;
+        let link_to_code = chain_internal
+            .link_to_code
+            .context("Link to code not found")?;
+        let artifacts = chain_internal
+            .artifacts_path
+            .context("Artifacts path not found")?;
+
+        Ok(Self {
+            id: chain_internal.id,
+            name: chain_internal.name,
+            chain_id: chain_internal.chain_id,
+            prover_version: chain_internal.prover_version,
+            configs: chain_internal.configs,
+            rocks_db_path: chain_internal.rocks_db_path,
+            external_node_config_path: chain_internal.external_node_config_path,
+            l1_network,
+            l1_batch_commit_data_generator_mode: chain_internal.l1_batch_commit_data_generator_mode,
+            base_token: chain_internal.base_token,
+            wallet_creation: chain_internal.wallet_creation,
+            legacy_bridge: chain_internal.legacy_bridge,
+            link_to_code,
+            artifacts,
+            evm_emulator: chain_internal.evm_emulator,
+            shell: shell.into(),
+        })
+    }
+}
+
+impl ChainConfigInternal {
+    pub(crate) fn from_file(shell: &Shell) -> anyhow::Result<ChainConfigInternal> {
+        let Ok(path) = find_file(shell, shell.current_dir(), CONFIG_NAME) else {
+            bail!("Chain config not found")
+        };
+
+        shell.change_dir(&path);
+
+        match ChainConfigInternal::read(shell, CONFIG_NAME) {
+            Ok(config) => Ok(config),
+            Err(err) => {
+                if let Ok(ecosystem) = EcosystemConfig::read(shell, CONFIG_NAME) {
+                    let chain = ecosystem.load_current_chain()?;
+                    Ok(chain.get_internal())
+                } else {
+                    Err(err)
+                }
+            }
+        }
+    }
 }
 
 impl FileConfigWithDefaultName for ChainConfigInternal {

zkstack_cli/crates/config/src/ecosystem.rs

@@ -22,6 +22,7 @@ use crate::{
         output::{ERC20Tokens, Erc20Token},
     },
     traits::{FileConfigWithDefaultName, ReadConfig, SaveConfig, ZkStackConfig},
+    utils::find_file,
     ChainConfig, ChainConfigInternal, ContractsConfig, WalletsConfig,
 };
 
@@ -103,7 +104,7 @@ impl EcosystemConfig {
         self.shell.get().expect("Must be initialized")
     }
 
-    pub fn from_file(shell: &Shell) -> Result<Self, EcosystemConfigFromFileError> {
+    pub(crate) fn from_file(shell: &Shell) -> Result<Self, EcosystemConfigFromFileError> {
         let Ok(path) = find_file(shell, shell.current_dir(), CONFIG_NAME) else {
             return Err(EcosystemConfigFromFileError::NotExists {
                 path: shell.current_dir(),
@@ -287,20 +288,6 @@ pub fn get_default_era_chain_id() -> L2ChainId {
     L2ChainId::from(ERA_CHAIN_ID)
 }
 
-// Find file in all parents repository and return necessary path or an empty error if nothing has been found
-fn find_file(shell: &Shell, path_buf: PathBuf, file_name: &str) -> Result<PathBuf, ()> {
-    let _dir = shell.push_dir(path_buf);
-    if shell.path_exists(file_name) {
-        Ok(shell.current_dir())
-    } else {
-        let current_dir = shell.current_dir();
-        let Some(path) = current_dir.parent() else {
-            return Err(());
-        };
-        find_file(shell, path.to_path_buf(), file_name)
-    }
-}
-
 pub fn get_link_to_prover(config: &EcosystemConfig) -> PathBuf {
     let link_to_code = config.link_to_code.clone();
     let mut link_to_prover = link_to_code.into_os_string();

zkstack_cli/crates/config/src/lib.rs

@@ -22,6 +22,7 @@ mod general;
 mod genesis;
 mod manipulations;
 mod secrets;
+mod utils;
 mod wallet_creation;
 mod wallets;
 
@@ -34,3 +35,4 @@ pub mod external_node;
 pub mod forge_interface;
 pub mod portal;
 pub mod traits;
+pub mod zkstack_config;

zkstack_cli/crates/config/src/utils.rs

@@ -0,0 +1,17 @@
+use std::path::PathBuf;
+
+use xshell::Shell;
+
+// Find file in all parents repository and return necessary path or an empty error if nothing has been found
+pub fn find_file(shell: &Shell, path_buf: PathBuf, file_name: &str) -> Result<PathBuf, ()> {
+    let _dir = shell.push_dir(path_buf);
+    if shell.path_exists(file_name) {
+        Ok(shell.current_dir())
+    } else {
+        let current_dir = shell.current_dir();
+        let Some(path) = current_dir.parent() else {
+            return Err(());
+        };
+        find_file(shell, path.to_path_buf(), file_name)
+    }
+}