feat(en): Make ENs detect reorgs earlier #964
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
slowli
commented
Jan 30, 2024
popzxc
approved these changes
Jan 30, 2024
pompon0
approved these changes
Jan 30, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 30, 2024
🤖 I have created a release *beep* *boop* --- ## [20.2.0](core-v20.1.0...core-v20.2.0) (2024-01-30) ### Features * added unauthenticated version of gcs object store ([#916](#916)) ([638a813](638a813)) * Adding EN snapshots applier ([#882](#882)) ([0d2ba09](0d2ba09)) * consensus component config for main node and external node ([#881](#881)) ([1aed8de](1aed8de)) * **en:** Make ENs detect reorgs earlier ([#964](#964)) ([b043cc8](b043cc8)) * **en:** Restore state keeper storage from snapshot ([#885](#885)) ([a9553b5](a9553b5)) * protobuf-generated json configs for the main node (BFT-371) ([#458](#458)) ([f938314](f938314)) * Remove zkevm_test_harness public reexport from zksync_types ([#929](#929)) ([dd1a35e](dd1a35e)) * **state-keeper:** track the time that individual transactions spend in mempool ([#941](#941)) ([fa45aa9](fa45aa9)) * **vm:** detailed circuit statistic ([#845](#845)) ([a20af60](a20af60)) * **vm:** Support tracers for old vm ([#926](#926)) ([9fc2d95](9fc2d95)) ### Bug Fixes * **api:** Order transaction traces in `debug_traceBlock*` methods ([#924](#924)) ([5918ef9](5918ef9)) * **db:** Make `get_expected_l1_batch_timestamp()` more efficient ([#963](#963)) ([7334679](7334679)) * **db:** Make `snapshot_recovery` migration backward-compatible ([#961](#961)) ([e756762](e756762)) * **zksync_types:** Update SerializationTransactionError::OversizedData description ([#949](#949)) ([c95f3ee](c95f3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
5 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 1, 2024
## What ❔ Fixes flakiness in reorg detector tests introduced in #964. ## Why ❔ Flaky tests are bad. ## 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] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. - [x] Linkcheck has been run via `zk linkcheck`.
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 ❔
Currently, the reorg detector only detects divergence based on the latest local miniblock / L1 batch. This means that if a reorg actually happens, it will only be detected be an EN once the main node catches up to it.
This PR changes this logic as follows. If the main node doesn't contain local node data, it makes sense to check correspondence of the latest L1 batch / miniblock on the main node.
Why ❔
Late reorg detection is less efficient and it may be the reason (or one of the reasons?) EN integration tests in CI frequently fail when gossip-based syncing is enabled.
Checklist
zk fmtandzk lint.zk spellcheck.zk linkcheck.