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 command for setting attester committee #2900

Merged
merged 33 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5f3a7f9
generated abi
pompon0 Sep 11, 2024
4eba9a9
submitting txs works :)
pompon0 Sep 11, 2024
425d992
wip
pompon0 Sep 12, 2024
4bbed23
Merge remote-tracking branch 'origin/main' into gprusak-registry-cmd
pompon0 Sep 12, 2024
a26d669
wip
pompon0 Sep 13, 2024
d39b955
fix
pompon0 Sep 13, 2024
b13b5fa
fix
pompon0 Sep 13, 2024
3483d26
ech...
pompon0 Sep 13, 2024
dc10b6f
bumped contracts
pompon0 Sep 16, 2024
50bab77
Merge branch 'main' into gprusak-multicall3
pompon0 Sep 16, 2024
4138041
applied comments
pompon0 Sep 16, 2024
80a13c0
Merge branch 'gprusak-multicall3' of http://github.com/matter-labs/zk…
pompon0 Sep 16, 2024
2040dbb
zk fmt
pompon0 Sep 16, 2024
87b86a5
Merge branch 'gprusak-multicall3' into gprusak-registry-cmd
pompon0 Sep 16, 2024
1c82e4c
implemented the thing
pompon0 Sep 16, 2024
65b9570
added missing activation
pompon0 Sep 16, 2024
52fc1c9
doesn't work
pompon0 Sep 17, 2024
3493749
works
pompon0 Sep 17, 2024
2fd88ac
Merge remote-tracking branch 'origin/main' into gprusak-registry-cmd
pompon0 Sep 17, 2024
94bc0a4
zk fmt
pompon0 Sep 17, 2024
0170682
moved file
pompon0 Sep 17, 2024
9796251
json abi for ConsensusRegistry
pompon0 Sep 18, 2024
c91d7e9
Merge branch 'main' into gprusak-registry-cmd
pompon0 Sep 18, 2024
024af6f
zk lint
pompon0 Sep 18, 2024
c97c88b
Merge branch 'gprusak-registry-cmd' of http://github.com/matter-labs/…
pompon0 Sep 18, 2024
773c00b
reverted garbage
pompon0 Sep 19, 2024
3e63bc3
logger
pompon0 Sep 19, 2024
a77002e
Merge remote-tracking branch 'origin/main' into gprusak-registry-cmd
pompon0 Sep 26, 2024
0137e00
reorganized code
pompon0 Sep 26, 2024
407ceb7
moved strings
pompon0 Sep 26, 2024
b8b3839
Merge branch 'main' into gprusak-registry-cmd
pompon0 Sep 26, 2024
5328e63
Merge branch 'main' into gprusak-registry-cmd
pompon0 Sep 26, 2024
4cd283b
Merge branch 'main' into gprusak-registry-cmd
brunoffranca Sep 26, 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: 4 additions & 0 deletions .github/workflows/ci-core-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,10 @@ jobs:

ci_run sleep 5

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

- name: Run integration tests
run: |
PASSED_ENV_VARS="RUN_CONTRACT_VERIFICATION_TEST" \
Expand Down
2 changes: 1 addition & 1 deletion bin/zkt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if which zkup >/dev/null; then
cargo uninstall zk_supervisor
zkup -p .. --alias
else
echo zkup does not installed, please install it https://github.com/matter-labs/zksync-era/tree/main/zk_toolbox/zkup
echo zkup is not installed, please install it https://github.com/matter-labs/zksync-era/tree/main/zk_toolbox/zkup
cd ../zk_toolbox
cargo install --path ./crates/zk_inception --force
cargo install --path ./crates/zk_supervisor --force
Expand Down
2 changes: 1 addition & 1 deletion 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/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ slugify-rs = "0.0.3"
cliclack = "0.2.5"
console = "0.15.8"
chrono = "0.4.38"
eyre = "0.6.12"
ethers = "2.0"
futures = "0.3.30"
human-panic = "2.0"
Expand Down
5 changes: 4 additions & 1 deletion zk_toolbox/crates/zk_inception/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ anyhow.workspace = true
clap.workspace = true
cliclack.workspace = true
config.workspace = true
console.workspace = true
human-panic.workspace = true
lazy_static.workspace = true
serde_yaml.workspace = true
Expand All @@ -37,3 +36,7 @@ clap-markdown.workspace = true
zksync_consensus_roles.workspace = true
zksync_consensus_crypto.workspace = true
secrecy.workspace = true

[build-dependencies]
eyre.workspace = true
ethers.workspace = true
Loading
Loading