fix(merkle-tree): Fix tree truncation #3178
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 tasks
perekopskiy
approved these changes
Oct 31, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 5, 2024
🤖 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]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 12, 2024
## What ❔ Implements a background task to remove bogus stale keys for the Merkle tree. ## Why ❔ These keys could have been produced during L1 batch reverts before #3178. ## 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. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What ❔
Removes all stale keys for the "future" tree versions during truncation.
Why ❔
Otherwise, we may get bogus stale keys and non-stale nodes removed from the tree during pruning.
Checklist
zkstack dev fmtandzkstack dev lint.