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(vm): Extract batch executor to separate crate #2702

Merged
merged 18 commits into from
Sep 3, 2024
Merged

feat(vm): Extract batch executor to separate crate #2702

merged 18 commits into from
Sep 3, 2024

Conversation

slowli
Copy link
Contributor

@slowli slowli commented Aug 21, 2024

What ❔

  • Extracts batch executor from zksync_state_keeper into a separate crate, zksync_vm_executor. Places batch executor interfaces in zksync_vm_interface.
  • Moves zksync_vm_utils remains to this crate, too.
  • Removes dependency on the zksync_state_keeper in the VM runner.

Why ❔

Improves encapsulation and versatility (e.g., when using custom VMs).

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 zk fmt and zk lint.

slowli
slowli commented Aug 21, 2024
View reviewed changes
core/lib/vm_interface/src/executor.rs Outdated Show resolved Hide resolved
core/node/state_keeper/src/executor/tests/mod.rs Show resolved Hide resolved
core/node/vm_runner/src/output_handler.rs Show resolved Hide resolved
core/node/vm_runner/Cargo.toml Show resolved Hide resolved
@slowli slowli marked this pull request as ready for review August 21, 2024 13:22
@slowli slowli requested review from itegulov, Artemka374, popzxc and RomanBrodetski and removed request for itegulov August 21, 2024 13:22
popzxc
popzxc previously approved these changes Aug 27, 2024
View reviewed changes
Copy link
Member

@popzxc popzxc left a comment

Choose a reason for hiding this comment

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

Can't say that I like the fact that the number of traits, trait wrappers, and other abstract machinery keeps growing. On the other hand, maybe it's not really avoiable without losing some flexibility.

Nonetheless, that's a good change!

core/lib/vm_interface/src/executor.rs Outdated Show resolved Hide resolved
core/node/vm_runner/Cargo.toml Show resolved Hide resolved
@slowli slowli requested a review from popzxc September 2, 2024 11:34
@slowli slowli added this pull request to the merge queue Sep 3, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 3, 2024
@slowli slowli added this pull request to the merge queue Sep 3, 2024
github-merge-queue bot pushed a commit that referenced this pull request Sep 3, 2024
@slowli
feat(vm): Extract batch executor to separate crate (#2702)
66bb003 
## What ❔

- Extracts batch executor from `zksync_state_keeper` into a separate
crate, `zksync_vm_executor`. Places batch executor interfaces in
`zksync_vm_interface`.
- Moves `zksync_vm_utils` remains to this crate, too.
- Removes dependency on the `zksync_state_keeper` in the VM runner.

## Why ❔

Improves encapsulation and versatility (e.g., when using custom VMs).

## Checklist

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Tests for the changes have been added / updated.
- [ ] Documentation comments have been added / updated.
- [x] Code has been formatted via `zk fmt` and `zk lint`.
Merged via the queue into main with commit b82dfa4 Sep 3, 2024
54 checks passed
@slowli slowli deleted the aov-pla-1016-remove-rework-vm_utils-crate branch September 3, 2024 15:45
This was referenced Sep 3, 2024
Open
Merged
github-merge-queue bot pushed a commit that referenced this pull request Sep 5, 2024
@zksync-era-bot
chore(main): release core 24.24.0 (#2773)
fcffb06 
🤖 I have created a release *beep* *boop*
---


##
[24.24.0](core-v24.23.0...core-v24.24.0)
(2024-09-05)


### Features

* conditional cbt l1 updates
([#2748](#2748))
([6d18061](6d18061))
* **eth-watch:** do not query events from earliest block
([#2810](#2810))
([1da3f7e](1da3f7e))
* **genesis:** Validate genesis config against L1
([#2786](#2786))
([b2dd9a5](b2dd9a5))
* 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))
* Remove prover db from house keeper
([#2795](#2795))
([85b7346](85b7346))
* **vm-runner:** Implement batch data prefetching
([#2724](#2724))
([d01840d](d01840d))
* **vm:** Extract batch executor to separate crate
([#2702](#2702))
([b82dfa4](b82dfa4))
* **vm:** Simplify VM interface
([#2760](#2760))
([c3bde47](c3bde47))
* **zk_toolbox:** add multi-chain CI integration test
([#2594](#2594))
([05c940e](05c940e))


### Bug Fixes

* **config:** Do not panic for observability config
([#2639](#2639))
([1e768d4](1e768d4))
* **core:** Batched event processing support for Reth
([#2623](#2623))
([958dfdc](958dfdc))
* return correct witness inputs
([#2770](#2770))
([2516e2e](2516e2e))
* **tee-prover:** increase retries to reduce spurious alerts
([#2776](#2776))
([4fdc806](4fdc806))
* **tee-prover:** mitigate panic on redeployments
([#2764](#2764))
([178b386](178b386))
* **tee:** lowercase enum TEE types
([#2798](#2798))
([0f2f9bd](0f2f9bd))
* **vm-runner:** Fix statement timeouts in VM playground
([#2772](#2772))
([d3cd553](d3cd553))


### Performance Improvements

* **vm:** Fix VM performance regression on CI loadtest
([#2782](#2782))
([bc0d7d5](bc0d7d5))

---
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]>
@slowli slowli mentioned this pull request Sep 6, 2024
Merged
2 tasks
github-merge-queue bot pushed a commit that referenced this pull request Sep 6, 2024
@slowli
fix(state-keeper): Restore processed tx metrics in state keeper (#2815)
4d8862b 
## What ❔

Restores processed transaction metrics that were accidentally removed in
#2702.

## Why ❔

These metrics are used in dashboards etc.

## Checklist

- [x] PR title corresponds to the body of PR (we generate changelog
entries from PRs).
- [x] Code has been formatted via `zk fmt` and `zk lint`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@popzxc popzxc popzxc approved these changes

@Artemka374 Artemka374 Awaiting requested review from Artemka374

@itegulov itegulov Awaiting requested review from itegulov

@RomanBrodetski RomanBrodetski Awaiting requested review from RomanBrodetski

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

Successfully merging this pull request may close these issues.
2 participants
@slowli @popzxc