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(prover): Add support for scaling WGs and compressor #3179

Merged
merged 10 commits into from
Oct 29, 2024
Merged

feat(prover): Add support for scaling WGs and compressor #3179

merged 10 commits into from
Oct 29, 2024

Conversation

yorik
Copy link
Contributor

@yorik yorik commented Oct 28, 2024 •
edited
Loading

What ❔

Add support for scaling WGs and compressor.
Cleanup unneeded pods in Agents.
Include in_progress into the queue.

Why ❔

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Documentation comments have been added / updated.
  • Code has been formatted via zkstack dev fmt and zkstack dev lint.

ref ZKD-1855

Artemka374
Artemka374 previously approved these changes Oct 28, 2024
View reviewed changes
Copy link
Contributor

@Artemka374 Artemka374 left a comment

Choose a reason for hiding this comment

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

LGTM, left one nit

prover/crates/bin/prover_autoscaler/src/global/queuer.rs Outdated Show resolved Hide resolved
@yorik yorik requested a review from Artemka374 October 28, 2024 12:51
EmilLuta
EmilLuta reviewed Oct 29, 2024
View reviewed changes
Copy link
Contributor

@EmilLuta EmilLuta left a comment

Choose a reason for hiding this comment

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

I left a bunch of comments. Lack of docstrings makes it a bit hard to review. Short names don't help either.

There's also a huge utilization of clones where only passing by reference should be enough. (for instance, the target_to_queue function)

A bunch of the code seems to be weirdly indented. I'm surprised the linter passed (i.e. here)

core/lib/basic_types/src/prover_dal.rs Outdated Show resolved Hide resolved
core/lib/config/src/configs/prover_autoscaler.rs Show resolved Hide resolved
prover/crates/bin/prover_autoscaler/src/global/queuer.rs Outdated Show resolved Hide resolved
prover/crates/bin/prover_autoscaler/src/global/queuer.rs Outdated Show resolved Hide resolved
prover/crates/bin/prover_autoscaler/src/global/queuer.rs Outdated Show resolved Hide resolved
prover/crates/bin/prover_autoscaler/src/global/scaler.rs Outdated Show resolved Hide resolved
@yorik
Copy link
Contributor Author

yorik commented Oct 29, 2024

I left a bunch of comments. Lack of docstrings makes it a bit hard to review. Short names don't help either.

There's also a huge utilization of clones where only passing by reference should be enough. (for instance, the target_to_queue function)

Thanks, fixed. Please point to other unneeded clones, it would be nice if rust-analyzer would do that instead of suggesting to clone.

A bunch of the code seems to be weirdly indented. I'm surprised the linter passed (i.e. here)

It's autoformatted this way. No idea why.

@yorik yorik enabled auto-merge October 29, 2024 13:03
@yorik yorik added this pull request to the merge queue Oct 29, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Oct 29, 2024
@yorik yorik added this pull request to the merge queue Oct 29, 2024
Merged via the queue into main with commit c41db9e Oct 29, 2024
43 checks passed
@yorik yorik deleted the ya--implement-poc-of-quick-prover-autoscaler-8 branch October 29, 2024 15:28
This was referenced Oct 29, 2024
Merged
Merged
github-merge-queue bot pushed a commit that referenced this pull request Oct 31, 2024
@zksync-era-bot
chore(main): release prover 16.6.0 (#2761)
e95f50a 
🤖 I have created a release *beep* *boop*
---


##
[16.6.0](prover-v16.5.0...prover-v16.6.0)
(2024-10-31)


### Features

* (DB migration) Rename recursion_scheduler_level_vk_hash to
snark_wrapper_vk_hash
([#2809](#2809))
([64f9551](64f9551))
* Add initial version prover_autoscaler
([#2993](#2993))
([ebf9604](ebf9604))
* added seed_peers to consensus global config
([#2920](#2920))
([e9d1d90](e9d1d90))
* attester committees data extractor (BFT-434)
([#2684](#2684))
([92dde03](92dde03))
* Bump crypto and protocol deps
([#2825](#2825))
([a5ffaf1](a5ffaf1))
* **circuit_prover:** Add circuit prover
([#2908](#2908))
([48317e6](48317e6))
* **consensus:** Support for syncing blocks before consensus genesis
over p2p network
([#3040](#3040))
([d3edc3d](d3edc3d))
* **da-clients:** add secrets
([#2954](#2954))
([f4631e4](f4631e4))
* gateway preparation
([#3006](#3006))
([16f2757](16f2757))
* Integrate tracers and implement circuits tracer in vm2
([#2653](#2653))
([87b02e3](87b02e3))
* Move prover data to
/home/popzxc/workspace/current/zksync-era/prover/data
([#2778](#2778))
([62e4d46](62e4d46))
* Prover e2e test
([#2975](#2975))
([0edd796](0edd796))
* **prover:** add CLI option to run prover with max allocation
([#2794](#2794))
([35e4cae](35e4cae))
* **prover:** Add endpoint to PJM to get queue reports
([#2918](#2918))
([2cec83f](2cec83f))
* **prover:** Add error to panic message of prover
([#2807](#2807))
([6e057eb](6e057eb))
* **prover:** Add min_provers and dry_run features. Improve metrics and
test. ([#3129](#3129))
([7c28964](7c28964))
* **prover:** Add scale failure events watching and pods eviction.
([#3175](#3175))
([dd166f8](dd166f8))
* **prover:** Add sending scale requests for Scaler targets
([#3194](#3194))
([767c5bc](767c5bc))
* **prover:** Add support for scaling WGs and compressor
([#3179](#3179))
([c41db9e](c41db9e))
* **prover:** Autoscaler sends scale request to appropriate agents.
([#3150](#3150))
([bfedac0](bfedac0))
* **prover:** Extract keystore into a separate crate
([#2797](#2797))
([e239260](e239260))
* **prover:** Optimize setup keys loading
([#2847](#2847))
([19887ef](19887ef))
* **prover:** Refactor WitnessGenerator
([#2845](#2845))
([934634b](934634b))
* **prover:** Update witness generator to zkevm_test_harness 0.150.6
([#3029](#3029))
([2151c28](2151c28))
* **prover:** Use query macro instead string literals for queries
([#2930](#2930))
([1cf959d](1cf959d))
* **prover:** WG refactoring
[#3](#3)
([#2942](#2942))
([df68762](df68762))
* **prover:** WitnessGenerator refactoring
[#2](#2)
([#2899](#2899))
([36e5340](36e5340))
* Refactor metrics/make API use binaries
([#2735](#2735))
([8ed086a](8ed086a))
* Remove prover db from house keeper
([#2795](#2795))
([85b7346](85b7346))
* **tee:** use hex serialization for RPC responses
([#2887](#2887))
([abe0440](abe0440))
* **utils:** Rework locate_workspace, introduce Workspace type
([#2830](#2830))
([d256092](d256092))
* vm2 tracers can access storage
([#3114](#3114))
([e466b52](e466b52))
* **vm:** Do not panic on VM divergence
([#2705](#2705))
([7aa5721](7aa5721))
* **vm:** EVM emulator support – base
([#2979](#2979))
([deafa46](deafa46))
* **vm:** Extract batch executor to separate crate
([#2702](#2702))
([b82dfa4](b82dfa4))
* **zk_toolbox:** `zk_supervisor prover` subcommand
([#2820](#2820))
([3506731](3506731))
* **zk_toolbox:** Add external_node consensus support
([#2821](#2821))
([4a10d7d](4a10d7d))
* **zk_toolbox:** Add SQL format for zk supervisor
([#2950](#2950))
([540e5d7](540e5d7))
* **zk_toolbox:** deploy legacy bridge
([#2837](#2837))
([93b4e08](93b4e08))
* **zk_toolbox:** Redesign zk_toolbox commands
([#3003](#3003))
([114834f](114834f))
* **zkstack_cli:** Build dependencies at zkstack build time
([#3157](#3157))
([724d9a9](724d9a9))


### Bug Fixes

* allow compilation under current toolchain
([#3176](#3176))
([89eadd3](89eadd3))
* **api:** Return correct flat call tracer
([#2917](#2917))
([218646a](218646a))
* count SECP256 precompile to account validation gas limit as well
([#2859](#2859))
([fee0c2a](fee0c2a))
* Fix Doc lint.
([#3158](#3158))
([c79949b](c79949b))
* ignore unknown fields in rpc json response
([#2962](#2962))
([692ea73](692ea73))
* **prover:** Do not exit on missing watcher data.
([#3119](#3119))
([76ed6d9](76ed6d9))
* **prover:** fix setup_metadata_to_setup_data_key
([#2875](#2875))
([4ae5a93](4ae5a93))
* **prover:** Run for zero queue to allow scaling down to 0
([#3115](#3115))
([bbe1919](bbe1919))
* **tee_verifier:** correctly initialize storage for re-execution
([#3017](#3017))
([9d88373](9d88373))
* **vm:** Prepare new VM for use in API server and fix divergences
([#2994](#2994))
([741b77e](741b77e))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).
github-merge-queue bot pushed a commit that referenced this pull request Nov 5, 2024
@zksync-era-bot
chore(main): release core 25.1.0 (#3162)
7fadc04 
🤖 I have created a release *beep* *boop*
---


##
[25.1.0](core-v25.0.0...core-v25.1.0)
(2024-11-04)


### Features

* add `block.timestamp` asserter for AA
([#3031](#3031))
([069d38d](069d38d))
* allow vm2 tracers to stop execution
([#3183](#3183))
([9dae839](9dae839))
* **api:** get rid of tx receipt root
([#3187](#3187))
([6c034f6](6c034f6))
* **api:** Integrate new VM into API server (no tracers)
([#3033](#3033))
([8e75d4b](8e75d4b))
* base token integration tests
([#2509](#2509))
([8db7e93](8db7e93))
* **consensus:** enabled syncing pregenesis blocks over p2p
([#3192](#3192))
([6adb224](6adb224))
* **da-clients:** add Celestia client
([#2983](#2983))
([d88b875](d88b875))
* **da-clients:** add EigenDA client
([#3155](#3155))
([5161eed](5161eed))
* gateway preparation
([#3006](#3006))
([16f2757](16f2757))
* Implement gas relay mode and inclusion data for data attestation
([#3070](#3070))
([561fc1b](561fc1b))
* **metadata-calculator:** Add debug endpoints for tree API
([#3167](#3167))
([3815252](3815252))
* **proof-data-handler:** add first processed batch option
([#3112](#3112))
([1eb69d4](1eb69d4))
* **proof-data-handler:** add tee_proof_generation_timeout_in_secs param
([#3128](#3128))
([f3724a7](f3724a7))
* **prover:** Add queue metric to report autoscaler view of the queue.
([#3206](#3206))
([2721396](2721396))
* **prover:** Add sending scale requests for Scaler targets
([#3194](#3194))
([767c5bc](767c5bc))
* **prover:** Add support for scaling WGs and compressor
([#3179](#3179))
([c41db9e](c41db9e))
* **vm:** Support EVM emulation in fast VM
([#3163](#3163))
([9ad1f0d](9ad1f0d))


### Bug Fixes

* **consensus:** better logging of errors
([#3170](#3170))
([a5028da](a5028da))
* **consensus:** made attestation controller non-critical
([#3180](#3180))
([6ee9f1f](6ee9f1f))
* **consensus:** payload encoding protected by protocol_version
([#3168](#3168))
([8089b78](8089b78))
* **da-clients:** add padding to the data within EigenDA blob
([#3203](#3203))
([8ae06b2](8ae06b2))
* **da-clients:** enable tls-roots feature for tonic
([#3201](#3201))
([42f177a](42f177a))
* extend allowed storage slots for validation as per EIP-7562
([#3166](#3166))
([c76da16](c76da16))
* **merkle-tree:** Fix tree truncation
([#3178](#3178))
([9654097](9654097))
* **tee_prover:** add prometheus pull listener
([#3169](#3169))
([1ffd22f](1ffd22f))
* update logging in cbt l1 behaviour
([#3149](#3149))
([d0f61b0](d0f61b0))

---
This PR was generated with [Release
Please](https://github.com/googleapis/release-please). See
[documentation](https://github.com/googleapis/release-please#release-please).

---------

Co-authored-by: zksync-era-bot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@EmilLuta EmilLuta EmilLuta approved these changes

@Artemka374 Artemka374 Awaiting requested review from Artemka374

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yorik @EmilLuta @Artemka374