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(tree): Improved tree pruning #1532

Merged
merged 23 commits into from
Apr 24, 2024
Merged

feat(tree): Improved tree pruning #1532

merged 23 commits into from
Apr 24, 2024

Conversation

tomg10
Copy link
Contributor

@tomg10 tomg10 commented Mar 31, 2024

Changes in tree pruner to allow syncing pruning state with db pruning (pruning tree up to the same l1 batch as db)

@tomg10 tomg10 requested a review from slowli April 2, 2024 10:18
tomg10 added 3 commits April 3, 2024 02:32
@tomg10
PR feedback
1c4ccc9 
Signed-off-by: tomg10 <[email protected]>
@tomg10
fix
1ce7feb 
Signed-off-by: tomg10 <[email protected]>
@tomg10
prepare for tests
55be60e 
Signed-off-by: tomg10 <[email protected]>
slowli
slowli reviewed Apr 5, 2024
View reviewed changes
core/lib/merkle_tree/src/pruning.rs Outdated Show resolved Hide resolved
core/lib/merkle_tree/src/pruning.rs Outdated Show resolved Hide resolved
core/lib/zksync_core/src/metadata_calculator/mod.rs Outdated Show resolved Hide resolved
core/lib/merkle_tree/src/domain.rs Outdated Show resolved Hide resolved
slowli
slowli reviewed Apr 17, 2024
View reviewed changes
Copy link
Contributor

@slowli slowli left a comment

Choose a reason for hiding this comment

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

I've intentionally didn't add a way to enable tree pruning on the EN. I plan to do this in a follow-up PR together with an integration test.

core/lib/zksync_core/src/metadata_calculator/pruning.rs Outdated Show resolved Hide resolved
@slowli slowli mentioned this pull request Apr 18, 2024
Merged
6 tasks
perekopskiy
perekopskiy previously approved these changes Apr 22, 2024
View reviewed changes
@slowli slowli requested a review from perekopskiy April 22, 2024 18:06
@slowli slowli added this pull request to the merge queue Apr 23, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Apr 23, 2024
@slowli slowli added this pull request to the merge queue Apr 24, 2024
Merged via the queue into main with commit bcb192c Apr 24, 2024
34 checks passed
@slowli slowli deleted the improved-tree-pruner branch April 24, 2024 06:49
@zksync-era-bot zksync-era-bot mentioned this pull request Apr 24, 2024
Merged
RomanBrodetski pushed a commit that referenced this pull request Apr 30, 2024
@zksync-era-bot @perekopskiy
chore(main): release core 24.0.0 (#1758)
e9d41a6 
🤖 I have created a release *beep* *boop*
---


##
[24.0.0](core-v23.1.0...core-v24.0.0)
(2024-04-30)


### ⚠ BREAKING CHANGES

* **prover:** Protocol Upgrade 1.5.0
([#1699](#1699))
* shared bridge
([#298](#298))

### Features

* **api:** Allow granular max response size config
([#1642](#1642))
([83c4034](83c4034))
* **api:** Improve logging for API server
([#1792](#1792))
([50fbda5](50fbda5))
* **api:** Track params for RPC methods
([#1673](#1673))
([1a34c8b](1a34c8b))
* **configs:** move ecosystem contracts to contracts
([#1606](#1606))
([9d52180](9d52180))
* EcPairing precompile as system contract
([#1761](#1761))
([3071622](3071622))
* Include create2 factory in genesis
([#1775](#1775))
([597280b](597280b))
* **prover:** Protocol Upgrade 1.5.0
([#1699](#1699))
([6a557f7](6a557f7))
* **prover:** remove redundant config fields
([#1787](#1787))
([a784ea6](a784ea6))
* shared bridge
([#298](#298))
([8c3478a](8c3478a))
* **tree:** Improved tree pruning
([#1532](#1532))
([bcb192c](bcb192c))
* **vm-runner:** implement VM runner storage layer
([#1651](#1651))
([543f9e9](543f9e9))
* **vm:** Extend bootloader memory in the new version
([#1807](#1807))
([f461b28](f461b28))


### Bug Fixes

* **api:** Fix extra DB connection acquisition during tx submission
([#1793](#1793))
([9c6ed83](9c6ed83))
* **en:** correct en config vars
([#1809](#1809))
([d340fbc](d340fbc))
* **en:** Remove duplicate reorg detector
([#1783](#1783))
([3417941](3417941))
* **kl-factory:** base token ether tests
([#1746](#1746))
([6cf14a0](6cf14a0))
* **prover:** Fix panics if prover's config is not ready
([#1822](#1822))
([21d90d7](21d90d7))
* **snapshots_creator:** Remove snapshots during reverts
([#1757](#1757))
([8d587fd](8d587fd))
* **types:** Add LegacyMixedCall
([#1773](#1773))
([2b236fe](2b236fe))
* v23 api typo
([#1821](#1821))
([a11fa86](a11fa86))
* Weaker assert for protocol version for operations
([#1800](#1800))
([11898c2](11898c2))

---
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: perekopskiy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slowli slowli slowli left review comments

@perekopskiy perekopskiy perekopskiy approved these changes

@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.
3 participants
@tomg10 @slowli @perekopskiy