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: FFLONK support for compressor #3359

Open
wants to merge 241 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
976e550
switch compression to fflonk
itegulov Aug 19, 2024
75bb3a4
Merge remote-tracking branch 'origin/main' into daniyar/fflonk
itegulov Aug 22, 2024
175d987
debug
itegulov Aug 22, 2024
01b5bf8
update fflonk dependencies
itegulov Aug 26, 2024
61915d5
Merge remote-tracking branch 'origin/main' into daniyar/fflonk
itegulov Aug 26, 2024
e16afbb
use setup_2^26 for CRS
itegulov Aug 26, 2024
ab463f7
increase timeout
itegulov Aug 26, 2024
1eff67d
print timeout error
itegulov Aug 26, 2024
ed64ac9
use setup_fflonk.key for CRS
itegulov Aug 29, 2024
b931948
Merge remote-tracking branch 'origin/main' into daniyar/fflonk
itegulov Aug 29, 2024
d6eafce
Merge remote-tracking branch 'origin/main' into daniyar/fflonk
itegulov Oct 7, 2024
3ac09ce
adapt code to fflonk-gpu
itegulov Oct 7, 2024
b2d5000
try 5 steps + precomputed setup data
itegulov Oct 9, 2024
264e69f
revert hardest
itegulov Oct 9, 2024
9920051
write compression proof
itegulov Oct 10, 2024
ebd5c7c
write compression vk
itegulov Oct 10, 2024
295990c
add a hacky way to generate FFLONK setup data
itegulov Oct 10, 2024
ba6791d
avoid calling gpu methods
itegulov Oct 10, 2024
169a6b5
use freshly generated setup data
itegulov Oct 10, 2024
d1178f7
update fflonk deps
itegulov Oct 10, 2024
78fedef
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Oct 15, 2024
31525f5
fix cargo.lock
Artemka374 Oct 15, 2024
fb9bcb1
initial refactoring
Artemka374 Oct 16, 2024
852c749
fix test
Artemka374 Oct 17, 2024
001ae61
return old compressor back
Artemka374 Oct 18, 2024
2e5043c
try fix build
Artemka374 Oct 18, 2024
c30d79b
Merge branch 'main' into daniyar/fflonk
Artemka374 Oct 18, 2024
bc070c4
use other approach for different proofs
Artemka374 Oct 18, 2024
c35745f
Merge remote-tracking branch 'origin/daniyar/fflonk' into daniyar/fflonk
Artemka374 Oct 18, 2024
df58203
fix build
Artemka374 Oct 18, 2024
25a8d2e
fix build
Artemka374 Oct 18, 2024
22fff07
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Oct 21, 2024
59faf9b
fix build
Artemka374 Oct 21, 2024
7dd3ba3
change proof struct
Artemka374 Oct 21, 2024
d3dbaf5
add keystore stub
Artemka374 Oct 21, 2024
b45a6da
fix build
Artemka374 Oct 21, 2024
05286b4
add fflonk feature to zkstack
Artemka374 Oct 22, 2024
b3995d4
Merge remote-tracking branch 'origin/daniyar/fflonk' into daniyar/fflonk
Artemka374 Oct 22, 2024
2d7572c
adjust eth_sender to work with new proofs(plonk is disabled for now)
Artemka374 Oct 22, 2024
924bdeb
fix imports in compressor
Artemka374 Oct 22, 2024
f2b43e7
make some deps optional
Artemka374 Oct 22, 2024
3c2fa71
fix lint
Artemka374 Oct 22, 2024
5d7ae04
fix a few other things
Artemka374 Oct 22, 2024
b2594e7
fix build
Artemka374 Oct 23, 2024
837ea8b
add compressor keys to zkstack_cli
Artemka374 Oct 24, 2024
8544d16
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Oct 24, 2024
0171eed
fix downloading compressor keys
Artemka374 Oct 25, 2024
90be08b
fmt, adjust vks a bit
Artemka374 Oct 25, 2024
f02c6d2
merge main
Artemka374 Oct 28, 2024
e76ed7f
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Oct 28, 2024
efed1ac
Merge remote-tracking branch 'origin/daniyar/fflonk' into daniyar/fflonk
Artemka374 Oct 28, 2024
34f542d
Fix deps for zksync_utils
popzxc Oct 30, 2024
f27a2a4
Glue sort_storage_access_queries to latest sequencer API
popzxc Oct 30, 2024
6dc05d8
Multivm compiles on stable
popzxc Oct 31, 2024
dee361e
fix dependencies, continue reworking keystore
Artemka374 Oct 31, 2024
e45f0e8
bump dependencies
Artemka374 Nov 1, 2024
019e33d
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Nov 1, 2024
3de4496
fix cargo.lock
Artemka374 Nov 1, 2024
4acdd70
update cargo toml
Artemka374 Nov 1, 2024
3cdcae8
enable plonk in eth sender
Artemka374 Nov 1, 2024
dc78371
adjust compressor and vk generator to new crypto deps
Artemka374 Nov 1, 2024
0a37276
Merge branch 'main' into daniyar/fflonk
Artemka374 Nov 1, 2024
a38be1e
fix build for key generator
Artemka374 Nov 4, 2024
0df8945
Merge remote-tracking branch 'origin/daniyar/fflonk' into daniyar/fflonk
Artemka374 Nov 4, 2024
08fc7ec
Merge branch 'main' into daniyar/fflonk
Artemka374 Nov 4, 2024
bcecc16
fmt
Artemka374 Nov 4, 2024
f44c2bd
fix build for prover images
Artemka374 Nov 4, 2024
cf780a9
try fixing cargo lock
Artemka374 Nov 4, 2024
4ad7509
try fixing cargo lock
Artemka374 Nov 4, 2024
549a6a9
fix builds
Artemka374 Nov 4, 2024
f8f59bf
fix build more, fix fmt
Artemka374 Nov 4, 2024
2e372a1
fix circuit prover build
Artemka374 Nov 4, 2024
69e88c3
remove loading compression keys for now
Artemka374 Nov 4, 2024
f511d1d
fix build prover binaries
Artemka374 Nov 5, 2024
1b882ca
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Nov 5, 2024
76c6bfb
fix vk generation
Artemka374 Nov 5, 2024
a7e004d
fix vk generation #2
Artemka374 Nov 5, 2024
c303551
fix vk generation #3
Artemka374 Nov 5, 2024
01762e1
fix vk generation #4
Artemka374 Nov 5, 2024
dccc9d7
fix vk generation #5
Artemka374 Nov 5, 2024
4d3a733
add prover context
Artemka374 Nov 5, 2024
fe574c6
fix saving vks
Artemka374 Nov 6, 2024
e688b6e
fix saving vks
Artemka374 Nov 6, 2024
c2a34ed
fix snark VK generation
Artemka374 Nov 6, 2024
723dbaf
try fix setup generation
Artemka374 Nov 6, 2024
8baf3f3
fix setup generation
Artemka374 Nov 6, 2024
92c9025
generate new vks
Artemka374 Nov 6, 2024
1ebb279
fix setup generation, bump deps
Artemka374 Nov 6, 2024
fbdbce7
fix e2e
Artemka374 Nov 6, 2024
2e7967d
adapt proof compressor to precomputed setup
Artemka374 Nov 7, 2024
0ba982b
fix prover build
Artemka374 Nov 8, 2024
9252602
fix compressor
Artemka374 Nov 8, 2024
175986c
Merge branch 'main' into popzxc-stable-rust
popzxc Nov 11, 2024
1f6c673
Merge main
popzxc Nov 11, 2024
b5e9e27
remove fflonk feature
Artemka374 Nov 12, 2024
7de9135
fix build, fix zkstack prover run
Artemka374 Nov 12, 2024
dacd488
impl basic CI update for fflonk
Artemka374 Nov 13, 2024
ee28a19
Merge branch 'main' into daniyar/fflonk
Artemka374 Nov 13, 2024
b58bfc5
fix lint, impl fflonk e2e more
Artemka374 Nov 13, 2024
7f15f0f
Merge remote-tracking branch 'origin/daniyar/fflonk' into daniyar/fflonk
Artemka374 Nov 13, 2024
959490c
fix lint, pass bellman cuda to build binaries
Artemka374 Nov 13, 2024
c753c4a
update compression mode
Artemka374 Nov 13, 2024
32255b0
remove compression proof
Artemka374 Nov 13, 2024
e054b90
update autocompletion
Artemka374 Nov 13, 2024
0a9c239
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Nov 18, 2024
b78b2e4
fix autocompletion
Artemka374 Nov 18, 2024
56c5066
bump dependencies
Artemka374 Nov 19, 2024
e197bc5
update VKs, fix CLI
Artemka374 Nov 19, 2024
d39c585
initial preparation of core codebase
Artemka374 Nov 20, 2024
45ff601
fix builds
Artemka374 Nov 20, 2024
96078b7
generate new VKs
Artemka374 Nov 20, 2024
0107be5
checkout another branch of contracts
Artemka374 Nov 21, 2024
fe898af
fix lint
Artemka374 Nov 21, 2024
afdf441
return old CI back
Artemka374 Nov 21, 2024
d3e398a
fix tab
Artemka374 Nov 21, 2024
190ae28
remove var
Artemka374 Nov 21, 2024
8694a0a
fmt
Artemka374 Nov 21, 2024
c3b2460
Merge main
popzxc Nov 22, 2024
3275cf1
use new dependencies
Artemka374 Nov 22, 2024
837ea56
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Nov 22, 2024
f8683cd
fix build
Artemka374 Nov 22, 2024
e10cc0a
Core compiles
popzxc Nov 22, 2024
6a6c6c0
Prover compiles
popzxc Nov 22, 2024
88eacad
fmt
popzxc Nov 22, 2024
e24d512
Remove unneded file
popzxc Nov 22, 2024
07dfdf9
Fix build for gpu prover
popzxc Nov 22, 2024
bef7828
make setup generator work with correct fflonk vk
Artemka374 Nov 25, 2024
3003016
generate new fflonk vk
Artemka374 Nov 25, 2024
1df00ec
uncomment generate commitments
Artemka374 Nov 25, 2024
e3c0eb7
update setup generation to not break scheduler key
Artemka374 Nov 26, 2024
76262ff
rename snark VKs
Artemka374 Nov 26, 2024
3b1354f
change filepath for snark vk
Artemka374 Nov 26, 2024
49ac31c
rename snark VKs once again
Artemka374 Nov 26, 2024
bc36651
fix a few more things
Artemka374 Nov 27, 2024
4def64c
generate correct VKs
Artemka374 Nov 27, 2024
4cbb544
chore: Update generated Prover FRI GPU setup-data keys from branch po…
zksync-admin-bot2 Nov 28, 2024
12b6743
Merge branch 'refs/heads/main' into popzxc-stable-rust
Artemka374 Nov 28, 2024
0b8d354
fix Cargo.lock
Artemka374 Nov 28, 2024
14cb430
fix lint, build
Artemka374 Nov 28, 2024
9590bc1
Merge branch 'refs/heads/main' into daniyar/fflonk
Artemka374 Nov 29, 2024
e069d6c
fix cargo.lock
Artemka374 Nov 29, 2024
dbb140c
fix feature for shivini
Artemka374 Dec 2, 2024
cd52eec
add feature flags where needed for keystore
Artemka374 Dec 4, 2024
fed8c17
Merge branch 'refs/heads/popzxc-stable-rust' into afo/fflonk
Artemka374 Dec 4, 2024
750673a
fix cargo.lock after merge
Artemka374 Dec 4, 2024
cad280a
fix builds
Artemka374 Dec 4, 2024
8805dd2
Merge branch 'main' into afo/fflonk
Artemka374 Dec 4, 2024
ed3c3b9
checkout contracts commit
Artemka374 Dec 4, 2024
9f37ad7
Merge remote-tracking branch 'origin/afo/fflonk' into afo/fflonk
Artemka374 Dec 4, 2024
2ac76f1
update contracts rev
Artemka374 Dec 4, 2024
1c00984
fix calling contract
Artemka374 Dec 4, 2024
f993307
maybe fix l1 interface
Artemka374 Dec 5, 2024
9d4f0b2
fix hashes, getting vk hash
Artemka374 Dec 6, 2024
da7f78c
fix verifier differentiation, try fixing the proof length
Artemka374 Dec 6, 2024
9ad683e
fix verifier differentiation, try fixing the proof length
Artemka374 Dec 6, 2024
7f55be9
fix lagrange basis
Artemka374 Dec 6, 2024
47a5525
temorarily disable warnings
Artemka374 Dec 9, 2024
0c494df
try to fix CI
Artemka374 Dec 9, 2024
0eb7676
Merge remote-tracking branch 'origin/afo/fflonk' into afo/fflonk
Artemka374 Dec 9, 2024
8f48976
fix typo
Artemka374 Dec 9, 2024
5ee8a36
chore: Update generated Prover FRI GPU setup-data keys from branch af…
zksync-admin-bot2 Dec 9, 2024
477e3b4
Trigger Build
Artemka374 Dec 9, 2024
2760b08
use another approach for setting bellman-cuda
Artemka374 Dec 9, 2024
040253b
Merge remote-tracking branch 'origin/afo/fflonk' into afo/fflonk
Artemka374 Dec 9, 2024
9903f87
maybe fix CI
Artemka374 Dec 9, 2024
a99caf4
fix bellman-cuda problem
Artemka374 Dec 9, 2024
6fe62d3
fix lint
Artemka374 Dec 9, 2024
bbce735
Merge branch 'refs/heads/main' into afo/fflonk
Artemka374 Dec 9, 2024
9073736
fix some issues, disable fflonk-gpu by default in keystore
Artemka374 Dec 9, 2024
04bdb83
use cuda stubs on building the workspace
Artemka374 Dec 9, 2024
1913a3a
fix build for compressor
Artemka374 Dec 9, 2024
98d1b51
maybe fix deps once again
Artemka374 Dec 9, 2024
27a39c3
maybe fix deps once again
Artemka374 Dec 9, 2024
221af86
fix issue with features
Artemka374 Dec 10, 2024
d789bbb
fix lints, increase timeouts, fix build
Artemka374 Dec 10, 2024
e84ea57
add cuda stubs for lint & fmt
Artemka374 Dec 10, 2024
10de1f7
fix build for keystore
Artemka374 Dec 10, 2024
e37b45b
fix lint, fix build
Artemka374 Dec 10, 2024
25bec51
fix e2e
Artemka374 Dec 10, 2024
6ec1d16
fix autocompletion
Artemka374 Dec 10, 2024
c954f47
fix e2e test
Artemka374 Dec 10, 2024
f5a4143
fix e2e test
Artemka374 Dec 10, 2024
2aa3ff9
fix e2e test
Artemka374 Dec 10, 2024
66078c5
update deps
Artemka374 Dec 11, 2024
20a698e
adjust changes to not break anything
Artemka374 Dec 12, 2024
1cbd575
fix some issues with contracts
Artemka374 Dec 12, 2024
6afcdab
fix lint & build
Artemka374 Dec 12, 2024
e6438ee
fix a few more issues
Artemka374 Dec 12, 2024
a129450
fix build
Artemka374 Dec 12, 2024
b62e30a
try to fix fflonk CI
Artemka374 Dec 13, 2024
90c9020
Merge branch 'refs/heads/main' into afo/fflonk
Artemka374 Dec 13, 2024
1513b7a
try to fix fflonk CI
Artemka374 Dec 13, 2024
5a4f53f
fix zkstack
Artemka374 Dec 13, 2024
b5c69cb
fix zkstack
Artemka374 Dec 13, 2024
f2558a6
lint autocompletion
Artemka374 Dec 13, 2024
eba5d5e
fix CI
Artemka374 Dec 13, 2024
2b0fe46
fmt
Artemka374 Dec 13, 2024
38baa92
try to fix ci once again
Artemka374 Dec 13, 2024
5bcab6c
try to fix ci once again
Artemka374 Dec 13, 2024
1632cc9
try to fix ci once again
Artemka374 Dec 13, 2024
16e8c43
fix zkstack
Artemka374 Dec 13, 2024
f0f0b2f
try fix fflonk ci
Artemka374 Dec 13, 2024
36c7bd1
try fix fflonk ci
Artemka374 Dec 13, 2024
39821dc
try fix fflonk ci
Artemka374 Dec 13, 2024
6c671a9
try fix fflonk ci
Artemka374 Dec 13, 2024
5c53770
try fix fflonk ci
Artemka374 Dec 13, 2024
c3866f0
try fix fflonk ci
Artemka374 Dec 13, 2024
ef1f29e
try fix fflonk ci
Artemka374 Dec 13, 2024
dceb6be
try fix fflonk ci
Artemka374 Dec 13, 2024
765fcb1
try fix fflonk ci
Artemka374 Dec 13, 2024
715fe80
print prover info
Artemka374 Dec 13, 2024
c45744b
get commit of contracts
Artemka374 Dec 13, 2024
9342a69
add some logging
Artemka374 Dec 13, 2024
187a64d
update dependencies
Artemka374 Dec 18, 2024
03b204c
update dependencies
Artemka374 Dec 18, 2024
9dbda25
update dependencies
Artemka374 Dec 18, 2024
dc3bba7
generate new VKs
Artemka374 Dec 18, 2024
9c97918
Merge branch 'main' into afo/fflonk
Artemka374 Dec 18, 2024
efa4eaa
update CI
Artemka374 Dec 18, 2024
0766cca
update cargo.lock
Artemka374 Dec 18, 2024
6e0fdec
chore: Update generated Prover FRI GPU setup-data keys from branch af…
zksync-admin-bot2 Dec 18, 2024
a099b19
probably fix plonk part
Artemka374 Dec 18, 2024
c5953ec
merge main
Artemka374 Dec 19, 2024
5b4163c
try to fix fflonk e2e
Artemka374 Dec 19, 2024
26ac57a
try to fix fflonk e2e
Artemka374 Dec 19, 2024
3ab2534
try to fix fflonk e2e
Artemka374 Dec 20, 2024
07857d5
try to fix fflonk e2e
Artemka374 Dec 20, 2024
ae4a391
add sudo
Artemka374 Dec 20, 2024
620676e
Merge branch 'refs/heads/main' into afo/fflonk
Artemka374 Dec 20, 2024
2ec536d
fix e2e test(probably)
Artemka374 Dec 20, 2024
8b10af6
fix e2e test(probably finally)
Artemka374 Dec 20, 2024
32a0951
fix build
Artemka374 Dec 20, 2024
a961e69
disable updating submodules
Artemka374 Dec 20, 2024
c5aad48
fix build
Artemka374 Dec 20, 2024
ca1c1cc
fix build
Artemka374 Dec 20, 2024
6475d4e
update dependencies, fix build
Artemka374 Dec 20, 2024
22de0c9
fix test
Artemka374 Dec 20, 2024
54a61c7
fix lint
Artemka374 Dec 20, 2024
e4ab244
fix tests
Artemka374 Dec 20, 2024
2db5063
address comments
Artemka374 Dec 20, 2024
68a1f14
fix build
Artemka374 Dec 20, 2024
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
56 changes: 39 additions & 17 deletions .github/workflows/ci-prover-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ on:
jobs:
e2e-test:
runs-on: [ matterlabs-ci-gpu-l4-runner-prover-tests ]
strategy:
fail-fast: false
matrix:
compressor-mode: ["fflonk", "plonk"]
env:
RUNNER_COMPOSE_FILE: "docker-compose-gpu-runner-cuda-12-0.yml"

Expand All @@ -24,17 +28,26 @@ jobs:
echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> .env
echo "RUSTC_WRAPPER=sccache" >> .env

mkdir -p prover_logs
mkdir -p prover_logs_${{matrix.compressor-mode}}

- name: Start services
run: |
run_retried docker-compose -f ${RUNNER_COMPOSE_FILE} pull
docker-compose -f ${RUNNER_COMPOSE_FILE} --profile runner up -d --wait
ci_run sccache --start-server
ci_run git config --global --add safe.directory "*"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whilst not a problem, any reason for moving this change from Init to start services?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just because for checkouting/updating submodules I needed this to be before actual checkout


- name: Checkout DualVerifier commit
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uh-oh, can't wait to get rid of this, but decent workaround for the time being.

working-directory: ./contracts
if: matrix.compressor-mode == 'fflonk'
run: |
git fetch
git checkout b4d5b984
git submodule update --init --recursive
git rev-parse HEAD

- name: Init
run: |
ci_run git config --global --add safe.directory "*"
ci_run chmod -R +x ./bin

ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup || true
Expand All @@ -51,28 +64,37 @@ jobs:
--base-token-price-denominator 1 \
--set-as-default true \
--ignore-prerequisites \
--evm-emulator false
--evm-emulator false \
--update-submodules=${{matrix.compressor-mode == 'plonk'}}

ci_run zkstack ecosystem init --dev --update-submodules=${{matrix.compressor-mode == 'plonk'}} --verbose

ci_run zkstack ecosystem init --dev --verbose
ci_run zkstack prover init --dev --verbose

echo "URL=$(grep "http_url" ./chains/proving_chain/configs/general.yaml | awk '{ print $2 }')" >> $GITHUB_ENV
- name: Build prover binaries
Artemka374 marked this conversation as resolved.
Show resolved Hide resolved

- name: Switch verifier to FFLONK interface
working-directory: ./chains/proving_chain/configs
if: matrix.compressor-mode == 'fflonk'
run: |
ci_run cargo build --release --workspace --manifest-path=prover/Cargo.toml
sudo sed -i 's/is_verifier_pre_fflonk: true/is_verifier_pre_fflonk: false/' general.yaml
grep "is_verifier_pre_fflonk" general.yaml | awk '{ print $2 }'

- name: Prepare prover subsystem
run: |
ci_run zkstack prover init-bellman-cuda --clone --verbose
ci_run zkstack prover setup-keys --mode=download --region=us --verbose

- name: Run server
run: |
ci_run zkstack server --uring --chain=proving_chain --components=api,tree,eth,state_keeper,commitment_generator,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip &>prover_logs/server.log &
ci_run zkstack server --uring --chain=proving_chain --components=api,tree,eth,state_keeper,commitment_generator,proof_data_handler,vm_runner_protective_reads,vm_runner_bwip &>prover_logs_${{matrix.compressor-mode}}/server.log &
- name: Run Gateway
run: |
ci_run zkstack prover run --component=gateway --docker=false &>prover_logs/gateway.log &
ci_run zkstack prover run --component=gateway --docker=false &>prover_logs_${{matrix.compressor-mode}}/gateway.log &
- name: Run Prover Job Monitor
run: |
ci_run zkstack prover run --component=prover-job-monitor --docker=false &>prover_logs/prover-job-monitor.log &
ci_run zkstack prover run --component=prover-job-monitor --docker=false &>prover_logs_${{matrix.compressor-mode}}/prover-job-monitor.log &
# Sleeping until the server, gateway and prover job monitor are up
ci_run sleep 150
Artemka374 marked this conversation as resolved.
Show resolved Hide resolved
- name: Wait for batch to be passed through gateway
env:
DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain
Expand All @@ -84,31 +106,31 @@ jobs:
ci_run ./bin/prover_checkers/batch_availability_checker
- name: Run Witness Generator
run: |
ci_run zkstack prover run --component=witness-generator --round=all-rounds --docker=false &>prover_logs/witness-generator.log &
ci_run zkstack prover run --component=witness-generator --round=all-rounds --docker=false &>prover_logs_${{matrix.compressor-mode}}/witness-generator.log &
- name: Run Circuit Prover
run: |
ci_run zkstack prover run --component=circuit-prover -l=23 -h=3 --docker=false &>prover_logs/circuit_prover.log &
ci_run zkstack prover run --component=circuit-prover -l=23 -h=3 --docker=false &>prover_logs_${{matrix.compressor-mode}}/circuit_prover.log &
- name: Wait for prover jobs to finish
env:
DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain
BATCH_NUMBER: 1
INTERVAL: 30
TIMEOUT: 1200
TIMEOUT: 1800
run: |
PASSED_ENV_VARS="DATABASE_URL,BATCH_NUMBER,INTERVAL,TIMEOUT" \
ci_run ./bin/prover_checkers/prover_jobs_status_checker

- name: Kill prover & start compressor
run: |
sudo ./bin/prover_checkers/kill_prover
ci_run zkstack prover run --component=compressor --docker=false --mode=${{matrix.compressor-mode}} &>prover_logs_${{matrix.compressor-mode}}/compressor.log &

ci_run zkstack prover run --component=compressor --docker=false &>prover_logs/compressor.log &
- name: Wait for batch to be executed on L1
env:
DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain
BATCH_NUMBER: 1
INTERVAL: 30
TIMEOUT: 600
TIMEOUT: 1200
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see a bunch of timeouts have been increased. Is this caused by a slowdown in the process, or why is it necessary?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need it since build time is increased

run: |
PASSED_ENV_VARS="BATCH_NUMBER,DATABASE_URL,URL,INTERVAL,TIMEOUT" \
ci_run ./bin/prover_checkers/batch_l1_status_checker
Expand All @@ -117,8 +139,8 @@ jobs:
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: always()
with:
name: prover_logs
path: prover_logs
name: prover_logs_${{matrix.compressor-mode}}
path: prover_logs_${{matrix.compressor-mode}}

- name: Show sccache logs
if: always()
Expand Down
Loading
Loading