refactor(prover): Minor improvements in prover workspace (#2393)

## What ❔

- Removes an outdated version of `zk_evm` from dependencies.
- Removes a few unused deps.
- Sorts the dependencies in the workspace Cargo.toml.

## Why ❔

Refactoring.

## 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`.

prover/Cargo.toml

@@ -29,12 +29,11 @@ keywords = ["blockchain", "zksync"]
 categories = ["cryptography"]
 
 [workspace.dependencies]
+# Common dependencies
 anyhow = "1.0"
 async-trait = "0.1"
 bincode = "1"
 chrono = "0.4.38"
-circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
-circuit_sequencer_api = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
 clap = "4.4.6"
 colored = "2.0"
 const-decoder = "0.3.0"
@@ -50,7 +49,6 @@ log = "0.4.20"
 md5 = "0.7.0"
 once_cell = "1.18"
 proptest = "1.2.0"
-zksync_prover_dal = { path = "prover_dal" }
 queues = "1.1.0"
 rand = "0.8"
 regex = "1.10.4"
@@ -59,7 +57,6 @@ 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.5.0" }
 sqlx = { version = "0.7.3", default-features = false }
 structopt = "0.3.26"
 strum = { version = "0.24" }
@@ -69,20 +66,25 @@ 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 = "a5bb80c9ce7168663114ee30e794d6dc32159ee4" }
-vk_setup_data_generator_server_fri = { path = "vk_setup_data_generator_server_fri" }
-zksync_prover_config = { path = "config" }
+
+# Proving dependencies
+circuit_definitions = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
+circuit_sequencer_api = { package = "circuit_sequencer_api", git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
+zkevm_test_harness = { git = "https://github.com/matter-labs/era-zkevm_test_harness.git", branch = "v1.5.0" }
+
+# GPU proving dependencies
+wrapper_prover = { package = "wrapper-prover", git = "https://github.com/matter-labs/era-heavy-ops-service.git", rev = "3d33e06" }
+shivini = { git = "https://github.com/matter-labs/era-shivini.git", branch = "v1.5.0" }
+
+# Core workspace dependencies
 zksync_multivm = { path = "../core/lib/multivm", version = "0.1.0" }
 zksync_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.5.0" }
 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" }
@@ -94,8 +96,12 @@ zksync_contracts = { path = "../core/lib/contracts" }
 zksync_core_leftovers = { path = "../core/lib/zksync_core_leftovers" }
 zksync_protobuf_config = { path = "../core/lib/protobuf_config" }
 
-wrapper_prover = { package = "wrapper-prover", git = "https://github.com/matter-labs/era-heavy-ops-service.git", rev = "3d33e06" }
-
+# Prover workspace dependencies
+zksync_prover_config = { path = "config" }
+zksync_prover_dal = { path = "prover_dal" }
+zksync_prover_fri_types = { path = "prover_fri_types" }
+zksync_prover_fri_utils = { path = "prover_fri_utils" }
+vk_setup_data_generator_server_fri = { path = "vk_setup_data_generator_server_fri" }
 
 # for `perf` profiling
 [profile.perf]

prover/proof_fri_compressor/Cargo.toml

@@ -13,7 +13,6 @@ categories.workspace = true
 vise.workspace = true
 zksync_types.workspace = true
 zksync_prover_dal.workspace = true
-zksync_config.workspace = true
 zksync_env_config.workspace = true
 zksync_object_store.workspace = true
 zksync_prover_interface.workspace = true

prover/witness_generator/Cargo.toml

@@ -32,7 +32,6 @@ zksync_protobuf_config.workspace = true
 
 zkevm_test_harness = { workspace = true }
 circuit_definitions = { workspace = true, features = [ "log_tracing" ] }
-zk_evm.workspace = true
 
 anyhow.workspace = true
 tracing.workspace = true

prover/witness_generator/src/precalculated_merkle_paths_provider.rs

@@ -1,7 +1,9 @@
 use serde::{Deserialize, Serialize};
-use zk_evm::blake2::Blake2s256;
-use zkevm_test_harness::witness::tree::{
-    BinaryHasher, BinarySparseStorageTree, EnumeratedBinaryLeaf, LeafQuery, ZkSyncStorageLeaf,
+use zkevm_test_harness::{
+    witness::tree::{
+        BinaryHasher, BinarySparseStorageTree, EnumeratedBinaryLeaf, LeafQuery, ZkSyncStorageLeaf,
+    },
+    zk_evm::blake2::Blake2s256,
 };
 use zksync_prover_interface::inputs::{StorageLogMetadata, WitnessInputMerklePaths};
 

prover/witness_vector_generator/Cargo.toml

@@ -21,17 +21,13 @@ zksync_utils.workspace = true
 zksync_prover_fri_types.workspace = true
 zksync_prover_config.workspace = true
 zksync_queued_job_processor.workspace = true
-vk_setup_data_generator_server_fri.workspace = true
 zksync_vlog.workspace = true
+vk_setup_data_generator_server_fri.workspace = true
 
 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"] }
-serde = { workspace = true, features = ["derive"] }
 clap = { workspace = true, features = ["derive"] }
 async-trait.workspace = true
-queues.workspace = true
 bincode.workspace = true