feat: Provide easy prover setup

prover/docs/05_proving_batch.md

@@ -69,7 +69,14 @@ input file, called `witness_inputs_<batch>.bin` generated by different core comp
 - If you want to prove the batch produced by zkSync, you can get the data from the `ExternalProofIntegrationAPI` using
   `{address}/proof_generation_data` endpoint. You need to replace `{address}` with the address of the API and provide
   the batch number as a query data to get the data for specific batch, otherwise, you will receive latest data for the
-  batch, that was already proven.
+  batch, that was already proven. Example:
+  ```shell
+    curl -H "Content-Type: application/json" -X POST {address}/proof_generation_data -d 'null'
+  ```
+  or
+  ```shell
+    curl -H "Content-Type: application/json" -X POST {address}/proof_generation_data -d '1000'
+  ```
 
 ### Preparing database
 
@@ -80,12 +87,19 @@ the protocol version it should use. You can do that with running
 zk_inception prover protocol-version
 ```
 
+Example output:
+
+```shell
+Current protocol version found in zksync-era: 0.24.2, snark_wrapper: "0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2"
+```
+
 This command will provide you with the information about the semantic protocol version(you need to know only minor and
-patch versions) and snark wrapper value.
+patch versions) and snark wrapper value. In the example, `MINOR_VERSION` is 24, `PATCH_VERSION` is 2, and
+`SNARK_WRAPPER` is `0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2`.
 
 Now, with the use of `prover_cli` tool, you can insert the data about the batch and protocol version into the database:
 
-First, get the database URL(you can find it in `<ecosystem_dir>/chains/configs/<chain_name>/secrets.yaml` - it is the
+First, get the database URL(you can find it in `<ecosystem_dir>/chains/<chain_name>/configs/secrets.yaml` - it is the
 `prover_url` value) Now, insert the information about protocol version in the database:
 
 ```shell

zk_toolbox/crates/zk_inception/src/commands/prover/mod.rs

@@ -7,7 +7,6 @@ mod gcs;
 mod generate_sk;
 mod init;
 mod init_bellman_cuda;
-mod protocol_version;
 mod run;
 mod utils;
 
@@ -23,7 +22,6 @@ pub enum ProverCommands {
     /// Initialize bellman-cuda
     #[command(alias = "cuda")]
     InitBellmanCuda(Box<InitBellmanCudaArgs>),
-    ProtocolVersion,
 }
 
 pub(crate) async fn run(shell: &Shell, args: ProverCommands) -> anyhow::Result<()> {
@@ -32,6 +30,5 @@ pub(crate) async fn run(shell: &Shell, args: ProverCommands) -> anyhow::Result<(
         ProverCommands::GenerateSK => generate_sk::run(shell).await,
         ProverCommands::Run(args) => run::run(args, shell).await,
         ProverCommands::InitBellmanCuda(args) => init_bellman_cuda::run(shell, *args).await,
-        ProverCommands::ProtocolVersion => protocol_version::run(shell).await,
     }
 }

zk_toolbox/crates/zk_supervisor/Cargo.toml

@@ -23,3 +23,4 @@ xshell.workspace = true
 serde.workspace = true
 clap-markdown.workspace = true
 futures.workspace = true
+serde_json.workspace = true

zk_toolbox/crates/zk_supervisor/src/commands/mod.rs

@@ -3,5 +3,6 @@ pub mod database;
 pub mod fmt;
 pub mod lint;
 pub(crate) mod lint_utils;
+pub mod protocol_version;
 pub mod snapshot;
 pub mod test;

zk_toolbox/crates/zk_inception/src/commands/prover/protocol_version.rs → zk_toolbox/crates/zk_supervisor/src/commands/protocol_version.rs

@@ -6,9 +6,10 @@ use xshell::{cmd, Shell};
 
 pub async fn run(shell: &Shell) -> anyhow::Result<()> {
     let link_to_code = EcosystemConfig::from_file(shell)?.link_to_code;
+    let link_to_prover = link_to_code.join("prover");
 
-    let protocol_version = get_protocol_version(shell, &link_to_code).await?;
-    let snark_wrapper = get_snark_wrapper(&link_to_code).await?;
+    let protocol_version = get_protocol_version(shell, &link_to_prover).await?;
+    let snark_wrapper = get_snark_wrapper(&link_to_prover).await?;
 
     logger::info(format!(
         "Current protocol version found in zksync-era: {}, snark_wrapper: {}",
@@ -18,20 +19,16 @@ pub async fn run(shell: &Shell) -> anyhow::Result<()> {
     Ok(())
 }
 
-async fn get_protocol_version(shell: &Shell, link_to_code: &Path) -> anyhow::Result<String> {
-    let path = link_to_code.join("prover/crates/bin/prover_version/Cargo.toml");
-    let protocol_version = cmd!(
-        shell,
-        "cargo +nightly-2024-08-01 run --manifest-path {path}"
-    )
-    .read()?;
+async fn get_protocol_version(shell: &Shell, link_to_prover: &Path) -> anyhow::Result<String> {
+    shell.change_dir(link_to_prover);
+    let protocol_version = cmd!(shell, "cargo run --release --bin prover_version").read()?;
 
     Ok(protocol_version)
 }
 
-async fn get_snark_wrapper(link_to_code: &Path) -> anyhow::Result<String> {
-    let path = link_to_code
-        .join("prover/crates/bin/vk_setup_data_generator_server_fri/data/commitments.json");
+async fn get_snark_wrapper(link_to_prover: &Path) -> anyhow::Result<String> {
+    let path =
+        link_to_prover.join("crates/bin/vk_setup_data_generator_server_fri/data/commitments.json");
     let file = fs::File::open(path).expect("Could not find commitments file in zksync-era");
     let json: serde_json::Value =
         serde_json::from_reader(file).expect("Could not parse commitments.json");

zk_toolbox/crates/zk_supervisor/src/main.rs

@@ -10,9 +10,9 @@ use common::{
 };
 use config::EcosystemConfig;
 use messages::{
-    msg_global_chain_does_not_exist, MSG_SUBCOMMAND_CLEAN, MSG_SUBCOMMAND_DATABASE_ABOUT,
-    MSG_SUBCOMMAND_FMT_ABOUT, MSG_SUBCOMMAND_LINT_ABOUT, MSG_SUBCOMMAND_SNAPSHOTS_CREATOR_ABOUT,
-    MSG_SUBCOMMAND_TESTS_ABOUT,
+    msg_global_chain_does_not_exist, MSG_PROTOCOL_VERSION_ABOUT, MSG_SUBCOMMAND_CLEAN,
+    MSG_SUBCOMMAND_DATABASE_ABOUT, MSG_SUBCOMMAND_FMT_ABOUT, MSG_SUBCOMMAND_LINT_ABOUT,
+    MSG_SUBCOMMAND_SNAPSHOTS_CREATOR_ABOUT, MSG_SUBCOMMAND_TESTS_ABOUT,
 };
 use xshell::Shell;
 
@@ -47,6 +47,8 @@ enum SupervisorSubcommands {
     Fmt(FmtArgs),
     #[command(hide = true)]
     Markdown,
+    #[command(about = MSG_PROTOCOL_VERSION_ABOUT)]
+    ProtocolVersion,
 }
 
 #[derive(Parser, Debug)]
@@ -103,6 +105,7 @@ async fn run_subcommand(args: Supervisor, shell: &Shell) -> anyhow::Result<()> {
         }
         SupervisorSubcommands::Lint(args) => commands::lint::run(shell, args)?,
         SupervisorSubcommands::Fmt(args) => commands::fmt::run(shell.clone(), args).await?,
+        SupervisorSubcommands::ProtocolVersion => commands::protocol_version::run(shell).await?,
     }
     Ok(())
 }

zk_toolbox/crates/zk_supervisor/src/messages.rs

@@ -8,6 +8,7 @@ pub(super) fn msg_global_chain_does_not_exist(chain: &str, available_chains: &st
 }
 
 // Subcommands help
+pub(super) const MSG_PROTOCOL_VERSION_ABOUT: &str = "Protocol version used by provers";
 pub(super) const MSG_SUBCOMMAND_DATABASE_ABOUT: &str = "Database related commands";
 pub(super) const MSG_SUBCOMMAND_TESTS_ABOUT: &str = "Run tests";
 pub(super) const MSG_SUBCOMMAND_CLEAN: &str = "Clean artifacts";