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(zk_toolbox): Add zk_supervisor config-writer command #2866

Merged
merged 34 commits into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
173bcd3
Move override files
matias-gonz Sep 12, 2024
d63af14
Add OverrideConfig command
matias-gonz Sep 12, 2024
fd70e2c
Add get_config_path
matias-gonz Sep 12, 2024
ffd962e
Add override_config
matias-gonz Sep 12, 2024
70af556
Add yaml mod
matias-gonz Sep 13, 2024
794beef
Add override_values parameter
matias-gonz Sep 13, 2024
7d26b79
Implement override values
matias-gonz Sep 13, 2024
a13e8fb
Implement override_config
matias-gonz Sep 13, 2024
ec05822
Add messages
matias-gonz Sep 13, 2024
3fe750e
Null should delete key
matias-gonz Sep 13, 2024
4e87b6b
Use override_config in genesis
matias-gonz Sep 13, 2024
b8a883c
Update consts
matias-gonz Sep 13, 2024
772bbed
lint
matias-gonz Sep 13, 2024
fa54cc4
Merge branch 'main' into matias-override
matias-gonz Sep 13, 2024
42283e3
Rename OverrideConfig
matias-gonz Sep 16, 2024
cd8efb7
Add config-writer to ci
matias-gonz Sep 16, 2024
75c70bb
Use ternary
matias-gonz Sep 16, 2024
e71c453
Remove extra step
matias-gonz Sep 16, 2024
4d0f42f
Wrap paths in commas
matias-gonz Sep 16, 2024
fc45d2b
Merge branch 'main' into matias-override
matias-gonz Sep 16, 2024
b6f45da
Rename loadtest override config
matias-gonz Sep 16, 2024
de07061
Rename only real proofs override
matias-gonz Sep 16, 2024
92470ce
Fix validium override
matias-gonz Sep 16, 2024
f24b009
Update MSG_OVERRIDE_SUCCESS
matias-gonz Sep 16, 2024
a5681d2
Move loadtests override files
matias-gonz Sep 16, 2024
7a4a5aa
Merge branch 'main' of github.com:matter-labs/zksync-era into matias-…
matias-gonz Sep 16, 2024
8193106
Merge branch 'main' into matias-override
matias-gonz Sep 16, 2024
47f31d1
update validium override config
matias-gonz Sep 16, 2024
73abf2f
float into int
matias-gonz Sep 16, 2024
cf56bef
Restore genesis
matias-gonz Sep 16, 2024
3bca2b6
Fix
matias-gonz Sep 17, 2024
02394b9
Fix validium override config
matias-gonz Sep 17, 2024
cb7c55c
Add compute_overhead_part
matias-gonz Sep 17, 2024
3fa8851
Merge branch 'main' into matias-override
matias-gonz Sep 17, 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
4 changes: 1 addition & 3 deletions .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,7 @@ jobs:
# `sleep 60` because we need to wait until server added all the tokens
- name: Run server
run: |
ci_run sed -i -e 's/mode: FULL/mode: LIGHTWEIGHT/' chains/legacy/configs/general.yaml
ci_run sed -i -e 's/state_keeper_fast_vm_mode:.*/state_keeper_fast_vm_mode: ${{ matrix.vm_mode }}/' chains/legacy/configs/general.yaml
ci_run sed -i -e 's/delay_interval:.*/delay_interval: 50/' chains/legacy/configs/general.yaml
ci_run zk_supervisor 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 zk_inception server --uring --chain=legacy --components api,tree,eth,state_keeper,housekeeper,commitment_generator,vm_runner_protective_reads &>server.log &
ci_run sleep 60

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ eth:
aggregated_block_prove_deadline: 300
aggregated_block_execute_deadline: 300
timestamp_criteria_max_allowed_lag: 104000 # 29h
wait_confirmations: null
gas_adjuster:
pricing_formula_parameter_a: 1.06
internal_l1_pricing_multiplier: 1
internal_pubdata_pricing_multiplier: 1.50
poll_period: 60
watcher:
confirmations_for_eth_event: null
observability:
log_directives: zksync=info,zksync_state_keeper=debug,zksync_core=debug,zksync_server=debug,zksync_contract_verifier=debug,zksync_dal=debug,zksync_state=debug,zksync_utils=debug,zksync_eth_sender=debug,loadnext=debug,dev_ticker=info,vm=info,block_sizes_test=info,setup_key_generator_and_server=info,zksync_queued_job_processor=debug,slot_index_consistency_checker=debug,zksync_health_check=debug,zksync_consensus_bft=debug,zksync_consensus_network=debug,zksync_consensus_storage=debug,zksync_consensus_executor=debug,

# remove eth_sender_wait_confirmations, eth_watcher_confirmations_for_eth_event variables
3 changes: 3 additions & 0 deletions etc/env/file_based/overrides/only_real_proofs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
eth:
sender:
proof_sending_mode: ONLY_REAL_PROOFS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ eth:
aggregated_block_prove_deadline: 300
aggregated_block_execute_deadline: 300
timestamp_criteria_max_allowed_lag: 104000 # 29h
wait_confirmations: null
gas_adjuster:
pricing_formula_parameter_a: 1.1
internal_l1_pricing_multiplier: 1
Expand All @@ -18,5 +19,3 @@ eth:
confirmations_for_eth_event: 10
observability:
log_directives: zksync=info,zksync_state_keeper=debug,zksync_core=debug,zksync_server=debug,zksync_contract_verifier=debug,zksync_dal=debug,zksync_state=debug,zksync_utils=debug,zksync_eth_sender=debug,loadnext=debug,dev_ticker=info,vm=info,block_sizes_test=info,setup_key_generator_and_server=info,zksync_queued_job_processor=debug,slot_index_consistency_checker=debug,zksync_health_check=debug,zksync_consensus_bft=debug,zksync_consensus_network=debug,zksync_consensus_storage=debug,zksync_consensus_executor=debug,

# remove eth_sender_wait_confirmations variable
7 changes: 7 additions & 0 deletions etc/env/file_based/overrides/tests/loadtest-new.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
db:
merkle_tree:
mode: LIGHTWEIGHT
experimental_vm:
state_keeper_fast_vm_mode: NEW
mempool:
delay_interval: 50
7 changes: 7 additions & 0 deletions etc/env/file_based/overrides/tests/loadtest-old.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
db:
merkle_tree:
mode: LIGHTWEIGHT
experimental_vm:
state_keeper_fast_vm_mode: OLD
mempool:
delay_interval: 50
6 changes: 6 additions & 0 deletions etc/env/file_based/overrides/validium.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
eth:
sender:
pubdata_sending_mode: CUSTOM
state_keeper:
pubdata_overhead_part: 0
compute_overhead_part: 1
1 change: 1 addition & 0 deletions zk_toolbox/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions zk_toolbox/crates/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ pub mod git;
pub mod server;
pub mod version;
pub mod wallets;
pub mod yaml;

pub use prerequisites::{
check_general_prerequisites, check_prerequisites, GCLOUD_PREREQUISITE, GPU_PREREQUISITES,
Expand Down
Loading
Loading