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.

Sign up for GitHub

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

Jump to bottom

feat(zkstack): Move server, contract-verifier and consensus commands into chain subcommand #3199

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

feat(zkstack): Move server, contract-verifier and consensus commands into chain subcommand #3199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f56e9c2
Migrate server to chain
matias-gonz Oct 13, 2024
409e768
Migrate contract verifier to chain
matias-gonz Oct 13, 2024
2d4f8fc
Migrate consensus to chain
matias-gonz Oct 13, 2024
ba8b707
fmt
matias-gonz Oct 13, 2024
8d238d5
Fix consensus proto
matias-gonz Oct 13, 2024
5b314a6
Fix consensus command
matias-gonz Oct 15, 2024
8f7d9f7
Add ZkStackConfig enum
matias-gonz Oct 15, 2024
ca2f0e8
fmt
matias-gonz Oct 15, 2024
8f046fd
Refactor deploy paymaster
matias-gonz Oct 17, 2024
62e69be
Refactor chain commands
matias-gonz Oct 17, 2024
06ddc2c
rollback consensus
matias-gonz Oct 17, 2024
1b12e6e
Refactor chain consensus setup
matias-gonz Oct 18, 2024
c2f326c
Merge branch 'main' into matias/refactor-3-layered-chain
matias-gonz Oct 18, 2024
49e971c
Merge branch 'main' of github.com:matter-labs/zksync-era into matias/…
matias-gonz Oct 30, 2024
cb00b8d
Update tests
matias-gonz Oct 30, 2024
c26c886
Merge branch 'main' into matias/refactor-chain-commands
matias-gonz Oct 30, 2024
3252224
fmt
matias-gonz Oct 30, 2024
17302bb
Merge branch 'matias/refactor-chain-commands' of github.com:matter-la…
matias-gonz Oct 30, 2024
e5978a4
fmt
matias-gonz Oct 30, 2024
88c2e99
generate autocompletion
matias-gonz Oct 30, 2024
efed818
Merge branch 'main' into matias/refactor-chain-commands
matias-gonz Oct 31, 2024
88bdf4d
lint autocomplete
matias-gonz Oct 31, 2024
b87969a
generate autocomplete
matias-gonz Oct 31, 2024
142a327
lint
matias-gonz Oct 31, 2024
95d82b1
Merge branch 'main' into matias/refactor-chain-commands
matias-gonz 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
16 changes: 8 additions & 8 deletions .github/workflows/ci-core-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ jobs:
- name: Run server
run: |
ci_run zkstack dev config-writer --path ${{ matrix.vm_mode == 'NEW' && 'etc/env/file_based/overrides/tests/loadtest-new.yaml' || 'etc/env/file_based/overrides/tests/loadtest-old.yaml' }} --chain legacy
ci_run zkstack server --uring --chain=legacy --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
ci_run zkstack chain server --uring --chain=legacy --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
ci_run sleep 60

- name: Perform loadtest
Expand Down Expand Up @@ -355,27 +355,27 @@ jobs:

- name: Initialize Contract verifier
run: |
ci_run zkstack contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
ci_run zkstack contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &
ci_run zkstack chain contract-verifier init --zksolc-version=v1.5.3 --zkvyper-version=v1.5.4 --solc-version=0.8.26 --vyper-version=v0.3.10 --era-vm-solc-version=0.8.26-1.0.1 --only --chain era
ci_run zkstack chain contract-verifier run --chain era &> ${{ env.SERVER_LOGS_DIR }}/contract-verifier-rollup.log &

- name: Run servers
run: |
# Override config for part of chains to test the default config as well
ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain era
ci_run zkstack dev config-writer --path etc/env/file_based/overrides/tests/integration.yaml --chain validium

ci_run zkstack server --ignore-prerequisites --chain era &> ${{ env.SERVER_LOGS_DIR }}/rollup.log &
ci_run zkstack server --ignore-prerequisites --chain validium &> ${{ env.SERVER_LOGS_DIR }}/validium.log &
ci_run zkstack server --ignore-prerequisites --chain custom_token &> ${{ env.SERVER_LOGS_DIR }}/custom_token.log &
ci_run zkstack server --ignore-prerequisites --chain consensus \
ci_run zkstack chain server --ignore-prerequisites --chain era &> ${{ env.SERVER_LOGS_DIR }}/rollup.log &
ci_run zkstack chain server --ignore-prerequisites --chain validium &> ${{ env.SERVER_LOGS_DIR }}/validium.log &
ci_run zkstack chain server --ignore-prerequisites --chain custom_token &> ${{ env.SERVER_LOGS_DIR }}/custom_token.log &
ci_run zkstack chain server --ignore-prerequisites --chain consensus \
--components=api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads,vm_runner_bwip,vm_playground,da_dispatcher,consensus \
&> ${{ env.SERVER_LOGS_DIR }}/consensus.log &

ci_run sleep 5

- name: Setup attester committee for the consensus chain
run: |
ci_run zkstack consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log
ci_run zkstack chain consensus set-attester-committee --chain consensus --from-genesis &> ${{ env.INTEGRATION_TESTS_LOGS_DIR }}/consensus.log

- name: Run integration tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-prover-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
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 chain 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 &
Expand Down
Loading
Loading