-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
fix(external-node): make fetcher rely on unsealed batches #3088
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
perekopskiy
approved these changes
Oct 14, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 15, 2024
🤖 I have created a release *beep* *boop* --- ## [24.29.0](core-v24.28.0...core-v24.29.0) (2024-10-14) ### Features * Add initial version prover_autoscaler ([#2993](#2993)) ([ebf9604](ebf9604)) * add metric to track current cbt ratio ([#3020](#3020)) ([3fd2fb1](3fd2fb1)) * **configs:** Add port parameter to ConsensusConfig ([#2986](#2986)) ([25112df](25112df)) * **configs:** Add port parameter to ConsensusConfig ([#3051](#3051)) ([038c397](038c397)) * **consensus:** smooth transition to p2p syncing (BFT-515) ([#3075](#3075)) ([5d339b4](5d339b4)) * **consensus:** Support for syncing blocks before consensus genesis over p2p network ([#3040](#3040)) ([d3edc3d](d3edc3d)) * **en:** periodically fetch bridge addresses ([#2949](#2949)) ([e984bfb](e984bfb)) * **eth-sender:** add time_in_mempool_cap config ([#3018](#3018)) ([f6d86bd](f6d86bd)) * **eth-watch:** catch another reth error ([#3026](#3026)) ([4640c42](4640c42)) * Handle new yul compilation flow ([#3038](#3038)) ([4035361](4035361)) * **state-keeper:** pre-insert unsealed L1 batches ([#2846](#2846)) ([e5b5a3b](e5b5a3b)) * **vm:** EVM emulator support – base ([#2979](#2979)) ([deafa46](deafa46)) * **zk_toolbox:** added support for setting attester committee defined in a separate file ([#2992](#2992)) ([6105514](6105514)) * **zk_toolbox:** Redesign zk_toolbox commands ([#3003](#3003)) ([114834f](114834f)) * **zktoolbox:** added checking the contract owner in set-attester-committee command ([#3061](#3061)) ([9b0a606](9b0a606)) ### Bug Fixes * **api:** Accept integer block count in `eth_feeHistory` ([#3077](#3077)) ([4d527d4](4d527d4)) * **api:** Adapt `eth_getCode` to EVM emulator ([#3073](#3073)) ([15fe5a6](15fe5a6)) * bincode deserialization for VM run data ([#3044](#3044)) ([b0ec79f](b0ec79f)) * bincode deserialize for WitnessInputData ([#3055](#3055)) ([91d0595](91d0595)) * **external-node:** make fetcher rely on unsealed batches ([#3088](#3088)) ([bb5d147](bb5d147)) * **state-keeper:** ensure unsealed batch is present during IO init ([#3071](#3071)) ([bdeb411](bdeb411)) * **vm:** Check protocol version for fast VM ([#3080](#3080)) ([a089f3f](a089f3f)) * **vm:** Prepare new VM for use in API server and fix divergences ([#2994](#2994)) ([741b77e](741b77e)) ### Reverts * **configs:** Add port parameter to ConsensusConfig ([#2986](#2986)) ([#3046](#3046)) ([abe35bf](abe35bf)) --- 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 <zksync-era-bot@users.noreply.github.com>
itegulov
added a commit
that referenced
this pull request
Oct 18, 2024
)" This reverts commit bb5d147.
4 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Oct 18, 2024
…3125) ## What ❔ This PR reverts #3088 as I have realized it is going to be very hard to make this fix work by going in that direction. Basically initializing with an empty unsealed batch causes a lot of issues and the existing state keeper/external IO flow heavily relies on us having at least one at the start to initialize correctly. Will leave more context in the comments. Feel free to review individual commits to not see revert changelog. ## Why ❔ This bug causes EN to panic ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [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`.
itegulov
added a commit
that referenced
this pull request
Oct 20, 2024
…3125) ## What ❔ This PR reverts #3088 as I have realized it is going to be very hard to make this fix work by going in that direction. Basically initializing with an empty unsealed batch causes a lot of issues and the existing state keeper/external IO flow heavily relies on us having at least one at the start to initialize correctly. Will leave more context in the comments. Feel free to review individual commits to not see revert changelog. ## Why ❔ This bug causes EN to panic ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [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 ❔
Originally though I should just make ENs ignore
OpenBatch
command when the batch is already present (see 19537f9), but while writing a test I have realized that under normal execution EN cannot receive twoOpenBatch
commands for the same batch (even with re-execution/restart).Looking further I think fetcher logic is the actual culprit - the bug only reproduces when an unsealed batch is inserted but no associated L2 blocks have made it into the DB yet.
Why ❔
Existing logic causes EN to panic sometimes
Checklist
zk_supervisor fmt
andzk_supervisor lint
.