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(contracts)!: synclayer integration #1934

Draft
wants to merge 295 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
295 commits
Select commit Hold shift + click to select a range
7983315
custom DA with SL for first layer
StanislavBreadless Jun 20, 2024
9276bc5
custom da layer with server
StanislavBreadless Jun 21, 2024
811efe6
remove debug info
StanislavBreadless Jun 21, 2024
b1e5e23
make rust unit tests pass
StanislavBreadless Jun 21, 2024
023a2f1
cargo fix1
StanislavBreadless Jun 21, 2024
91a976f
cargo fix2
StanislavBreadless Jun 21, 2024
ce79734
cargo fix
StanislavBreadless Jun 21, 2024
b008063
resolve lint
StanislavBreadless Jun 21, 2024
c645e22
It compiles
ly0va Jun 16, 2024
e514925
latest contracts
StanislavBreadless Jun 24, 2024
e0ad4ca
upd configs
StanislavBreadless Jun 24, 2024
a1f1a69
Update contracts (#2288)
StanislavBreadless Jun 24, 2024
10c4f7f
upd contracts
StanislavBreadless Jun 24, 2024
61f4a7f
upd contracts
StanislavBreadless Jun 24, 2024
87dad50
return from accidental change
StanislavBreadless Jun 24, 2024
a45cfd3
sync with base
StanislavBreadless Jun 24, 2024
8badad6
upd contracts
StanislavBreadless Jun 24, 2024
8b8d427
Merge pull request #2295 from matter-labs/sb-custom-da-with-sl
StanislavBreadless Jun 25, 2024
267f742
wip contracts
StanislavBreadless Jun 25, 2024
6deefc0
upd contracts
StanislavBreadless Jun 25, 2024
75dfe4a
basic integration
StanislavBreadless Jun 25, 2024
09c0391
make withdrawals on top of one chain pass
StanislavBreadless Jun 25, 2024
e252bdc
some basic api for proofs of batch inclusion
StanislavBreadless Jun 26, 2024
3b4c0aa
Add priorityTree layer
ly0va Jun 26, 2024
13d1321
Bump contracts
ly0va Jun 26, 2024
c28acb4
agg root in db
StanislavBreadless Jun 26, 2024
16ef371
Add the forgotten file
ly0va Jun 26, 2024
f4ab30f
Merge branch 'sync-layer-stable' into lyova-integrate-priority-merkle…
ly0va Jun 26, 2024
06c118e
withdrawals work for 1 layer and agg proof is corect
StanislavBreadless Jun 26, 2024
ba6a188
Bump contracts
ly0va Jun 26, 2024
ecc0d2a
zk fmt
ly0va Jun 26, 2024
066232f
feat: more system contracts support, WIP (#2273)
kelemeno Jun 26, 2024
29a49e8
comms work
StanislavBreadless Jun 27, 2024
b416ea8
Fix caching bug
ly0va Jun 27, 2024
a0eebb1
Tests and fixes
ly0va Jun 27, 2024
52c99cd
new contracts
StanislavBreadless Jun 27, 2024
67a40b3
sync with base
StanislavBreadless Jun 27, 2024
a6a8c0f
int tests with withdrawals work
StanislavBreadless Jun 27, 2024
2b928a0
feat: blobhash-compilation-fix-support (#2336)
kelemeno Jun 27, 2024
c61ac5d
partially resolve unit tests
StanislavBreadless Jun 27, 2024
26b86b2
upd env
StanislavBreadless Jun 27, 2024
e820f90
feat: bump contracts (#2342)
kelemeno Jun 27, 2024
25bcfdf
Fix PQ->PT switch
ly0va Jun 27, 2024
7e192d8
Bump contracts
ly0va Jun 27, 2024
9fa2799
Merge remote-tracking branch 'origin/sync-layer-stable' into lyova-in…
ly0va Jun 27, 2024
bdcf4a5
Fix sqlx data
ly0va Jun 28, 2024
516477c
Fix config
ly0va Jun 28, 2024
bfde615
Temporarily do deposits sequentially
ly0va Jun 28, 2024
96a3fe2
Merge branch 'sync-layer-stable' of github.com:matter-labs/zksync-era…
kelemeno Jun 28, 2024
a8b2040
bump contracts. small config fix
kelemeno Jun 28, 2024
8e48e29
contracts.toml
kelemeno Jun 28, 2024
0a29c9b
Bump contracts
ly0va Jun 29, 2024
01feafb
Fix lint
ly0va Jun 29, 2024
a79c2a4
Update config
ly0va Jun 29, 2024
fc1ff7f
Merge pull request #2335 from matter-labs/lyova-integrate-priority-me…
ly0va Jun 29, 2024
07f9918
Point contracts to sync-layer-stable
ly0va Jun 29, 2024
cc0ea83
feat(pubdata): send call encoded pubdata (#2360)
koloz193 Jul 2, 2024
e1e8ffb
Merge remote-tracking branch 'origin/main' into sync-layer-stable
ly0va Jul 7, 2024
e9a7e3d
zk fmt
ly0va Jul 8, 2024
6d411bd
Merge remote-tracking branch 'origin/sync-layer-stable' into lyova-me…
ly0va Jul 8, 2024
1e698d2
Fix Cargo.lock
ly0va Jul 8, 2024
af08291
Fix workflow file
ly0va Jul 8, 2024
35c45a8
Bump contracts
ly0va Jul 8, 2024
a437013
Fix deprecated warning
ly0va Jul 8, 2024
846e0a8
Config fixes
ly0va Jul 8, 2024
fb06a06
Merge branch 'sync-layer-stable' into sb-l3-l1-comms-integration
koloz193 Jul 8, 2024
662012f
add message root init to tests
koloz193 Jul 8, 2024
e75fe6e
bump sleep term
koloz193 Jul 10, 2024
3b3c444
fix execute batch txns not being generated
koloz193 Jul 11, 2024
13e8766
toml update
koloz193 Jul 11, 2024
adb20f4
update contracts
koloz193 Jul 11, 2024
c68df66
bump contracts
koloz193 Jul 11, 2024
3a6a3e9
bump sleep before finalize
koloz193 Jul 12, 2024
ec8c895
increase timeout
koloz193 Jul 12, 2024
436b176
revert changes to tests
koloz193 Jul 12, 2024
237f346
change waitFinalize for waitUntilBlockFinalized
koloz193 Jul 12, 2024
03a598b
bump balances
koloz193 Jul 12, 2024
06692d5
Revert "bump balances"
koloz193 Jul 12, 2024
77a76ec
skip tests
koloz193 Jul 12, 2024
a43890b
lint fix + remove describe only
StanislavBreadless Jul 22, 2024
e92cfaf
cargo deny fix
StanislavBreadless Jul 22, 2024
c501bfb
try increase the timeout
StanislavBreadless Jul 22, 2024
fd5fbf5
increase timeout for erc20
StanislavBreadless Jul 22, 2024
893ea83
make timeout even higher
StanislavBreadless Jul 22, 2024
b2f9f59
larger capacity for base docker pubdata
StanislavBreadless Jul 22, 2024
ad53507
remove fixme comments
StanislavBreadless Jul 22, 2024
3d45145
Merge pull request #2339 from matter-labs/sb-l3-l1-comms-integration
StanislavBreadless Jul 22, 2024
499fde7
Fix some todos
ly0va Jul 22, 2024
9c21571
Merge remote-tracking branch 'origin/sync-layer-stable' into lyova-me…
ly0va Jul 22, 2024
c9336a0
Fix stuff
ly0va Jul 23, 2024
45410cb
basic test fix
StanislavBreadless Jul 25, 2024
8bbc8dc
remove unneeded method
StanislavBreadless Jul 25, 2024
8284e4d
fix server launch
StanislavBreadless Jul 26, 2024
ac2c988
add some comments
StanislavBreadless Jul 26, 2024
2292764
fixme comment
StanislavBreadless Jul 26, 2024
1ae4ca6
Fix prover tests
ly0va Jul 26, 2024
ce1193c
Update lockfile
ly0va Jul 26, 2024
7d307e7
Fix prover tests again
ly0va Jul 26, 2024
07c97ef
Update Cargo.lock
ly0va Jul 26, 2024
58526e3
Update deny.toml
ly0va Jul 26, 2024
52c098e
Fix compilation
ly0va Jul 26, 2024
402f1f8
add tokio runtime
StanislavBreadless Jul 26, 2024
994f6e6
fix how stdout works
StanislavBreadless Jul 28, 2024
a96f7ec
Merge remote-tracking branch 'origin/main' into lyova-merged-sync-lay…
ly0va Jul 29, 2024
dad7496
Resolve post-merge errors
ly0va Jul 29, 2024
21873b3
Fix EN tests
ly0va Jul 29, 2024
ba55906
Bump contracts
ly0va Jul 30, 2024
5f985b2
Update env
ly0va Jul 30, 2024
de1c528
fix init
StanislavBreadless Jul 30, 2024
86b0aaf
fmt
StanislavBreadless Jul 30, 2024
c34ab64
fix more int tests
StanislavBreadless Jul 30, 2024
dd76add
fmt
StanislavBreadless Jul 30, 2024
12ca5e2
fmt
StanislavBreadless Jul 30, 2024
144d247
sync with upstream
StanislavBreadless Jul 30, 2024
49d8889
upd contracts
StanislavBreadless Jul 30, 2024
7633725
int tests passing
StanislavBreadless Jul 30, 2024
cf5174b
turn off unused test
StanislavBreadless Jul 30, 2024
d788056
Merge pull request #2504 from matter-labs/sb-fix-rust-unit-tests
ly0va Jul 30, 2024
80b2974
Fix lints
ly0va Jul 31, 2024
0544b80
Fix Cargo.lock
ly0va Jul 31, 2024
f4ae9dc
Bump contracts
ly0va Jul 31, 2024
6611cb6
Lints
ly0va Jul 31, 2024
1f8d583
Bump contracts
ly0va Jul 31, 2024
4ceed3a
Merge pull request #2395 from matter-labs/lyova-merged-sync-layer-stable
ly0va Jul 31, 2024
6ff1eed
compiles at least partially
StanislavBreadless Aug 6, 2024
f09395f
fix config
StanislavBreadless Aug 6, 2024
bbbfa3a
lint
StanislavBreadless Aug 6, 2024
ab08012
comment out upgrade test also
StanislavBreadless Aug 6, 2024
ab68243
Merge pull request #2597 from matter-labs/sb-merge-main-sync-layer-st…
StanislavBreadless Aug 6, 2024
9cb44cf
resolve env hack
StanislavBreadless Aug 7, 2024
53b0274
small refactor
StanislavBreadless Aug 7, 2024
7aa5fec
fix lint
StanislavBreadless Aug 8, 2024
0a91d44
lint fix
StanislavBreadless Aug 8, 2024
b210b71
Merge pull request #2619 from matter-labs/sb-resolve-env-hack
StanislavBreadless Aug 8, 2024
f21fe46
more substantial sync layer -> gateway rename
StanislavBreadless Aug 14, 2024
79dcf3a
using latest contracts
StanislavBreadless Aug 14, 2024
453e175
use the new contracts
StanislavBreadless Aug 14, 2024
2bd57d5
Merge pull request #2650 from matter-labs/sb-sync-kl-sync-layer-reorg
StanislavBreadless Aug 14, 2024
5c4d1b0
sync with main
StanislavBreadless Aug 15, 2024
720ddc5
rust unit tests pass
StanislavBreadless Aug 15, 2024
e1c690d
complete migration
StanislavBreadless Aug 15, 2024
f80c439
zk
StanislavBreadless Aug 15, 2024
bcc3bac
merge main
StanislavBreadless Aug 15, 2024
a9fce37
sync with main for the second time
StanislavBreadless Aug 15, 2024
b992232
fix lint
StanislavBreadless Aug 15, 2024
0f1985f
Merge pull request #2664 from matter-labs/sb-merge-main-into-sync-lay…
StanislavBreadless Aug 15, 2024
a4ff817
int tests work
StanislavBreadless Aug 17, 2024
2f00ac8
fmt
StanislavBreadless Aug 17, 2024
7a0b777
fix config
StanislavBreadless Aug 17, 2024
fd1b3a0
upd contracts scripts
StanislavBreadless Aug 18, 2024
85a20f6
updated contracts commit
StanislavBreadless Aug 19, 2024
a95ce19
int tests pass
StanislavBreadless Aug 19, 2024
1f12cdb
reduce owner usage in init
StanislavBreadless Aug 19, 2024
cf570aa
fmt
StanislavBreadless Aug 19, 2024
73bea05
use latest sync layer stable
StanislavBreadless Aug 19, 2024
e958393
remove unneeded change
StanislavBreadless Aug 19, 2024
959d54f
surpress error
StanislavBreadless Aug 19, 2024
63760c8
use latest contracts
StanislavBreadless Aug 19, 2024
d6e3f1e
another way to fetch l2 token addr
StanislavBreadless Aug 19, 2024
6f978e1
new contracts
StanislavBreadless Aug 19, 2024
6d62682
latest commit
StanislavBreadless Aug 19, 2024
eee0b54
sync with base
StanislavBreadless Aug 19, 2024
410810d
Merge pull request #2677 from matter-labs/sb-sync-kl-reorg
StanislavBreadless Aug 19, 2024
60912f0
latest contracts
StanislavBreadless Aug 20, 2024
e888af9
use sync layer stable
StanislavBreadless Aug 20, 2024
a4edeca
fix gas limit in sdk
StanislavBreadless Aug 20, 2024
a912128
Merge pull request #2681 from matter-labs/sb-make-owner-init-footprin…
StanislavBreadless Aug 20, 2024
3418a13
fix: script fixes (#2701)
kelemeno Aug 21, 2024
5144f70
merge changes from master
tomg10 Aug 21, 2024
c2512e6
experiment
tomg10 Aug 22, 2024
1a9c23c
scripts
tomg10 Aug 22, 2024
b2237ca
fix setting env
StanislavBreadless Aug 22, 2024
89f6b7a
Merge pull request #2712 from matter-labs/sb-new-env-for-sl-stable
StanislavBreadless Aug 23, 2024
1623b54
Merge remote-tracking branch 'origin/sync-layer-stable' into sync-lay…
ly0va Aug 23, 2024
9ced68f
zk fmt
ly0va Aug 23, 2024
ab2470b
Fix imports
ly0va Aug 23, 2024
e6833bb
Try fix CI
ly0va Aug 23, 2024
39a0c0c
Try fix CI
ly0va Aug 24, 2024
79c3fe3
bugfix
tomg10 Aug 26, 2024
62cccc5
bugfix
tomg10 Aug 26, 2024
6826ca4
remove debug
tomg10 Aug 26, 2024
d024128
bugfix
tomg10 Aug 26, 2024
a24856f
linter fix
tomg10 Aug 26, 2024
fc8f9ac
Merge pull request #2710 from matter-labs/sync-layer-stable-tjg
ly0va Aug 26, 2024
650a63a
feat(contracts: integrate protocol defense changes
koloz193 Aug 26, 2024
dd6a4a0
Merge branch 'main' into zk-protocol-defense
koloz193 Aug 26, 2024
1375774
chore: Port kl sync layer reorg to the stable branch (#2747)
StanislavBreadless Aug 27, 2024
d3877f6
update protocol version and multivm bootloaders
koloz193 Aug 27, 2024
4b36af8
Merge branch 'main' into zk-protocol-defense
koloz193 Aug 27, 2024
ca1a396
bump contracts
koloz193 Aug 27, 2024
2f6d9bc
bump contracts
koloz193 Aug 27, 2024
cedfb16
Merge branch 'main' into zk-protocol-defense
koloz193 Aug 27, 2024
91bed09
add submodules ignored folder
StanislavBreadless Aug 28, 2024
4b8a653
Merge branch 'main' into zk-protocol-defense
StanislavBreadless Aug 28, 2024
24ee376
use new contracts
StanislavBreadless Aug 28, 2024
5cd6125
sync with zach branch
StanislavBreadless Aug 28, 2024
bdd468b
unit tests pass
StanislavBreadless Aug 28, 2024
f230a76
upd config
StanislavBreadless Aug 28, 2024
3f6c6e2
lint fix
StanislavBreadless Aug 28, 2024
07fdecc
Merge pull request #2762 from matter-labs/sb-merge-contracts-dev-into…
StanislavBreadless Aug 28, 2024
91f3cdc
chore: message-root-support (#2706)
kelemeno Aug 30, 2024
b908eae
feat(eth-watch): redesign to support Gateway (#2775)
tomg10 Sep 5, 2024
8cfa3f4
feat(contracts): Remove priority op info from gw (#2813)
StanislavBreadless Sep 6, 2024
55276e7
basic sync with main
StanislavBreadless Sep 12, 2024
b824aa9
return commented out tests
StanislavBreadless Sep 12, 2024
a3b64d9
fix lint
StanislavBreadless Sep 12, 2024
a11d3b0
upd contracts
StanislavBreadless Sep 12, 2024
f2d7210
resolve one more conflict
StanislavBreadless Sep 12, 2024
d22f0c3
hopefully fix rust unit test
StanislavBreadless Sep 12, 2024
06445c6
hopefully fix docker init
StanislavBreadless Sep 12, 2024
b199dec
maybe fix unit tests
StanislavBreadless Sep 13, 2024
af7193c
wait a bit longer
StanislavBreadless Sep 13, 2024
e7bc202
sync with main
StanislavBreadless Sep 13, 2024
6bbbce8
fix lock
StanislavBreadless Sep 13, 2024
8358319
turn off loadtest
StanislavBreadless Sep 13, 2024
b519550
fix lock
StanislavBreadless Sep 13, 2024
922dcba
Merge pull request #2858 from matter-labs/sb-sync-main-sl-stable
StanislavBreadless Sep 13, 2024
22a3eef
feat: Kl split-asset-router-support (#2790)
kelemeno Sep 17, 2024
dec82db
chore: bump contracts (#2902)
kelemeno Sep 17, 2024
c037ab8
feat(toolbox): Port toolbox to work with gateway (#2910)
StanislavBreadless Sep 20, 2024
4e76ddd
use synced contracts
StanislavBreadless Sep 21, 2024
8b20416
merge with main
StanislavBreadless Sep 21, 2024
33f847c
latest contracts
StanislavBreadless Sep 21, 2024
4b32fce
fix rust unit
StanislavBreadless Sep 21, 2024
abe5880
comment out unused methods
StanislavBreadless Sep 22, 2024
6ec1373
lint fix
StanislavBreadless Sep 22, 2024
41db321
solve lint
StanislavBreadless Sep 22, 2024
1b619cd
Merge pull request #2932 from matter-labs/sb-sync-layer-toolbox-funct…
StanislavBreadless Sep 22, 2024
01593b0
feat(gateway): Improve variety of chains for sync layer stable (#2938)
StanislavBreadless Sep 23, 2024
86617dd
fix(vm): small fixes for sync-layer-stable (#2943)
perekopskiy Sep 24, 2024
3352655
fix: fix state_diff_hash usage (#2960)
perekopskiy Sep 25, 2024
cf814d1
feat: provide inclusion data as operator_da_input (#2965)
dimazhornyk Sep 26, 2024
0c9b1e3
fix(commiment-generator): compatibility with older protocol versions …
perekopskiy Sep 27, 2024
e4fcbba
feat: sync layer merge main (#2982)
perekopskiy Sep 30, 2024
d17546c
test: Restore commitment tests (#2991)
perekopskiy Oct 2, 2024
257a77a
fix(eth-client): fix l2_fee_history (#2984)
perekopskiy Oct 2, 2024
30636e9
fix
perekopskiy Oct 2, 2024
4a14dc4
upd contracts
StanislavBreadless Oct 2, 2024
2ab3f98
fix: sync layer compatibility (#2976)
perekopskiy Oct 2, 2024
8137980
feat: sync layer merge main (#2997)
perekopskiy Oct 2, 2024
fb21d00
Resolve conflicts
perekopskiy Oct 2, 2024
6b5acb2
Merge branch 'sync-layer-stable' into sb-use-reorg-in-stable
StanislavBreadless Oct 3, 2024
8f43a5f
Merge pull request #2996 from matter-labs/sb-use-reorg-in-stable
StanislavBreadless Oct 3, 2024
dfe03d3
feat: l2 native token tests (#2916)
kelemeno Oct 8, 2024
d31dc15
fix: remove l1 tx merkle tree from eth watch (#3099)
perekopskiy Oct 17, 2024
a5df3c2
feat: merge main to sync-layer-stable (#3182)
perekopskiy Oct 28, 2024
0835f8d
feat: merge main to sync-layer-stable (#3184)
perekopskiy Oct 28, 2024
8d6de59
finally resolve conflicts
perekopskiy Oct 28, 2024
c291a2b
chore: restore DA hash test (#3191)
perekopskiy Oct 29, 2024
4897a6e
feat(gateway): refine l2 l1 logs proofs (#3078)
perekopskiy Oct 31, 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
407 changes: 225 additions & 182 deletions .github/workflows/ci-core-reusable.yml

Large diffs are not rendered by default.

196 changes: 98 additions & 98 deletions .github/workflows/ci-prover-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,101 +26,101 @@ jobs:

mkdir -p prover_logs

- 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

- 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
ci_run zkstackup -g --local
ci_run zkstack chain create \
--chain-name proving_chain \
--chain-id sequential \
--prover-mode gpu \
--wallet-creation localhost \
--l1-batch-commit-data-generator-mode rollup \
--base-token-address 0x0000000000000000000000000000000000000001 \
--base-token-price-nominator 1 \
--base-token-price-denominator 1 \
--set-as-default true \
--ignore-prerequisites

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
run: |
ci_run cargo build --release --workspace --manifest-path=prover/Cargo.toml
- 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 &
- name: Run Gateway
run: |
ci_run zkstack prover run --component=gateway --docker=false &>prover_logs/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 &
- name: Wait for batch to be passed through gateway
env:
DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain
BATCH_NUMBER: 1
INTERVAL: 30
TIMEOUT: 300
run: |
PASSED_ENV_VARS="DATABASE_URL,BATCH_NUMBER,INTERVAL,TIMEOUT" \
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 &
- name: Run Circuit Prover
run: |
ci_run zkstack prover run --component=circuit-prover --witness-vector-generator-count=10 --docker=false &>prover_logs/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
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 &>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
run: |
PASSED_ENV_VARS="BATCH_NUMBER,DATABASE_URL,URL,INTERVAL,TIMEOUT" \
ci_run ./bin/prover_checkers/batch_l1_status_checker

- name: Upload logs
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
if: always()
with:
name: prover_logs
path: prover_logs

- name: Show sccache logs
if: always()
run: |
ci_run sccache --show-stats || true
ci_run cat /tmp/sccache_log.txt || true
# - 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
#
# - 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
# ci_run zkstackup -g --local
#
# ci_run zkstack chain create \
# --chain-name proving_chain \
# --chain-id sequential \
# --prover-mode gpu \
# --wallet-creation localhost \
# --l1-batch-commit-data-generator-mode rollup \
# --base-token-address 0x0000000000000000000000000000000000000001 \
# --base-token-price-nominator 1 \
# --base-token-price-denominator 1 \
# --set-as-default true \
# --ignore-prerequisites
#
# 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
# run: |
# ci_run cargo build --release --workspace --manifest-path=prover/Cargo.toml
# - 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 &
# - name: Run Gateway
# run: |
# ci_run zkstack prover run --component=gateway --docker=false &>prover_logs/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 &
# - name: Wait for batch to be passed through gateway
# env:
# DATABASE_URL: postgres://postgres:notsecurepassword@localhost:5432/zksync_prover_localhost_proving_chain
# BATCH_NUMBER: 1
# INTERVAL: 30
# TIMEOUT: 300
# run: |
# PASSED_ENV_VARS="DATABASE_URL,BATCH_NUMBER,INTERVAL,TIMEOUT" \
# 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 &
# - name: Run Circuit Prover
# run: |
# ci_run zkstack prover run --component=circuit-prover --witness-vector-generator-count=10 --docker=false &>prover_logs/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
# 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 &>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
# run: |
# PASSED_ENV_VARS="BATCH_NUMBER,DATABASE_URL,URL,INTERVAL,TIMEOUT" \
# ci_run ./bin/prover_checkers/batch_l1_status_checker
#
# - name: Upload logs
# uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
# if: always()
# with:
# name: prover_logs
# path: prover_logs
#
# - name: Show sccache logs
# if: always()
# run: |
# ci_run sccache --show-stats || true
# ci_run cat /tmp/sccache_log.txt || true
28 changes: 15 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
branches:
- staging
- trying
- sync-layer-stable # adding this branch here to run CI on it regardless of the conflicts
- '!release-please--branches--**'

concurrency:
Expand Down Expand Up @@ -90,7 +91,7 @@ jobs:
ci-for-core:
name: CI for Core Components
needs: changed_files
if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.zk_toolbox == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
uses: ./.github/workflows/ci-core-reusable.yml

ci-for-prover:
Expand Down Expand Up @@ -118,17 +119,17 @@ jobs:
name: CI for Common Components (prover or core)
uses: ./.github/workflows/ci-common-reusable.yml

build-core-images:
name: Build core images
needs: changed_files
if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
uses: ./.github/workflows/new-build-core-template.yml
with:
image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
action: "build"
secrets:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
# build-core-images:
# name: Build core images
# needs: changed_files
# if: ${{ (needs.changed_files.outputs.core == 'true' || needs.changed_files.outputs.all == 'true') && !contains(github.ref_name, 'release-please--branches') }}
# uses: ./.github/workflows/new-build-core-template.yml
# with:
# image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
# action: "build"
# secrets:
# DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
# DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

build-tee-prover-images:
name: Build TEE Prover images
Expand Down Expand Up @@ -186,7 +187,8 @@ jobs:
name: Github Status Check
runs-on: ubuntu-latest
if: always() && !cancelled()
needs: [ ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-core-images, build-contract-verifier, build-prover-images ]
# TODO restore build-core-images
needs: [ ci-for-core-lint, ci-for-common, ci-for-core, ci-for-prover, ci-for-docs, build-contract-verifier, build-prover-images ]
steps:
- name: Status
run: |
Expand Down
Loading
Loading