Skip to content

Commit 6f26e7e

Browse files
committed
feat: Move prover data to /home/popzxc/workspace/current/zksync-era/prover/data
1 parent 6d18061 commit 6f26e7e

File tree

107 files changed

+46
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+46
-27
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ contracts/.git
3939
!etc/multivm_bootloaders
4040
!cargo
4141
!bellman-cuda
42-
!prover/crates/bin/vk_setup_data_generator_server_fri/data/
42+
!prover/data/
4343
!.github/release-please/manifest.json
4444

4545
!etc/env/file_based

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ hyperchain-*.yml
110110

111111
# Prover keys that should not be commited
112112
prover/crates/bin/vk_setup_data_generator_server_fri/data/setup_*
113+
prover/data/keys/setup_*
113114

114115
# Zk Toolbox
115116
chains/era/configs/*

core/lib/env_config/src/fri_prover.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mod tests {
3232

3333
fn expected_config() -> FriProverConfig {
3434
FriProverConfig {
35-
setup_data_path: "vk_setup_data_generator_server_fri/data".to_string(),
35+
setup_data_path: "prover/data/keys".to_string(),
3636
prometheus_port: 3315,
3737
max_attempts: 10,
3838
generation_timeout_in_secs: 300,
@@ -68,7 +68,7 @@ mod tests {
6868
fn from_env() {
6969
let mut lock = MUTEX.lock();
7070
let config = r#"
71-
FRI_PROVER_SETUP_DATA_PATH="vk_setup_data_generator_server_fri/data"
71+
FRI_PROVER_SETUP_DATA_PATH="prover/data/keys"
7272
FRI_PROVER_PROMETHEUS_PORT="3315"
7373
FRI_PROVER_MAX_ATTEMPTS="10"
7474
FRI_PROVER_GENERATION_TIMEOUT_IN_SECS="300"

docker/proof-fri-gpu-compressor/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04
3737
RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
3838

3939
# copy VK required for proof wrapping
40-
COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
40+
COPY prover/data/keys/ /prover/data/keys
4141

4242
COPY setup_2\^24.key /setup_2\^24.key
4343

docker/prover-fri-gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FROM debian:bookworm-slim
1111
RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
1212

1313
# copy VK required for proof wrapping
14-
COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
14+
COPY prover/data/keys/ /prover/data/keys/
1515

1616
COPY --from=builder /usr/src/zksync/prover/target/release/zksync_prover_fri_gateway /usr/bin/
1717

docker/prover-gpu-fri-gar/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ COPY *.bin /
99
RUN apt-get update && apt-get install -y libpq5 ca-certificates openssl && rm -rf /var/lib/apt/lists/*
1010

1111
# copy finalization hints required for assembly generation
12-
COPY --from=prover prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
12+
COPY --from=prover prover/data/keys/ /prover/data/keys/
1313
COPY --from=prover /usr/bin/zksync_prover_fri /usr/bin/
1414

1515
ENTRYPOINT ["zksync_prover_fri"]

docker/prover-gpu-fri/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ FROM nvidia/cuda:12.2.0-runtime-ubuntu22.04
3131
RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
3232

3333
# copy finalization hints required for assembly generation
34-
COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
34+
COPY prover/data/keys/ /prover/data/keys/
3535

3636
COPY --from=builder /usr/src/zksync/prover/target/release/zksync_prover_fri /usr/bin/
3737

docker/witness-generator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM debian:bookworm-slim
1313

1414
RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
1515

16-
COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
16+
COPY prover/data/keys/ /prover/data/keys/
1717

1818
COPY --from=builder /usr/src/zksync/prover/target/release/zksync_witness_generator /usr/bin/
1919

docker/witness-vector-generator/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ FROM debian:bookworm-slim
1212
RUN apt-get update && apt-get install -y curl libpq5 ca-certificates && rm -rf /var/lib/apt/lists/*
1313

1414
# copy finalization hints required for witness vector generation
15-
COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
15+
COPY prover/data/keys/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/
1616

1717
COPY --from=builder /usr/src/zksync/prover/target/release/zksync_witness_vector_generator /usr/bin/
1818

docs/guides/advanced/15_prover_keys.md

Lines changed: 2 additions & 2 deletions

0 commit comments

Comments
 (0)