diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml index ebe5a4519a84..781ae7945c13 100644 --- a/.github/workflows/build-docker-from-tag.yml +++ b/.github/workflows/build-docker-from-tag.yml @@ -26,7 +26,6 @@ jobs: runs-on: [ubuntu-latest] outputs: image_tag_suffix: ${{ steps.set.outputs.image_tag_suffix }} - prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }} prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 diff --git a/.github/workflows/build-prover-template.yml b/.github/workflows/build-prover-template.yml index cce0fb1ecbe9..99ad27427df1 100644 --- a/.github/workflows/build-prover-template.yml +++ b/.github/workflows/build-prover-template.yml @@ -50,11 +50,9 @@ jobs: matrix: component: - witness-generator - - prover-fri - prover-gpu-fri - witness-vector-generator - prover-fri-gateway - - proof-fri-compressor - proof-fri-gpu-compressor outputs: protocol_version: ${{ steps.protocolversion.outputs.protocol_version }} @@ -87,12 +85,6 @@ jobs: ci_run git config --global --add safe.directory /usr/src/zksync/contracts ci_run zk - # We need the CRS only for the fri compressor. - - name: download CRS for CPU compressor - if: matrix.component == 'proof-fri-compressor' - run: | - ci_run run_retried curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key - - name: download CRS for GPU compressor if: matrix.component == 'proof-fri-gpu-compressor' run: | diff --git a/.github/workflows/release-test-stage.yml b/.github/workflows/release-test-stage.yml index 5bbdd7ae7a0d..0e4d7857e047 100644 --- a/.github/workflows/release-test-stage.yml +++ b/.github/workflows/release-test-stage.yml @@ -42,7 +42,6 @@ jobs: runs-on: [matterlabs-deployer-stage] outputs: image_tag_suffix: ${{ steps.generate-tag-suffix.outputs.image_tag_suffix }} - prover_fri_cpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.cpu_short_commit_sha }} prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }} steps: - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4 diff --git a/docker/proof-fri-compressor/Dockerfile b/docker/proof-fri-compressor/Dockerfile deleted file mode 100644 index 2cf131abb4b8..000000000000 --- a/docker/proof-fri-compressor/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -# Will work locally only after prior universal setup key download - -FROM matterlabs/zksync-build-base:latest as builder - -ARG DEBIAN_FRONTEND=noninteractive - -WORKDIR /usr/src/zksync -COPY . . - -RUN cd prover && cargo build --release --bin zksync_proof_fri_compressor - -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 universal setup key required for proof compression -COPY setup_2\^26.key /setup_2\^26.key - -COPY --from=builder /usr/src/zksync/prover/target/release/zksync_proof_fri_compressor /usr/bin/ - -ENTRYPOINT ["zksync_proof_fri_compressor"] diff --git a/docker/prover-fri/Dockerfile b/docker/prover-fri/Dockerfile deleted file mode 100644 index 2dde8d9794ce..000000000000 --- a/docker/prover-fri/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM matterlabs/zksync-build-base:latest as builder - -ARG DEBIAN_FRONTEND=noninteractive - -WORKDIR /usr/src/zksync -COPY . . - -RUN cd prover && cargo build --release --bin zksync_prover_fri - -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 protocol version -COPY prover/crates/bin/vk_setup_data_generator_server_fri/data/ /prover/crates/bin/vk_setup_data_generator_server_fri/data/ - -COPY --from=builder /usr/src/zksync/prover/target/release/zksync_prover_fri /usr/bin/ - -ENTRYPOINT ["zksync_prover_fri"] diff --git a/infrastructure/zk/src/docker.ts b/infrastructure/zk/src/docker.ts index 19b03bcb2111..6cf3e3563938 100644 --- a/infrastructure/zk/src/docker.ts +++ b/infrastructure/zk/src/docker.ts @@ -5,16 +5,13 @@ const IMAGES = [ 'server-v2', 'external-node', 'contract-verifier', - 'prover-v2', 'local-node', 'zk-environment', 'circuit-synthesizer', 'witness-generator', - 'prover-fri', 'prover-gpu-fri', 'witness-vector-generator', 'prover-fri-gateway', - 'proof-fri-compressor', 'proof-fri-gpu-compressor', 'snapshots-creator', 'verified-sources-fetcher' @@ -84,9 +81,7 @@ function defaultTagList(image: string, imageTagSha: string, imageTagShaTS: strin if ( protocolVersionTag && [ - 'proof-fri-compressor', 'proof-fri-gpu-compressor', - 'prover-fri', 'prover-fri-gateway', 'prover-gpu-fri', 'witness-generator', @@ -117,22 +112,16 @@ async function _build(image: string, tagList: string[], dockerOrg: string, platf if (platform != '') { buildArgs += `--platform=${platform} `; } - if (image === 'prover-v2') { - const eraBellmanCudaRelease = process.env.ERA_BELLMAN_CUDA_RELEASE; - buildArgs += `--build-arg ERA_BELLMAN_CUDA_RELEASE=${eraBellmanCudaRelease} `; - } if (image === 'prover-gpu-fri') { const cudaArch = process.env.CUDA_ARCH; buildArgs += `--build-arg CUDA_ARCH='${cudaArch}' `; } buildArgs += extraArgs; - const imagePath = image === 'prover-v2' ? 'prover' : image; - const buildCommand = `DOCKER_BUILDKIT=1 docker buildx build ${tagsToBuild}` + (buildArgs ? ` ${buildArgs}` : '') + - ` -f ./docker/${imagePath}/Dockerfile .`; + ` -f ./docker/${image}/Dockerfile .`; await utils.spawn(buildCommand); } diff --git a/prover/extract-setup-data-keys.sh b/prover/extract-setup-data-keys.sh index 1fc4afe23dae..8627a3e61e15 100755 --- a/prover/extract-setup-data-keys.sh +++ b/prover/extract-setup-data-keys.sh @@ -1,14 +1,7 @@ #!/bin/bash -# Define file names -cpu_file="setup-data-cpu-keys.json" gpu_file="setup-data-gpu-keys.json" -# Process CPU file -value=$(jq -r '.us' "./prover/$cpu_file") -short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|') -echo "cpu_short_commit_sha=$short_sha" - # Process GPU file value=$(jq -r '.us' "./prover/$gpu_file") short_sha=$(echo $value | sed 's|gs://matterlabs-setup-data-us/\(.*\)/|\1|') diff --git a/prover/setup-data-cpu-keys.json b/prover/setup-data-cpu-keys.json deleted file mode 100644 index 8b7a9165e2c2..000000000000 --- a/prover/setup-data-cpu-keys.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "us": "gs://matterlabs-setup-data-us/8ef5506/", - "europe": "gs://matterlabs-setup-data-europe/8ef5506/", - "asia": "gs://matterlabs-setup-data-asia/8ef5506/" -}