Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(hyperchain): Adding prover related commands to zk stack #440

Merged
merged 35 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
d17357e
Finished v0 of prover commands
githubdoramon Nov 3, 2023
1f6e2be
adding non interactive command
githubdoramon Nov 3, 2023
20d71a4
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 3, 2023
5a2d9a2
adding demo command
githubdoramon Nov 7, 2023
aca41f4
mresolving merge conflict
githubdoramon Nov 7, 2023
e069d9d
reverse emrge from main
githubdoramon Nov 7, 2023
b4c07b7
removing unused args
githubdoramon Nov 7, 2023
fa32b74
formatting
githubdoramon Nov 7, 2023
d773175
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 8, 2023
6ea9aca
some fixes for testing
githubdoramon Nov 8, 2023
1540f0d
changes to docker compose for prover
githubdoramon Nov 9, 2023
f67873c
fmt
githubdoramon Nov 9, 2023
35538b3
using public images for prover related services
githubdoramon Nov 9, 2023
35f8a3d
fixing compose file
githubdoramon Nov 9, 2023
07a78cc
more fix
githubdoramon Nov 9, 2023
1613381
commenting out ports for prometheus
githubdoramon Nov 9, 2023
8f97144
minor change
githubdoramon Nov 9, 2023
f482956
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 9, 2023
c99d267
fixing fri gateway port
githubdoramon Nov 9, 2023
54030f9
adding health check to start fri gateway
githubdoramon Nov 9, 2023
315acfd
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 9, 2023
a01c471
Merge branch 'ramon-pro-49-add-cpu-prover-to-zk-stack-init' of ssh://…
githubdoramon Nov 9, 2023
03ed3ca
line break
githubdoramon Nov 9, 2023
ff27676
potential fix
githubdoramon Nov 9, 2023
b9e0791
yet more fixes
githubdoramon Nov 9, 2023
9fa6bf4
new idea
githubdoramon Nov 9, 2023
653e4a5
yet another new idea
githubdoramon Nov 9, 2023
6f4cc55
new try
githubdoramon Nov 10, 2023
3bc3ff6
you know, fmt
githubdoramon Nov 10, 2023
cb0c63c
fixing missing env variable
githubdoramon Nov 10, 2023
13cf803
now we are talking
githubdoramon Nov 10, 2023
644185e
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 10, 2023
285ee7f
removing unused function
githubdoramon Nov 10, 2023
c7a2a4d
Merge branch 'ramon-pro-49-add-cpu-prover-to-zk-stack-init' of ssh://…
githubdoramon Nov 10, 2023
767650c
Merge branch 'main' into ramon-pro-49-add-cpu-prover-to-zk-stack-init
githubdoramon Nov 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,7 @@ cache-zk/
zksolc
verified_sources

# Hyperchain related
hyperchain-*.yml
/etc/hyperchains/prover-keys
/etc/hyperchains/artifacts
116 changes: 53 additions & 63 deletions etc/hyperchains/docker-compose-hyperchain-template
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,27 @@ networks:
zkstack:
driver: bridge
volumes:
hatemosphere marked this conversation as resolved.
Show resolved Hide resolved
prover_artifacts:
server_artifacts:
artifacts:
services:
zkstack_core:
zkstack-core:
networks:
- zkstack
image: {{orgName}}/server-v2:latest
command: ["--components", "tree_new,eth,data_fetcher,state_keeper,housekeeper"]
command: ["--components", "tree_new,eth,data_fetcher,state_keeper,housekeeper,proof_data_handler"]
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3071/health"]
interval: 10s
timeout: 5s
retries: 10
env_file:
- {{envFilePath}}
environment:
ZKSYNC_HOME: /
ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics # we need a separate metrics port for each component
- "3075:3075" # proof_data_handler api
#- "3312:3312" # prometheus metrics # we need a separate metrics port for each component
- "3320:3320" # proof_data_handler api
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
zkstack-apis:
networks:
- zkstack
Expand All @@ -44,101 +47,88 @@ services:
zkstack-prover-fri-gateway:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/prover-fri-gateway/Dockerfile
image: matterlabs/prover-fri-gateway:latest
depends_on:
zkstack-core:
condition: "service_healthy"
env_file:
- ./common.env
env:
FRI_PROVER_GATEWAY_API_URL: http://zkstack-core:3075
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
- {{envFilePath}}
environment:
FRI_PROVER_GATEWAY_API_URL: http://zkstack-core:3320
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-witness-generator-basic-circuits:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/witness-generator/Dockerfile
image: matterlabs/witness-generator:latest
hatemosphere marked this conversation as resolved.
Show resolved Hide resolved
command: ["--round", "basic_circuits"]
env_file:
- {{envFilePath}}
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-witness-generator-leaf-aggregation:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/witness-generator/Dockerfile
image: matterlabs/witness-generator:latest
command: ["--round", "leaf_aggregation"]
env_file:
- {{envFilePath}}
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-witness-generator-node-aggregation:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/witness-generator/Dockerfile
image: matterlabs/witness-generator:latest
command: ["--round", "node_aggregation"]
env_file:
- {{envFilePath}}
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-witness-generator-scheduler:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/witness-generator/Dockerfile
image: matterlabs/witness-generator:latest
command: ["--round", "scheduler"]
env_file:
- {{envFilePath}}
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-prover-fri:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/prover-fri/Dockerfile
image: matterlabs/prover-fri:latest
env_file:
- {{envFilePath}}
env:
FRI_PROVER_SETUP_DATA_PATH: /etc/prover_setup_data
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- ./prover_setup-data:/etc/prover_setup_data
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
zkstack-proof-fri-compressor:
networks:
- zkstack
build:
context: .
dockerfile: ./docker/proof-fri-compressor/Dockerfile
image: matterlabs/proof-fri-compressor:latest
env_file:
- {{envFilePath}}
ports: # assumes default ports in .env
- "3312:3312" # prometheus metrics
# ports: # assumes default ports in .env
# - "3312:3312" # prometheus metrics
volumes:
- prover_artifacts:/etc_prover_artifacts
- server_artifacts:/etc_server_artifacts
- artifacts:{{artifactsPath}}
- {{proverSetupArtifacts}}:{{proverSetupArtifacts}}
{{/if}}

Loading