From 6f26e7ed71ae055e52d08e479fa39075a41bfef9 Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Mon, 2 Sep 2024 15:17:26 +0400 Subject: [PATCH] feat: Move prover data to /home/popzxc/workspace/current/zksync-era/prover/data --- .dockerignore | 2 +- .gitignore | 1 + core/lib/env_config/src/fri_prover.rs | 4 +-- docker/proof-fri-gpu-compressor/Dockerfile | 2 +- docker/prover-fri-gateway/Dockerfile | 2 +- docker/prover-gpu-fri-gar/Dockerfile | 2 +- docker/prover-gpu-fri/Dockerfile | 2 +- docker/witness-generator/Dockerfile | 2 +- docker/witness-vector-generator/Dockerfile | 2 +- docs/guides/advanced/15_prover_keys.md | 4 +-- etc/env/base/fri_prover.toml | 2 +- etc/env/file_based/general.yaml | 2 +- infrastructure/zk/src/prover_setup.ts | 8 +++--- .../src/keystore.rs | 6 ++--- .../src/utils.rs | 2 +- prover/data/README.md | 23 ++++++++++++++++++ .../historical_data/0.24.0/commitments.json | 0 .../snark_verification_scheduler_key.json | 0 .../historical_data/0.24.1}/commitments.json | 0 .../snark_verification_scheduler_key.json | 0 .../historical_data/18/commitments.json | 0 .../18/snark_verification_scheduler_key.json | 0 .../historical_data/19/commitments.json | 0 .../19/snark_verification_scheduler_key.json | 0 .../historical_data/20/commitments.json | 0 .../20/snark_verification_scheduler_key.json | 0 .../historical_data/21/commitments.json | 0 .../21/snark_verification_scheduler_key.json | 0 .../historical_data/22/commitments.json | 0 .../22/snark_verification_scheduler_key.json | 0 .../historical_data/23/commitments.json | 0 .../23/snark_verification_scheduler_key.json | 0 .../historical_data/README.md | 0 .../0.24.1 => data/keys}/commitments.json | 0 .../keys}/finalization_hints_basic_1.bin | Bin .../keys}/finalization_hints_basic_10.bin | Bin .../keys}/finalization_hints_basic_11.bin | Bin .../keys}/finalization_hints_basic_12.bin | Bin .../keys}/finalization_hints_basic_13.bin | Bin .../keys}/finalization_hints_basic_14.bin | Bin .../keys}/finalization_hints_basic_15.bin | Bin .../keys}/finalization_hints_basic_2.bin | Bin .../keys}/finalization_hints_basic_255.bin | Bin .../keys}/finalization_hints_basic_3.bin | Bin .../keys}/finalization_hints_basic_4.bin | Bin .../keys}/finalization_hints_basic_5.bin | Bin .../keys}/finalization_hints_basic_6.bin | Bin .../keys}/finalization_hints_basic_7.bin | Bin .../keys}/finalization_hints_basic_8.bin | Bin .../keys}/finalization_hints_basic_9.bin | Bin .../keys}/finalization_hints_leaf_10.bin | Bin .../keys}/finalization_hints_leaf_11.bin | Bin .../keys}/finalization_hints_leaf_12.bin | Bin .../keys}/finalization_hints_leaf_13.bin | Bin .../keys}/finalization_hints_leaf_14.bin | Bin .../keys}/finalization_hints_leaf_15.bin | Bin .../keys}/finalization_hints_leaf_16.bin | Bin .../keys}/finalization_hints_leaf_17.bin | Bin .../keys}/finalization_hints_leaf_18.bin | Bin .../keys}/finalization_hints_leaf_3.bin | Bin .../keys}/finalization_hints_leaf_4.bin | Bin .../keys}/finalization_hints_leaf_5.bin | Bin .../keys}/finalization_hints_leaf_6.bin | Bin .../keys}/finalization_hints_leaf_7.bin | Bin .../keys}/finalization_hints_leaf_8.bin | Bin .../keys}/finalization_hints_leaf_9.bin | Bin .../keys}/finalization_hints_node.bin | Bin .../finalization_hints_recursion_tip.bin | Bin .../keys}/finalization_hints_scheduler.bin | Bin .../snark_verification_scheduler_key.json | 0 .../keys}/verification_basic_10_key.json | 0 .../keys}/verification_basic_11_key.json | 0 .../keys}/verification_basic_12_key.json | 0 .../keys}/verification_basic_13_key.json | 0 .../keys}/verification_basic_14_key.json | 0 .../keys}/verification_basic_15_key.json | 0 .../keys}/verification_basic_1_key.json | 0 .../keys}/verification_basic_255_key.json | 0 .../keys}/verification_basic_2_key.json | 0 .../keys}/verification_basic_3_key.json | 0 .../keys}/verification_basic_4_key.json | 0 .../keys}/verification_basic_5_key.json | 0 .../keys}/verification_basic_6_key.json | 0 .../keys}/verification_basic_7_key.json | 0 .../keys}/verification_basic_8_key.json | 0 .../keys}/verification_basic_9_key.json | 0 .../keys}/verification_leaf_10_key.json | 0 .../keys}/verification_leaf_11_key.json | 0 .../keys}/verification_leaf_12_key.json | 0 .../keys}/verification_leaf_13_key.json | 0 .../keys}/verification_leaf_14_key.json | 0 .../keys}/verification_leaf_15_key.json | 0 .../keys}/verification_leaf_16_key.json | 0 .../keys}/verification_leaf_17_key.json | 0 .../keys}/verification_leaf_18_key.json | 0 .../keys}/verification_leaf_3_key.json | 0 .../keys}/verification_leaf_4_key.json | 0 .../keys}/verification_leaf_5_key.json | 0 .../keys}/verification_leaf_6_key.json | 0 .../keys}/verification_leaf_7_key.json | 0 .../keys}/verification_leaf_8_key.json | 0 .../keys}/verification_leaf_9_key.json | 0 .../keys}/verification_node_key.json | 0 .../keys}/verification_recursion_tip_key.json | 0 .../keys}/verification_scheduler_key.json | 0 .../src/commands/prover/generate_sk.rs | 4 +-- .../src/commands/prover_version.rs | 3 +-- 107 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 prover/data/README.md rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/0.24.0/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/0.24.0/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/historical_data/0.24.1}/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/historical_data/0.24.1}/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/18/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/18/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/19/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/19/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/20/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/20/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/21/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/21/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/22/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/22/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/23/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/23/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri => data}/historical_data/README.md (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1 => data/keys}/commitments.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_1.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_10.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_11.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_12.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_13.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_14.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_15.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_2.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_255.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_3.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_4.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_5.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_6.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_7.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_8.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_basic_9.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_10.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_11.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_12.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_13.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_14.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_15.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_16.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_17.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_18.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_3.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_4.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_5.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_6.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_7.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_8.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_leaf_9.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_node.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_recursion_tip.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/finalization_hints_scheduler.bin (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1 => data/keys}/snark_verification_scheduler_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_10_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_11_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_12_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_13_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_14_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_15_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_1_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_255_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_2_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_3_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_4_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_5_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_6_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_7_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_8_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_basic_9_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_10_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_11_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_12_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_13_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_14_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_15_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_16_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_17_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_18_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_3_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_4_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_5_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_6_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_7_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_8_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_leaf_9_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_node_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_recursion_tip_key.json (100%) rename prover/{crates/bin/vk_setup_data_generator_server_fri/data => data/keys}/verification_scheduler_key.json (100%) diff --git a/.dockerignore b/.dockerignore index c32286be6a0..39efdabca19 100644 --- a/.dockerignore +++ b/.dockerignore @@ -39,7 +39,7 @@ contracts/.git !etc/multivm_bootloaders !cargo !bellman-cuda -!prover/crates/bin/vk_setup_data_generator_server_fri/data/ +!prover/data/ !.github/release-please/manifest.json !etc/env/file_based diff --git a/.gitignore b/.gitignore index 66d7d00b263..725b5940afe 100644 --- a/.gitignore +++ b/.gitignore @@ -110,6 +110,7 @@ hyperchain-*.yml # Prover keys that should not be commited prover/crates/bin/vk_setup_data_generator_server_fri/data/setup_* +prover/data/keys/setup_* # Zk Toolbox chains/era/configs/* diff --git a/core/lib/env_config/src/fri_prover.rs b/core/lib/env_config/src/fri_prover.rs index 33698221dc9..6eb199c7e43 100644 --- a/core/lib/env_config/src/fri_prover.rs +++ b/core/lib/env_config/src/fri_prover.rs @@ -32,7 +32,7 @@ mod tests { fn expected_config() -> FriProverConfig { FriProverConfig { - setup_data_path: "vk_setup_data_generator_server_fri/data".to_string(), + setup_data_path: "prover/data/keys".to_string(), prometheus_port: 3315, max_attempts: 10, generation_timeout_in_secs: 300, @@ -68,7 +68,7 @@ mod tests { fn from_env() { let mut lock = MUTEX.lock(); let config = r#" - FRI_PROVER_SETUP_DATA_PATH="vk_setup_data_generator_server_fri/data" + FRI_PROVER_SETUP_DATA_PATH="prover/data/keys" FRI_PROVER_PROMETHEUS_PORT="3315" FRI_PROVER_MAX_ATTEMPTS="10" FRI_PROVER_GENERATION_TIMEOUT_IN_SECS="300" diff --git a/docker/proof-fri-gpu-compressor/Dockerfile b/docker/proof-fri-gpu-compressor/Dockerfile index 02ca4a3b77b..45f2ffa51b0 100644 --- a/docker/proof-fri-gpu-compressor/Dockerfile +++ b/docker/proof-fri-gpu-compressor/Dockerfile @@ -37,7 +37,7 @@ FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04 RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/* # copy VK required for proof wrapping -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY prover/data/keys/ /prover/data/keys COPY setup_2\^24.key /setup_2\^24.key diff --git a/docker/prover-fri-gateway/Dockerfile b/docker/prover-fri-gateway/Dockerfile index c53f2781868..de59451fee8 100644 --- a/docker/prover-fri-gateway/Dockerfile +++ b/docker/prover-fri-gateway/Dockerfile @@ -11,7 +11,7 @@ FROM debian:bookworm-slim RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/* # copy VK required for proof wrapping -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY prover/data/keys/ /prover/data/keys/ COPY --from=builder /usr/src/zksync/prover/target/release/zksync_prover_fri_gateway /usr/bin/ diff --git a/docker/prover-gpu-fri-gar/Dockerfile b/docker/prover-gpu-fri-gar/Dockerfile index 248f6aaf35f..06a1ff532b5 100644 --- a/docker/prover-gpu-fri-gar/Dockerfile +++ b/docker/prover-gpu-fri-gar/Dockerfile @@ -9,7 +9,7 @@ COPY *.bin / RUN apt-get update && apt-get install -y libpq5 ca-certificates openssl && rm -rf /var/lib/apt/lists/* # copy finalization hints required for assembly generation -COPY --from=prover prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY --from=prover prover/data/keys/ /prover/data/keys/ COPY --from=prover /usr/bin/zksync_prover_fri /usr/bin/ ENTRYPOINT ["zksync_prover_fri"] diff --git a/docker/prover-gpu-fri/Dockerfile b/docker/prover-gpu-fri/Dockerfile index 1f1aaa447f2..ad3ff1ff719 100644 --- a/docker/prover-gpu-fri/Dockerfile +++ b/docker/prover-gpu-fri/Dockerfile @@ -31,7 +31,7 @@ FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04 RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/* # copy finalization hints required for assembly generation -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY prover/data/keys/ /prover/data/keys/ COPY --from=builder /usr/src/zksync/prover/target/release/zksync_prover_fri /usr/bin/ diff --git a/docker/witness-generator/Dockerfile b/docker/witness-generator/Dockerfile index 4f7c00aa2ef..2eebe07515e 100644 --- a/docker/witness-generator/Dockerfile +++ b/docker/witness-generator/Dockerfile @@ -13,7 +13,7 @@ FROM debian:bookworm-slim RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/* -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY prover/data/keys/ /prover/data/keys/ COPY --from=builder /usr/src/zksync/prover/target/release/zksync_witness_generator /usr/bin/ diff --git a/docker/witness-vector-generator/Dockerfile b/docker/witness-vector-generator/Dockerfile index d1bc1e29c5f..2f79395f1fd 100644 --- a/docker/witness-vector-generator/Dockerfile +++ b/docker/witness-vector-generator/Dockerfile @@ -12,7 +12,7 @@ FROM debian:bookworm-slim RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/* # copy finalization hints required for witness vector generation -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ +COPY prover/data/keys/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ COPY --from=builder /usr/src/zksync/prover/target/release/zksync_witness_vector_generator /usr/bin/ diff --git a/docs/guides/advanced/15_prover_keys.md b/docs/guides/advanced/15_prover_keys.md index 9f562b49d29..5a3a264e8dd 100644 --- a/docs/guides/advanced/15_prover_keys.md +++ b/docs/guides/advanced/15_prover_keys.md @@ -118,9 +118,9 @@ friendly hash function (currently Poseidon2). [recursive_circuit_list]: https://github.com/matter-labs/era-zkevm_test_harness/blob/3cd647aa57fc2e1180bab53f7a3b61ec47502a46/circuit_definitions/src/circuit_definitions/recursion_layer/mod.rs#L29 [verification_key_list]: - https://github.com/matter-labs/zksync-era/tree/boojum-integration/prover/vk_setup_data_generator_server_fri/data + https://github.com/matter-labs/zksync-era/tree/6d18061df4a18803d3c6377305ef711ce60317e1/prover/data/keys [env_variables_for_hash]: - https://github.com/matter-labs/zksync-era/blob/boojum-integration/etc/env/base/contracts.toml#L44 + https://github.com/matter-labs/zksync-era/blob/6d18061df4a18803d3c6377305ef711ce60317e1/etc/env/base/contracts.toml#L61 [prover_setup_data]: https://github.com/matter-labs/zksync-era/blob/d2ca29bf20b4ec2d9ec9e327b4ba6b281d9793de/prover/vk_setup_data_generator_server_fri/src/lib.rs#L61 [verifier_computation]: diff --git a/etc/env/base/fri_prover.toml b/etc/env/base/fri_prover.toml index 1c93752251b..d09991312ae 100644 --- a/etc/env/base/fri_prover.toml +++ b/etc/env/base/fri_prover.toml @@ -1,5 +1,5 @@ [fri_prover] -setup_data_path = "crates/bin/vk_setup_data_generator_server_fri/data" +setup_data_path = "data/keys" prometheus_port = 3315 max_attempts = 10 generation_timeout_in_secs = 600 diff --git a/etc/env/file_based/general.yaml b/etc/env/file_based/general.yaml index 19921cf536c..064a3b447b9 100644 --- a/etc/env/file_based/general.yaml +++ b/etc/env/file_based/general.yaml @@ -140,7 +140,7 @@ prover: file_backed: file_backed_base_path: artifacts max_retries: 10 - setup_data_path: crates/bin/vk_setup_data_generator_server_fri/data + setup_data_path: data/keys prometheus_port: 3315 max_attempts: 10 generation_timeout_in_secs: 600 diff --git a/infrastructure/zk/src/prover_setup.ts b/infrastructure/zk/src/prover_setup.ts index 5a17c968374..b5bd4c828ae 100644 --- a/infrastructure/zk/src/prover_setup.ts +++ b/infrastructure/zk/src/prover_setup.ts @@ -30,8 +30,7 @@ export async function setupProver(proverType: ProverType) { } else { env.modify( 'FRI_PROVER_SETUP_DATA_PATH', - `${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${process.env.ZKSYNC_ENV}/${ - proverType === ProverType.GPU ? 'gpu' : 'cpu' + `${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${process.env.ZKSYNC_ENV}/${proverType === ProverType.GPU ? 'gpu' : 'cpu' }/`, process.env.ENV_FILE! ); @@ -98,8 +97,7 @@ async function setupProverKeys(proverType: ProverType) { env.modify( 'FRI_PROVER_SETUP_DATA_PATH', - `${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${process.env.ZKSYNC_ENV}/${ - proverType === ProverType.GPU ? 'gpu' : 'cpu' + `${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${process.env.ZKSYNC_ENV}/${proverType === ProverType.GPU ? 'gpu' : 'cpu' }/`, process.env.ENV_FILE! ); @@ -204,7 +202,7 @@ async function downloadDefaultSetupKeys(proverType: ProverType, region: string) ); await utils.spawn( - `cp -r ${process.env.ZKSYNC_HOME}/prover/vk_setup_data_generator_server_fri/data/* ${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${currentEnv}/${proverType}/` + `cp -r ${process.env.ZKSYNC_HOME}/prover/data/keys/* ${process.env.ZKSYNC_HOME}/etc/hyperchains/prover-keys/${currentEnv}/${proverType}/` ); } diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/src/keystore.rs b/prover/crates/bin/vk_setup_data_generator_server_fri/src/keystore.rs index e886b5d1b0c..9e3a6e8d918 100644 --- a/prover/crates/bin/vk_setup_data_generator_server_fri/src/keystore.rs +++ b/prover/crates/bin/vk_setup_data_generator_server_fri/src/keystore.rs @@ -47,16 +47,14 @@ pub struct Keystore { fn get_base_path() -> PathBuf { let path = core_workspace_dir_or_current_dir(); - let new_path = path.join("prover/crates/bin/vk_setup_data_generator_server_fri/data"); + let new_path = path.join("data/keys"); if new_path.exists() { return new_path; } let mut components = path.components(); components.next_back().unwrap(); - components - .as_path() - .join("prover/crates/bin/vk_setup_data_generator_server_fri/data") + components.as_path().join("data/keys") } impl Default for Keystore { diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs b/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs index 1ac6c4f4230..5387b73e76c 100644 --- a/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs +++ b/prover/crates/bin/vk_setup_data_generator_server_fri/src/utils.rs @@ -132,7 +132,7 @@ mod tests { #[test] fn test_keyhash_generation() { let mut path_to_input = PathBuf::from(std::env::var("CARGO_MANIFEST_DIR").unwrap()); - path_to_input.push("historical_data"); + path_to_input.push("../../../data/historical_data"); for entry in std::fs::read_dir(path_to_input.clone()).unwrap().flatten() { if entry.metadata().unwrap().is_dir() { diff --git a/prover/data/README.md b/prover/data/README.md new file mode 100644 index 00000000000..8391aa33ba5 --- /dev/null +++ b/prover/data/README.md @@ -0,0 +1,23 @@ +# Prover data directory + +This directory contains the data required to run provers. + +Currently, it has the following sub-directories: + +- [keys](./keys/): Data required for proof generation. This data is mapped to a single protocol version. +- [historical_data](./historical_data/) Descriptors for the protocol versions used in the past. + +## Keys directory + +`keys` directory is used by various components in the prover subsystem, and it generally can contain two kinds of data: + +- Small static files, like commitments, finalization hints, or verification keys. +- Big generated blobs, like setup keys. + +Small static files are committed to the repository. Big files are expected to be downloaded or generated on demand. Two +important notices as of Sep 2024: + +- Path to setup keys can be overridden via configuration. +- Proof compressor requires an universal setup file, named, for example, `setup_2^24.bin` or `setup_2^26.bin`. It's + handled separately from the rest of the keys, e.g. it has separate configuration variables, and can naturally occur in + the `$ZKSYNC_HOME/keys/setup` during development. diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.0/commitments.json b/prover/data/historical_data/0.24.0/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.0/commitments.json rename to prover/data/historical_data/0.24.0/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.0/snark_verification_scheduler_key.json b/prover/data/historical_data/0.24.0/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.0/snark_verification_scheduler_key.json rename to prover/data/historical_data/0.24.0/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/commitments.json b/prover/data/historical_data/0.24.1/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/commitments.json rename to prover/data/historical_data/0.24.1/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json b/prover/data/historical_data/0.24.1/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/snark_verification_scheduler_key.json rename to prover/data/historical_data/0.24.1/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/18/commitments.json b/prover/data/historical_data/18/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/18/commitments.json rename to prover/data/historical_data/18/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/18/snark_verification_scheduler_key.json b/prover/data/historical_data/18/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/18/snark_verification_scheduler_key.json rename to prover/data/historical_data/18/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/19/commitments.json b/prover/data/historical_data/19/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/19/commitments.json rename to prover/data/historical_data/19/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/19/snark_verification_scheduler_key.json b/prover/data/historical_data/19/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/19/snark_verification_scheduler_key.json rename to prover/data/historical_data/19/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/20/commitments.json b/prover/data/historical_data/20/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/20/commitments.json rename to prover/data/historical_data/20/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/20/snark_verification_scheduler_key.json b/prover/data/historical_data/20/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/20/snark_verification_scheduler_key.json rename to prover/data/historical_data/20/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/21/commitments.json b/prover/data/historical_data/21/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/21/commitments.json rename to prover/data/historical_data/21/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/21/snark_verification_scheduler_key.json b/prover/data/historical_data/21/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/21/snark_verification_scheduler_key.json rename to prover/data/historical_data/21/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/22/commitments.json b/prover/data/historical_data/22/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/22/commitments.json rename to prover/data/historical_data/22/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/22/snark_verification_scheduler_key.json b/prover/data/historical_data/22/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/22/snark_verification_scheduler_key.json rename to prover/data/historical_data/22/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/23/commitments.json b/prover/data/historical_data/23/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/23/commitments.json rename to prover/data/historical_data/23/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/23/snark_verification_scheduler_key.json b/prover/data/historical_data/23/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/23/snark_verification_scheduler_key.json rename to prover/data/historical_data/23/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/README.md b/prover/data/historical_data/README.md similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/README.md rename to prover/data/historical_data/README.md diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1/commitments.json b/prover/data/keys/commitments.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1/commitments.json rename to prover/data/keys/commitments.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin b/prover/data/keys/finalization_hints_basic_1.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_1.bin rename to prover/data/keys/finalization_hints_basic_1.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_10.bin b/prover/data/keys/finalization_hints_basic_10.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_10.bin rename to prover/data/keys/finalization_hints_basic_10.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin b/prover/data/keys/finalization_hints_basic_11.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_11.bin rename to prover/data/keys/finalization_hints_basic_11.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin b/prover/data/keys/finalization_hints_basic_12.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_12.bin rename to prover/data/keys/finalization_hints_basic_12.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_13.bin b/prover/data/keys/finalization_hints_basic_13.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_13.bin rename to prover/data/keys/finalization_hints_basic_13.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_14.bin b/prover/data/keys/finalization_hints_basic_14.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_14.bin rename to prover/data/keys/finalization_hints_basic_14.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_15.bin b/prover/data/keys/finalization_hints_basic_15.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_15.bin rename to prover/data/keys/finalization_hints_basic_15.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_2.bin b/prover/data/keys/finalization_hints_basic_2.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_2.bin rename to prover/data/keys/finalization_hints_basic_2.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_255.bin b/prover/data/keys/finalization_hints_basic_255.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_255.bin rename to prover/data/keys/finalization_hints_basic_255.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin b/prover/data/keys/finalization_hints_basic_3.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_3.bin rename to prover/data/keys/finalization_hints_basic_3.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_4.bin b/prover/data/keys/finalization_hints_basic_4.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_4.bin rename to prover/data/keys/finalization_hints_basic_4.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_5.bin b/prover/data/keys/finalization_hints_basic_5.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_5.bin rename to prover/data/keys/finalization_hints_basic_5.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin b/prover/data/keys/finalization_hints_basic_6.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_6.bin rename to prover/data/keys/finalization_hints_basic_6.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin b/prover/data/keys/finalization_hints_basic_7.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_7.bin rename to prover/data/keys/finalization_hints_basic_7.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_8.bin b/prover/data/keys/finalization_hints_basic_8.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_8.bin rename to prover/data/keys/finalization_hints_basic_8.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin b/prover/data/keys/finalization_hints_basic_9.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_basic_9.bin rename to prover/data/keys/finalization_hints_basic_9.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_10.bin b/prover/data/keys/finalization_hints_leaf_10.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_10.bin rename to prover/data/keys/finalization_hints_leaf_10.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_11.bin b/prover/data/keys/finalization_hints_leaf_11.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_11.bin rename to prover/data/keys/finalization_hints_leaf_11.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_12.bin b/prover/data/keys/finalization_hints_leaf_12.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_12.bin rename to prover/data/keys/finalization_hints_leaf_12.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_13.bin b/prover/data/keys/finalization_hints_leaf_13.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_13.bin rename to prover/data/keys/finalization_hints_leaf_13.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_14.bin b/prover/data/keys/finalization_hints_leaf_14.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_14.bin rename to prover/data/keys/finalization_hints_leaf_14.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_15.bin b/prover/data/keys/finalization_hints_leaf_15.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_15.bin rename to prover/data/keys/finalization_hints_leaf_15.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_16.bin b/prover/data/keys/finalization_hints_leaf_16.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_16.bin rename to prover/data/keys/finalization_hints_leaf_16.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_17.bin b/prover/data/keys/finalization_hints_leaf_17.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_17.bin rename to prover/data/keys/finalization_hints_leaf_17.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_18.bin b/prover/data/keys/finalization_hints_leaf_18.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_18.bin rename to prover/data/keys/finalization_hints_leaf_18.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_3.bin b/prover/data/keys/finalization_hints_leaf_3.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_3.bin rename to prover/data/keys/finalization_hints_leaf_3.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_4.bin b/prover/data/keys/finalization_hints_leaf_4.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_4.bin rename to prover/data/keys/finalization_hints_leaf_4.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_5.bin b/prover/data/keys/finalization_hints_leaf_5.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_5.bin rename to prover/data/keys/finalization_hints_leaf_5.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_6.bin b/prover/data/keys/finalization_hints_leaf_6.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_6.bin rename to prover/data/keys/finalization_hints_leaf_6.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_7.bin b/prover/data/keys/finalization_hints_leaf_7.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_7.bin rename to prover/data/keys/finalization_hints_leaf_7.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_8.bin b/prover/data/keys/finalization_hints_leaf_8.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_8.bin rename to prover/data/keys/finalization_hints_leaf_8.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_9.bin b/prover/data/keys/finalization_hints_leaf_9.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_leaf_9.bin rename to prover/data/keys/finalization_hints_leaf_9.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_node.bin b/prover/data/keys/finalization_hints_node.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_node.bin rename to prover/data/keys/finalization_hints_node.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_recursion_tip.bin b/prover/data/keys/finalization_hints_recursion_tip.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_recursion_tip.bin rename to prover/data/keys/finalization_hints_recursion_tip.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin b/prover/data/keys/finalization_hints_scheduler.bin similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/finalization_hints_scheduler.bin rename to prover/data/keys/finalization_hints_scheduler.bin diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1/snark_verification_scheduler_key.json b/prover/data/keys/snark_verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/historical_data/0.24.1/snark_verification_scheduler_key.json rename to prover/data/keys/snark_verification_scheduler_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_10_key.json b/prover/data/keys/verification_basic_10_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_10_key.json rename to prover/data/keys/verification_basic_10_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json b/prover/data/keys/verification_basic_11_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_11_key.json rename to prover/data/keys/verification_basic_11_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json b/prover/data/keys/verification_basic_12_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_12_key.json rename to prover/data/keys/verification_basic_12_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_13_key.json b/prover/data/keys/verification_basic_13_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_13_key.json rename to prover/data/keys/verification_basic_13_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_14_key.json b/prover/data/keys/verification_basic_14_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_14_key.json rename to prover/data/keys/verification_basic_14_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_15_key.json b/prover/data/keys/verification_basic_15_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_15_key.json rename to prover/data/keys/verification_basic_15_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json b/prover/data/keys/verification_basic_1_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_1_key.json rename to prover/data/keys/verification_basic_1_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_255_key.json b/prover/data/keys/verification_basic_255_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_255_key.json rename to prover/data/keys/verification_basic_255_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_2_key.json b/prover/data/keys/verification_basic_2_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_2_key.json rename to prover/data/keys/verification_basic_2_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json b/prover/data/keys/verification_basic_3_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_3_key.json rename to prover/data/keys/verification_basic_3_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_4_key.json b/prover/data/keys/verification_basic_4_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_4_key.json rename to prover/data/keys/verification_basic_4_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_5_key.json b/prover/data/keys/verification_basic_5_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_5_key.json rename to prover/data/keys/verification_basic_5_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json b/prover/data/keys/verification_basic_6_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_6_key.json rename to prover/data/keys/verification_basic_6_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json b/prover/data/keys/verification_basic_7_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_7_key.json rename to prover/data/keys/verification_basic_7_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_8_key.json b/prover/data/keys/verification_basic_8_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_8_key.json rename to prover/data/keys/verification_basic_8_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json b/prover/data/keys/verification_basic_9_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_basic_9_key.json rename to prover/data/keys/verification_basic_9_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_10_key.json b/prover/data/keys/verification_leaf_10_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_10_key.json rename to prover/data/keys/verification_leaf_10_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json b/prover/data/keys/verification_leaf_11_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_11_key.json rename to prover/data/keys/verification_leaf_11_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_12_key.json b/prover/data/keys/verification_leaf_12_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_12_key.json rename to prover/data/keys/verification_leaf_12_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json b/prover/data/keys/verification_leaf_13_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_13_key.json rename to prover/data/keys/verification_leaf_13_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json b/prover/data/keys/verification_leaf_14_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_14_key.json rename to prover/data/keys/verification_leaf_14_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_15_key.json b/prover/data/keys/verification_leaf_15_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_15_key.json rename to prover/data/keys/verification_leaf_15_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_16_key.json b/prover/data/keys/verification_leaf_16_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_16_key.json rename to prover/data/keys/verification_leaf_16_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_17_key.json b/prover/data/keys/verification_leaf_17_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_17_key.json rename to prover/data/keys/verification_leaf_17_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_18_key.json b/prover/data/keys/verification_leaf_18_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_18_key.json rename to prover/data/keys/verification_leaf_18_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json b/prover/data/keys/verification_leaf_3_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_3_key.json rename to prover/data/keys/verification_leaf_3_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_4_key.json b/prover/data/keys/verification_leaf_4_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_4_key.json rename to prover/data/keys/verification_leaf_4_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_5_key.json b/prover/data/keys/verification_leaf_5_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_5_key.json rename to prover/data/keys/verification_leaf_5_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_6_key.json b/prover/data/keys/verification_leaf_6_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_6_key.json rename to prover/data/keys/verification_leaf_6_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_7_key.json b/prover/data/keys/verification_leaf_7_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_7_key.json rename to prover/data/keys/verification_leaf_7_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_8_key.json b/prover/data/keys/verification_leaf_8_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_8_key.json rename to prover/data/keys/verification_leaf_8_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json b/prover/data/keys/verification_leaf_9_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_leaf_9_key.json rename to prover/data/keys/verification_leaf_9_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_node_key.json b/prover/data/keys/verification_node_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_node_key.json rename to prover/data/keys/verification_node_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_recursion_tip_key.json b/prover/data/keys/verification_recursion_tip_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_recursion_tip_key.json rename to prover/data/keys/verification_recursion_tip_key.json diff --git a/prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json b/prover/data/keys/verification_scheduler_key.json similarity index 100% rename from prover/crates/bin/vk_setup_data_generator_server_fri/data/verification_scheduler_key.json rename to prover/data/keys/verification_scheduler_key.json diff --git a/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs b/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs index 7f678470d17..c13d1c3b5e0 100644 --- a/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs +++ b/zk_toolbox/crates/zk_inception/src/commands/prover/generate_sk.rs @@ -18,8 +18,8 @@ pub(crate) async fn run(shell: &Shell) -> anyhow::Result<()> { shell, "cargo run --features gpu --release --bin key_generator -- generate-sk-gpu all --recompute-if-missing - --setup-path=crates/bin/vk_setup_data_generator_server_fri/data - --path={link_to_prover}/crates/bin/vk_setup_data_generator_server_fri/data" + --setup-path=data/keys + --path={link_to_prover}/data/keys" )); cmd.run()?; spinner.finish(); diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/prover_version.rs b/zk_toolbox/crates/zk_supervisor/src/commands/prover_version.rs index 479f796294f..8740e7c873a 100644 --- a/zk_toolbox/crates/zk_supervisor/src/commands/prover_version.rs +++ b/zk_toolbox/crates/zk_supervisor/src/commands/prover_version.rs @@ -27,8 +27,7 @@ async fn get_protocol_version(shell: &Shell, link_to_prover: &Path) -> anyhow::R } async fn get_snark_wrapper(link_to_prover: &Path) -> anyhow::Result { - let path = - link_to_prover.join("crates/bin/vk_setup_data_generator_server_fri/data/commitments.json"); + let path = link_to_prover.join("data/keys/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");