refactor(prover): Switch prover workspace to workspace deps (matter-l…

…abs#1490)

## What ❔

Prover follow-up to matter-labs#1485

## Why ❔

Same reasons

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [ ] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [ ] Code has been formatted via `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.
- [ ] Linkcheck has been run via `zk linkcheck`.

prover/Cargo.toml

@@ -17,6 +17,75 @@ members = [
 
 resolver = "2"
 
+[workspace.package]
+version = "0.1.0"
+edition = "2021"
+authors = ["The Matter Labs Team <[email protected]>"]
+homepage = "https://zksync.io/"
+repository = "https://github.com/matter-labs/zksync-era"
+license = "MIT OR Apache-2.0"
+keywords = ["blockchain", "zksync"]
+categories = ["cryptography"]
+
+[workspace.dependencies]
+anyhow = "1.0"
+async-trait = "0.1"
+bincode = "1"
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2"}
+circuit_sequencer_api = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
+clap = "4.4.6"
+colored = "2.0"
+const-decoder = "0.3.0"
+ctrlc = "3.1"
+futures = "0.3"
+hex = "0.4"
+itertools = "0.10.5"
+jemallocator = "0.5"
+local-ip-address = "0.5.0"
+log = "0.4.20"
+md5 = "0.7.0"
+multivm = { path = "../core/lib/multivm", version = "0.1.0" }
+once_cell = "1.18"
+prometheus_exporter = { path = "../core/lib/prometheus_exporter" }
+proptest = "1.2.0"
+prover_dal = { path = "prover_dal" }
+queues = "1.1.0"
+rand = "0.8"
+regex = "1.7.2"
+reqwest = "0.11"
+serde = "1.0"
+serde_derive = "1.0"
+serde_json = "1.0"
+sha3 = "0.10.8"
+shivini = { git = "https://github.com/matter-labs/era-shivini.git", branch = "v1.4.2" }
+sqlx = { version = "0.7.3", default-features = false }
+structopt = "0.3.26"
+strum = { version = "0.24" }
+tempfile = "3"
+tokio = "1"
+toml_edit = "0.14.4"
+tracing = "0.1"
+tracing-subscriber = { version = "0.3" }
+vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
+vk_setup_data_generator_server_fri = { path = "vk_setup_data_generator_server_fri" }
+vlog = { path = "../core/lib/vlog" }
+zk_evm = { git = "https://github.com/matter-labs/era-zk_evm.git", branch = "v1.4.1" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
+zkevm_test_harness_1_3_3 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3", package = "zkevm_test_harness" }
+zksync_basic_types = { path = "../core/lib/basic_types" }
+zksync_config = { path = "../core/lib/config" }
+zksync_dal = { path = "../core/lib/dal" }
+zksync_db_connection = { path = "../core/lib/db_connection" }
+zksync_env_config = { path = "../core/lib/env_config" }
+zksync_object_store = { path = "../core/lib/object_store" }
+zksync_prover_fri_types = { path = "prover_fri_types" }
+zksync_prover_fri_utils = { path = "prover_fri_utils" }
+zksync_prover_interface = { path = "../core/lib/prover_interface" }
+zksync_queued_job_processor = { path = "../core/lib/queued_job_processor" }
+zksync_state = { path = "../core/lib/state" }
+zksync_system_constants = { path = "../core/lib/constants" }
+zksync_types = { path = "../core/lib/types" }
+zksync_utils = { path = "../core/lib/utils" }
 
 # for `perf` profiling
 [profile.perf]

prover/proof_fri_compressor/Cargo.toml

@@ -1,40 +1,42 @@
 [package]
 name = "zksync_proof_fri_compressor"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+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]
-vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
-
-zksync_types = { path = "../../core/lib/types" }
-prover_dal = { path = "../prover_dal" }
-zksync_config = { path = "../../core/lib/config" }
-zksync_env_config = { path = "../../core/lib/env_config" }
-zksync_object_store = { path = "../../core/lib/object_store" }
-zksync_prover_interface = { path = "../../core/lib/prover_interface" }
-zksync_utils = { path = "../../core/lib/utils" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter" }
-zksync_prover_fri_types = { path = "../prover_fri_types" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor" }
-vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri" }
-vlog = { path = "../../core/lib/vlog" }
-
-zkevm_test_harness_1_3_3 = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.3.3", package = "zkevm_test_harness" }
-circuit_sequencer_api = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
+vise.workspace = true
+zksync_types.workspace = true
+prover_dal.workspace = true
+zksync_config.workspace = true
+zksync_env_config.workspace = true
+zksync_object_store.workspace = true
+zksync_prover_interface.workspace = true
+zksync_utils.workspace = true
+prometheus_exporter.workspace = true
+zksync_prover_fri_types.workspace = true
+zksync_queued_job_processor.workspace = true
+vk_setup_data_generator_server_fri.workspace = true
+vlog.workspace = true
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
+zkevm_test_harness_1_3_3.workspace = true
+circuit_sequencer_api.workspace = true
+zkevm_test_harness.workspace = true
 
-anyhow = "1.0"
-tracing = "0.1"
-structopt = "0.3.26"
-tokio = { version = "1", features = ["time", "macros"] }
-futures = { version = "0.3", features = ["compat"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-async-trait = "0.1"
-bincode = "1.0"
-reqwest = { version = "0.11", features = ["blocking"] }
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
+anyhow.workspace = true
+tracing.workspace = true
+structopt.workspace = true
+tokio = { workspace = true, features = ["time", "macros"] }
+futures = { workspace = true, features = ["compat"] }
+ctrlc = { workspace = true, features = ["termination"] }
+async-trait.workspace = true
+bincode.workspace = true
+reqwest = { workspace = true, features = ["blocking"] }
+serde_json.workspace = true
+serde = { workspace = true, features = ["derive"] }
 

prover/prover_dal/Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "prover_dal"
-version = "0.1.0"
-edition = "2021"
-authors = ["The Matter Labs Team <[email protected]>"]
-homepage = "https://zksync.io/"
-repository = "https://github.com/matter-labs/zksync-era"
-license = "MIT OR Apache-2.0"
-keywords = ["blockchain", "zksync"]
-categories = ["cryptography"]
+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]
-zksync_db_connection = { path = "../../core/lib/db_connection" }
-zksync_basic_types = { path = "../../core/lib/basic_types" }
+zksync_db_connection.workspace = true
+zksync_basic_types.workspace = true
 
-strum = { version = "0.24", features = ["derive"] }
-sqlx = { version = "0.7.3", default-features = false, features = [
+strum = { workspace = true, features = ["derive"] }
+sqlx = { workspace = true, features = [
     "runtime-tokio",
     "tls-native-tls",
     "macros",

prover/prover_fri/Cargo.toml

@@ -1,45 +1,46 @@
 [package]
 name = "zksync_prover_fri"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+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]
-vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
-
-zksync_types = { path = "../../core/lib/types" }
-prover_dal = { path = "../prover_dal" }
-zksync_config = { path = "../../core/lib/config" }
-zksync_env_config = { path = "../../core/lib/env_config" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter" }
-vlog = { path = "../../core/lib/vlog" }
-zksync_object_store = { path = "../../core/lib/object_store" }
-zksync_queued_job_processor = { path = "../../core/lib/queued_job_processor" }
-zksync_prover_fri_utils = { path = "../prover_fri_utils" }
-zksync_prover_fri_types = { path = "../prover_fri_types" }
-zksync_utils = { path = "../../core/lib/utils" }
-vk_setup_data_generator_server_fri = { path = "../vk_setup_data_generator_server_fri" }
-shivini = { git = "https://github.com/matter-labs/era-shivini.git", branch = "v1.4.2", optional = true, features = [
+vise.workspace = true
+zksync_types.workspace = true
+prover_dal.workspace = true
+zksync_config.workspace = true
+zksync_env_config.workspace = true
+prometheus_exporter.workspace = true
+vlog.workspace = true
+zksync_object_store.workspace = true
+zksync_queued_job_processor.workspace = true
+zksync_prover_fri_utils.workspace = true
+zksync_prover_fri_types.workspace = true
+zksync_utils.workspace = true
+vk_setup_data_generator_server_fri.workspace = true
+shivini = { workspace = true, optional = true, features = [
     "circuit_definitions",
     "zksync",
 ] }
 
-zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2" }
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2", features = [
-    "log_tracing",
-] }
+zkevm_test_harness.workspace = true
+circuit_definitions = { workspace = true, features = [ "log_tracing" ] }
 
-anyhow = "1.0"
-tracing = "0.1"
-tokio = { version = "1", features = ["time", "macros"] }
-futures = { version = "0.3", features = ["compat"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-serde = { version = "1.0", features = ["derive"] }
-async-trait = "0.1"
-local-ip-address = "0.5.0"
-reqwest = { version = "0.11", features = ["blocking"] }
-regex = "1.7.2"
+anyhow.workspace = true
+tracing.workspace = true
+tokio = { workspace = true, features = ["time", "macros"] }
+futures = { workspace = true, features = ["compat"] }
+ctrlc = { workspace = true, features = ["termination"] }
+serde = { workspace = true, features = ["derive"] }
+async-trait.workspace = true
+local-ip-address.workspace = true
+reqwest = { workspace = true, features = ["blocking"] }
+regex.workspace = true
 
 [features]
 default = []

prover/prover_fri_gateway/Cargo.toml

@@ -1,27 +1,32 @@
 [package]
 name = "zksync_prover_fri_gateway"
-version = "0.1.0"
-edition = "2021"
+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]
-vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
+vise.workspace = true
+zksync_types.workspace = true
+prover_dal.workspace = true
+zksync_config.workspace = true
+zksync_env_config.workspace = true
+zksync_object_store.workspace = true
+zksync_prover_interface.workspace = true
+zksync_utils.workspace = true
+prometheus_exporter.workspace = true
+vlog.workspace = true
 
-zksync_types = { path = "../../core/lib/types" }
-prover_dal = { path = "../prover_dal" }
-zksync_config = { path = "../../core/lib/config" }
-zksync_env_config = { path = "../../core/lib/env_config" }
-zksync_object_store = { path = "../../core/lib/object_store" }
-zksync_prover_interface = { path = "../../core/lib/prover_interface" }
-zksync_utils = { path = "../../core/lib/utils" }
-prometheus_exporter = { path = "../../core/lib/prometheus_exporter" }
-vlog = { path = "../../core/lib/vlog" }
-
-anyhow = "1.0"
-tracing = "0.1"
-reqwest = { version = "0.11", features = ["blocking"] }
-tokio = { version = "1", features = ["time", "macros"] }
-ctrlc = { version = "3.1", features = ["termination"] }
-async-trait = "0.1"
-futures = { version = "0.3", features = ["compat"] }
-serde = { version = "1.0", features = ["derive"] }
-log = "0.4.20"
+anyhow.workspace = true
+tracing.workspace = true
+reqwest = { workspace = true, features = ["blocking"] }
+tokio = { workspace = true, features = ["time", "macros"] }
+ctrlc = { workspace = true, features = ["termination"] }
+async-trait.workspace = true
+futures = { workspace = true, features = ["compat"] }
+serde = { workspace = true, features = ["derive"] }
+log.workspace = true

prover/prover_fri_types/Cargo.toml

@@ -1,15 +1,17 @@
 [package]
 name = "zksync_prover_fri_types"
-version = "0.1.0"
-edition = "2021"
+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]
-zksync_object_store = { path = "../../core/lib/object_store" }
-zksync_types = { path = "../../core/lib/types" }
-
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.4.2", features = [
-    "log_tracing",
-] }
-
-serde = { version = "1.0", features = ["derive"] }
+zksync_object_store.workspace = true
+zksync_types.workspace = true
+circuit_definitions = { workspace = true, features = [ "log_tracing" ] }
+serde = { workspace = true, features = ["derive"] }

prover/prover_fri_utils/Cargo.toml

@@ -1,22 +1,27 @@
 [package]
 name = "zksync_prover_fri_utils"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
+authors.workspace = true
+homepage.workspace = true
+repository.workspace = true
+license.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-vise = { git = "https://github.com/matter-labs/vise.git", version = "0.1.0", rev = "1c9cc500e92cf9ea052b230e114a6f9cce4fb2c1" }
+vise.workspace = true
+zksync_object_store.workspace = true
+zksync_config.workspace = true
+zksync_types.workspace = true
+zksync_prover_fri_types.workspace = true
+prover_dal.workspace = true
+zksync_utils.workspace = true
 
-zksync_object_store = { path = "../../core/lib/object_store" }
-zksync_config = { path = "../../core/lib/config" }
-zksync_types = { path = "../../core/lib/types" }
-zksync_prover_fri_types = { path = "../prover_fri_types" }
-prover_dal = { path = "../prover_dal" }
-zksync_utils = { path = "../../core/lib/utils" }
-
-tracing = "0.1"
-serde = { version = "1.0", features = ["derive"] }
-reqwest = { version = "0.11", features = ["blocking"] }
-regex = "1.7.2"
-anyhow = "1.0"
+tracing.workspace = true
+serde = { workspace = true, features = ["derive"] }
+reqwest = { workspace = true, features = ["blocking"] }
+regex.workspace = true
+anyhow.workspace = true