From 17e564c6f7914cc6c4304626592fd81f611ac83c Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Mon, 8 Apr 2024 13:42:13 -0300 Subject: [PATCH 1/7] fmt --- prover/prover_cli/Cargo.toml | 17 ++++++++++++++++ prover/prover_cli/src/cli.rs | 26 ++++++++++++++++++++++++ prover/prover_cli/src/commands/mod.rs | 1 + prover/prover_cli/src/commands/status.rs | 4 ++++ prover/prover_cli/src/lib.rs | 2 ++ prover/prover_cli/src/main.rs | 10 +++++++++ 6 files changed, 60 insertions(+) create mode 100644 prover/prover_cli/Cargo.toml create mode 100644 prover/prover_cli/src/cli.rs create mode 100644 prover/prover_cli/src/commands/mod.rs create mode 100644 prover/prover_cli/src/commands/status.rs create mode 100644 prover/prover_cli/src/lib.rs create mode 100644 prover/prover_cli/src/main.rs diff --git a/prover/prover_cli/Cargo.toml b/prover/prover_cli/Cargo.toml new file mode 100644 index 00000000000..7effe24198a --- /dev/null +++ b/prover/prover_cli/Cargo.toml @@ -0,0 +1,17 @@ +[package] +name = "prover_cli" +version.workspace = true +edition.workspace = true +authors.workspace = true +homepage.workspace = true +repository.workspace = true +license.workspace = true +keywords.workspace = true +categories.workspace = true + +[dependencies] +tokio = { version = "1", features = ["rt-multi-thread", "macros"] } +env_logger = "0.10" +log = "0.4" +clap = { version = "4.3", features = ["derive"] } +eyre = "0.6" diff --git a/prover/prover_cli/src/cli.rs b/prover/prover_cli/src/cli.rs new file mode 100644 index 00000000000..6d09f3b0171 --- /dev/null +++ b/prover/prover_cli/src/cli.rs @@ -0,0 +1,26 @@ +use crate::commands::status; + +use clap::{command, Parser, Subcommand}; + +pub const VERSION_STRING: &str = env!("CARGO_PKG_VERSION"); + +#[derive(Parser)] +#[command(name="prover-cli", version=VERSION_STRING, about, long_about = None)] +struct ProverCLI { + #[command(subcommand)] + command: ProverCommand, +} + +#[derive(Subcommand)] +enum ProverCommand { + Status, +} + +pub async fn start() -> eyre::Result<()> { + let ProverCLI { command } = ProverCLI::parse(); + match command { + ProverCommand::Status => status::run().await?, + }; + + Ok(()) +} diff --git a/prover/prover_cli/src/commands/mod.rs b/prover/prover_cli/src/commands/mod.rs new file mode 100644 index 00000000000..3d7dcd73986 --- /dev/null +++ b/prover/prover_cli/src/commands/mod.rs @@ -0,0 +1 @@ +pub(crate) mod status; diff --git a/prover/prover_cli/src/commands/status.rs b/prover/prover_cli/src/commands/status.rs new file mode 100644 index 00000000000..5edf73beb81 --- /dev/null +++ b/prover/prover_cli/src/commands/status.rs @@ -0,0 +1,4 @@ +pub(crate) async fn run() -> eyre::Result<()> { + log::info!("Prover Status"); + Ok(()) +} diff --git a/prover/prover_cli/src/lib.rs b/prover/prover_cli/src/lib.rs new file mode 100644 index 00000000000..3ef8b313f0c --- /dev/null +++ b/prover/prover_cli/src/lib.rs @@ -0,0 +1,2 @@ +pub mod cli; +mod commands; diff --git a/prover/prover_cli/src/main.rs b/prover/prover_cli/src/main.rs new file mode 100644 index 00000000000..f2a7dd71026 --- /dev/null +++ b/prover/prover_cli/src/main.rs @@ -0,0 +1,10 @@ +use prover_cli::cli; + +#[tokio::main] +async fn main() { + env_logger::builder() + .filter_level(log::LevelFilter::Debug) + .init(); + + cli::start().await.unwrap(); +} From 245b0a4e75ddd1c6a968b07152cfcfffe70cc2c0 Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Mon, 8 Apr 2024 16:09:36 -0300 Subject: [PATCH 2/7] wip --- prover/prover_cli/Cargo.toml | 20 +++++++++++++++ prover/prover_cli/src/cli.rs | 6 +++-- .../src/commands/get_proof_progress.rs | 25 +++++++++++++++++++ prover/prover_cli/src/commands/mod.rs | 1 + 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 prover/prover_cli/src/commands/get_proof_progress.rs diff --git a/prover/prover_cli/Cargo.toml b/prover/prover_cli/Cargo.toml index 7effe24198a..ae0dddd885d 100644 --- a/prover/prover_cli/Cargo.toml +++ b/prover/prover_cli/Cargo.toml @@ -15,3 +15,23 @@ env_logger = "0.10" log = "0.4" clap = { version = "4.3", features = ["derive"] } eyre = "0.6" + +anyhow.workspace = true +zksync_config.workspace = true +zksync_env_config.workspace = true +zksync_db_connection.workspace = true +zksync_basic_types.workspace = true +zksync_types.workspace = true +prover_dal.workspace = true +sqlx = { workspace = true, features = [ + "runtime-tokio", + "tls-native-tls", + "macros", + "postgres", + "bigdecimal", + "rust_decimal", + "chrono", + "json", + "migrate", + "ipnetwork", +] } diff --git a/prover/prover_cli/src/cli.rs b/prover/prover_cli/src/cli.rs index 6d09f3b0171..ed1c083a4ca 100644 --- a/prover/prover_cli/src/cli.rs +++ b/prover/prover_cli/src/cli.rs @@ -1,7 +1,7 @@ -use crate::commands::status; - use clap::{command, Parser, Subcommand}; +use crate::commands::{get_proof_progress, status}; + pub const VERSION_STRING: &str = env!("CARGO_PKG_VERSION"); #[derive(Parser)] @@ -14,12 +14,14 @@ struct ProverCLI { #[derive(Subcommand)] enum ProverCommand { Status, + GetProofProgress, } pub async fn start() -> eyre::Result<()> { let ProverCLI { command } = ProverCLI::parse(); match command { ProverCommand::Status => status::run().await?, + ProverCommand::GetProofProgress => get_proof_progress::run().await?, }; Ok(()) diff --git a/prover/prover_cli/src/commands/get_proof_progress.rs b/prover/prover_cli/src/commands/get_proof_progress.rs new file mode 100644 index 00000000000..2f5f6ecf814 --- /dev/null +++ b/prover/prover_cli/src/commands/get_proof_progress.rs @@ -0,0 +1,25 @@ +use anyhow::Context as _; +use prover_dal::{ConnectionPool, Prover, ProverDal}; +use tokio::{ + sync::{oneshot, watch::Receiver}, + task::JoinHandle, +}; +use zksync_config::configs::{ + fri_prover_group::FriProverGroupConfig, FriProverConfig, ObservabilityConfig, PostgresConfig, +}; +use zksync_env_config::{ + object_store::{ProverObjectStoreConfig, PublicObjectStoreConfig}, + FromEnv, +}; + +pub(crate) async fn run() -> eyre::Result<()> { + log::info!("Proof Progress"); + + let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?; + let pool = ConnectionPool::singleton(postgres_config.prover_url()?) + .build() + .await + .context("failed to build a connection pool")?; + + Ok(()) +} diff --git a/prover/prover_cli/src/commands/mod.rs b/prover/prover_cli/src/commands/mod.rs index 3d7dcd73986..b36d7c3d75e 100644 --- a/prover/prover_cli/src/commands/mod.rs +++ b/prover/prover_cli/src/commands/mod.rs @@ -1 +1,2 @@ +pub(crate) mod get_proof_progress; pub(crate) mod status; From 8e84243ea40be2e1b4c523413fff32d9575e86d3 Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Mon, 8 Apr 2024 16:12:37 -0300 Subject: [PATCH 3/7] add cargo.toml cargo.lock --- prover/Cargo.lock | 50 +++++++++++++++++++++++++++++++++++++++++++++++ prover/Cargo.toml | 1 + 2 files changed, 51 insertions(+) diff --git a/prover/Cargo.lock b/prover/Cargo.lock index a0d1b1dcb84..b9e7119a6c2 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -1755,7 +1755,11 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ + "humantime", + "is-terminal", "log", + "regex", + "termcolor", ] [[package]] @@ -1866,6 +1870,16 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "eyre" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "fastrand" version = "2.0.1" @@ -2712,6 +2726,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "indenter" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + [[package]] name = "indexmap" version = "1.9.3" @@ -2747,6 +2767,17 @@ dependencies = [ "serde", ] +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.6", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -4314,6 +4345,25 @@ dependencies = [ "thiserror", ] +[[package]] +name = "prover_cli" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap 4.4.6", + "env_logger 0.10.2", + "eyre", + "log", + "prover_dal", + "sqlx", + "tokio", + "zksync_basic_types", + "zksync_config", + "zksync_db_connection", + "zksync_env_config", + "zksync_types", +] + [[package]] name = "prover_dal" version = "0.1.0" diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 2e9ee65ce7a..7f33fa4a18c 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -13,6 +13,7 @@ members = [ "prover_fri_gateway", "proof_fri_compressor", "tools", + "prover_cli", ] resolver = "2" From 17517b144741b5e7bb05dc105c8cedc55b3d9a32 Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Mon, 8 Apr 2024 17:36:57 -0300 Subject: [PATCH 4/7] go back to anihow --- prover/prover_cli/src/cli.rs | 2 +- .../src/commands/get_proof_progress.rs | 36 +++++++++++-------- prover/prover_cli/src/commands/status.rs | 2 +- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/prover/prover_cli/src/cli.rs b/prover/prover_cli/src/cli.rs index ed1c083a4ca..0b0d87f1c9d 100644 --- a/prover/prover_cli/src/cli.rs +++ b/prover/prover_cli/src/cli.rs @@ -17,7 +17,7 @@ enum ProverCommand { GetProofProgress, } -pub async fn start() -> eyre::Result<()> { +pub async fn start() -> anyhow::Result<()> { let ProverCLI { command } = ProverCLI::parse(); match command { ProverCommand::Status => status::run().await?, diff --git a/prover/prover_cli/src/commands/get_proof_progress.rs b/prover/prover_cli/src/commands/get_proof_progress.rs index 2f5f6ecf814..c4ff753afec 100644 --- a/prover/prover_cli/src/commands/get_proof_progress.rs +++ b/prover/prover_cli/src/commands/get_proof_progress.rs @@ -1,25 +1,33 @@ use anyhow::Context as _; -use prover_dal::{ConnectionPool, Prover, ProverDal}; -use tokio::{ - sync::{oneshot, watch::Receiver}, - task::JoinHandle, -}; -use zksync_config::configs::{ - fri_prover_group::FriProverGroupConfig, FriProverConfig, ObservabilityConfig, PostgresConfig, -}; -use zksync_env_config::{ - object_store::{ProverObjectStoreConfig, PublicObjectStoreConfig}, - FromEnv, -}; +use zksync_config::PostgresConfig; +use zksync_db_connection::connection_pool::ConnectionPool; +use zksync_env_config::FromEnv; +use prover_dal::Prover; -pub(crate) async fn run() -> eyre::Result<()> { +pub(crate) async fn run() -> anyhow::Result<()> { log::info!("Proof Progress"); let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?; - let pool = ConnectionPool::singleton(postgres_config.prover_url()?) + + println!("{:?}", postgres_config); + + let pool = ConnectionPool::::singleton(postgres_config.prover_url()?) .build() .await .context("failed to build a connection pool")?; + // let asd = sqlx::query_as!( + // StorageL1BatchHeader, + // r#" + // SELECT + // id + // FROM + // prover_jobs_fri + // "#, + // ) + // .fetch_all(pool) + // .await?; + Ok(()) } + diff --git a/prover/prover_cli/src/commands/status.rs b/prover/prover_cli/src/commands/status.rs index 5edf73beb81..5d0b9b08526 100644 --- a/prover/prover_cli/src/commands/status.rs +++ b/prover/prover_cli/src/commands/status.rs @@ -1,4 +1,4 @@ -pub(crate) async fn run() -> eyre::Result<()> { +pub(crate) async fn run() -> anyhow::Result<()> { log::info!("Prover Status"); Ok(()) } From 4ab7ce87d6757d72e5eaed78da62946f0b3b7083 Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Mon, 8 Apr 2024 17:37:13 -0300 Subject: [PATCH 5/7] fmt --- prover/prover_cli/src/commands/get_proof_progress.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/prover/prover_cli/src/commands/get_proof_progress.rs b/prover/prover_cli/src/commands/get_proof_progress.rs index c4ff753afec..9328c355dde 100644 --- a/prover/prover_cli/src/commands/get_proof_progress.rs +++ b/prover/prover_cli/src/commands/get_proof_progress.rs @@ -1,8 +1,8 @@ use anyhow::Context as _; +use prover_dal::Prover; use zksync_config::PostgresConfig; use zksync_db_connection::connection_pool::ConnectionPool; use zksync_env_config::FromEnv; -use prover_dal::Prover; pub(crate) async fn run() -> anyhow::Result<()> { log::info!("Proof Progress"); @@ -30,4 +30,3 @@ pub(crate) async fn run() -> anyhow::Result<()> { Ok(()) } - From 46552017c1a736ec85ac812b1ff1bac75b4346d1 Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Tue, 9 Apr 2024 13:50:12 -0300 Subject: [PATCH 6/7] rm tool workspace --- prover/Cargo.lock | 7 +++ prover/Cargo.toml | 1 - prover/prover_cli/Cargo.toml | 9 +++- prover/{tools => prover_cli}/README.md | 4 +- prover/prover_cli/src/cli.rs | 8 ++-- .../src/commands/get_file_info.rs} | 47 ++++--------------- .../src/commands/get_proof_progress.rs | 32 ------------- prover/prover_cli/src/commands/mod.rs | 3 +- prover/prover_cli/src/commands/status.rs | 4 -- prover/tools/Cargo.toml | 20 -------- 10 files changed, 31 insertions(+), 104 deletions(-) rename prover/{tools => prover_cli}/README.md (93%) rename prover/{tools/src/main.rs => prover_cli/src/commands/get_file_info.rs} (90%) delete mode 100644 prover/prover_cli/src/commands/get_proof_progress.rs delete mode 100644 prover/prover_cli/src/commands/status.rs delete mode 100644 prover/tools/Cargo.toml diff --git a/prover/Cargo.lock b/prover/Cargo.lock index b9e7119a6c2..40a9ad15394 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -4350,17 +4350,24 @@ name = "prover_cli" version = "0.1.0" dependencies = [ "anyhow", + "bincode", "clap 4.4.6", + "colored", "env_logger 0.10.2", "eyre", + "hex", "log", "prover_dal", "sqlx", "tokio", + "tracing", + "tracing-subscriber", "zksync_basic_types", "zksync_config", "zksync_db_connection", "zksync_env_config", + "zksync_prover_fri_types", + "zksync_prover_interface", "zksync_types", ] diff --git a/prover/Cargo.toml b/prover/Cargo.toml index 7f33fa4a18c..bd2b25bd342 100644 --- a/prover/Cargo.toml +++ b/prover/Cargo.toml @@ -12,7 +12,6 @@ members = [ "witness_vector_generator", "prover_fri_gateway", "proof_fri_compressor", - "tools", "prover_cli", ] diff --git a/prover/prover_cli/Cargo.toml b/prover/prover_cli/Cargo.toml index ae0dddd885d..3952b12bd36 100644 --- a/prover/prover_cli/Cargo.toml +++ b/prover/prover_cli/Cargo.toml @@ -13,15 +13,22 @@ categories.workspace = true tokio = { version = "1", features = ["rt-multi-thread", "macros"] } env_logger = "0.10" log = "0.4" -clap = { version = "4.3", features = ["derive"] } eyre = "0.6" +clap = { workspace = true, features = ["derive"] } +tracing.workspace = true +tracing-subscriber = { workspace = true, features = ["env-filter"] } +bincode.workspace = true +colored.workspace = true +hex.workspace = true anyhow.workspace = true zksync_config.workspace = true zksync_env_config.workspace = true zksync_db_connection.workspace = true zksync_basic_types.workspace = true zksync_types.workspace = true +zksync_prover_fri_types.workspace = true +zksync_prover_interface.workspace = true prover_dal.workspace = true sqlx = { workspace = true, features = [ "runtime-tokio", diff --git a/prover/tools/README.md b/prover/prover_cli/README.md similarity index 93% rename from prover/tools/README.md rename to prover/prover_cli/README.md index 35778faa687..25bbe95fc4d 100644 --- a/prover/tools/README.md +++ b/prover/prover_cli/README.md @@ -1,9 +1,9 @@ -# Tool to better understand and debug provers +# CLI to better understand and debug provers For now, it has only one command 'file-info' ``` -cargo run --release file-info /zksync-era/prover/artifacts/proofs_fri/l1_batch_proof_1.bin +cargo run -- file-info --file-path /zksync-era/prover/artifacts/proofs_fri/l1_batch_proof_1.bin ``` Example outputs: diff --git a/prover/prover_cli/src/cli.rs b/prover/prover_cli/src/cli.rs index 0b0d87f1c9d..844387f983e 100644 --- a/prover/prover_cli/src/cli.rs +++ b/prover/prover_cli/src/cli.rs @@ -1,6 +1,6 @@ use clap::{command, Parser, Subcommand}; -use crate::commands::{get_proof_progress, status}; +use crate::commands::get_file_info; pub const VERSION_STRING: &str = env!("CARGO_PKG_VERSION"); @@ -13,15 +13,13 @@ struct ProverCLI { #[derive(Subcommand)] enum ProverCommand { - Status, - GetProofProgress, + FileInfo(get_file_info::Args), } pub async fn start() -> anyhow::Result<()> { let ProverCLI { command } = ProverCLI::parse(); match command { - ProverCommand::Status => status::run().await?, - ProverCommand::GetProofProgress => get_proof_progress::run().await?, + ProverCommand::FileInfo(args) => get_file_info::run(args).await?, }; Ok(()) diff --git a/prover/tools/src/main.rs b/prover/prover_cli/src/commands/get_file_info.rs similarity index 90% rename from prover/tools/src/main.rs rename to prover/prover_cli/src/commands/get_file_info.rs index f7df2147fac..ff32f56a22c 100644 --- a/prover/tools/src/main.rs +++ b/prover/prover_cli/src/commands/get_file_info.rs @@ -1,8 +1,7 @@ use std::fs; -use clap::{Parser, Subcommand}; +use clap::Args as ClapArgs; use colored::Colorize; -use tracing::level_filters::LevelFilter; use zksync_prover_fri_types::{ circuit_definitions::{ boojum::{ @@ -18,23 +17,10 @@ use zksync_prover_fri_types::{ }; use zksync_prover_interface::outputs::L1BatchProofForL1; -#[derive(Debug, Parser)] -#[command( - author = "Matter Labs", - version, - about = "Debugging tools for prover related things", - long_about = None -)] - -struct Cli { - #[command(subcommand)] - command: Command, -} - -#[derive(Debug, Subcommand)] -enum Command { - #[command(name = "file-info")] - FileInfo { file_path: String }, +#[derive(ClapArgs)] +pub(crate) struct Args { + #[clap(short, long)] + file_path: String, } fn pretty_print_size_hint(size_hint: (Option, Option)) { @@ -204,7 +190,8 @@ fn pretty_print_l1_proof(result: &L1BatchProofForL1) { println!(" This proof will pass on L1, if L1 executor computes the block commitment that is matching exactly the Inputs value above"); } -fn file_info(path: String) { +pub(crate) async fn run(args: Args) -> anyhow::Result<()> { + let path = args.file_path; println!("Reading file {} and guessing the type.", path.bold()); let bytes = fs::read(path).unwrap(); @@ -214,14 +201,14 @@ fn file_info(path: String) { if let Some(circuit) = maybe_circuit { println!(" Parsing file as CircuitWrapper."); pretty_print_circuit_wrapper(&circuit); - return; + return Ok(()); } println!(" NOT a CircuitWrapper."); let maybe_fri_proof: Option = bincode::deserialize(&bytes).ok(); if let Some(fri_proof) = maybe_fri_proof { println!(" Parsing file as FriProofWrapper."); pretty_print_proof(&fri_proof); - return; + return Ok(()); } println!(" NOT a FriProofWrapper."); @@ -232,19 +219,5 @@ fn file_info(path: String) { } else { println!(" NOT a L1BatchProof."); } -} - -fn main() { - tracing_subscriber::fmt() - .with_env_filter( - tracing_subscriber::EnvFilter::builder() - .with_default_directive(LevelFilter::INFO.into()) - .from_env_lossy(), - ) - .init(); - - let opt = Cli::parse(); - match opt.command { - Command::FileInfo { file_path } => file_info(file_path), - } + Ok(()) } diff --git a/prover/prover_cli/src/commands/get_proof_progress.rs b/prover/prover_cli/src/commands/get_proof_progress.rs deleted file mode 100644 index 9328c355dde..00000000000 --- a/prover/prover_cli/src/commands/get_proof_progress.rs +++ /dev/null @@ -1,32 +0,0 @@ -use anyhow::Context as _; -use prover_dal::Prover; -use zksync_config::PostgresConfig; -use zksync_db_connection::connection_pool::ConnectionPool; -use zksync_env_config::FromEnv; - -pub(crate) async fn run() -> anyhow::Result<()> { - log::info!("Proof Progress"); - - let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?; - - println!("{:?}", postgres_config); - - let pool = ConnectionPool::::singleton(postgres_config.prover_url()?) - .build() - .await - .context("failed to build a connection pool")?; - - // let asd = sqlx::query_as!( - // StorageL1BatchHeader, - // r#" - // SELECT - // id - // FROM - // prover_jobs_fri - // "#, - // ) - // .fetch_all(pool) - // .await?; - - Ok(()) -} diff --git a/prover/prover_cli/src/commands/mod.rs b/prover/prover_cli/src/commands/mod.rs index b36d7c3d75e..3e9a45cb72a 100644 --- a/prover/prover_cli/src/commands/mod.rs +++ b/prover/prover_cli/src/commands/mod.rs @@ -1,2 +1 @@ -pub(crate) mod get_proof_progress; -pub(crate) mod status; +pub(crate) mod get_file_info; diff --git a/prover/prover_cli/src/commands/status.rs b/prover/prover_cli/src/commands/status.rs deleted file mode 100644 index 5d0b9b08526..00000000000 --- a/prover/prover_cli/src/commands/status.rs +++ /dev/null @@ -1,4 +0,0 @@ -pub(crate) async fn run() -> anyhow::Result<()> { - log::info!("Prover Status"); - Ok(()) -} diff --git a/prover/tools/Cargo.toml b/prover/tools/Cargo.toml deleted file mode 100644 index 66df1e99db4..00000000000 --- a/prover/tools/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "tools" -version.workspace = true -edition.workspace = true -authors.workspace = true -homepage.workspace = true -repository.workspace = true -license.workspace = true -keywords.workspace = true -categories.workspace = true - -[dependencies] -clap = { workspace = true, features = ["derive"] } -tracing.workspace = true -tracing-subscriber = { workspace = true, features = ["env-filter"] } -zksync_prover_fri_types.workspace = true -bincode.workspace = true -colored.workspace = true -zksync_prover_interface.workspace = true -hex.workspace = true \ No newline at end of file From 8fb991ae11ced0703fc98dd8061c6436e588750b Mon Sep 17 00:00:00 2001 From: Joaquin Carletti Date: Tue, 9 Apr 2024 19:02:44 -0300 Subject: [PATCH 7/7] remove sqlx --- prover/Cargo.lock | 32 -------------------------------- prover/prover_cli/Cargo.toml | 14 +------------- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/prover/Cargo.lock b/prover/Cargo.lock index 40a9ad15394..c17d1d7ffea 100644 --- a/prover/Cargo.lock +++ b/prover/Cargo.lock @@ -1870,16 +1870,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "eyre" -version = "0.6.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec" -dependencies = [ - "indenter", - "once_cell", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -2726,12 +2716,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "indenter" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" - [[package]] name = "indexmap" version = "1.9.3" @@ -4354,11 +4338,9 @@ dependencies = [ "clap 4.4.6", "colored", "env_logger 0.10.2", - "eyre", "hex", "log", "prover_dal", - "sqlx", "tokio", "tracing", "tracing-subscriber", @@ -6302,20 +6284,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tools" -version = "0.1.0" -dependencies = [ - "bincode", - "clap 4.4.6", - "colored", - "hex", - "tracing", - "tracing-subscriber", - "zksync_prover_fri_types", - "zksync_prover_interface", -] - [[package]] name = "tower" version = "0.4.13" diff --git a/prover/prover_cli/Cargo.toml b/prover/prover_cli/Cargo.toml index 3952b12bd36..994a8f93a84 100644 --- a/prover/prover_cli/Cargo.toml +++ b/prover/prover_cli/Cargo.toml @@ -13,7 +13,6 @@ categories.workspace = true tokio = { version = "1", features = ["rt-multi-thread", "macros"] } env_logger = "0.10" log = "0.4" -eyre = "0.6" clap = { workspace = true, features = ["derive"] } tracing.workspace = true @@ -30,15 +29,4 @@ zksync_types.workspace = true zksync_prover_fri_types.workspace = true zksync_prover_interface.workspace = true prover_dal.workspace = true -sqlx = { workspace = true, features = [ - "runtime-tokio", - "tls-native-tls", - "macros", - "postgres", - "bigdecimal", - "rust_decimal", - "chrono", - "json", - "migrate", - "ipnetwork", -] } +