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.

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(en): Fix reorg detector logic for dealing with last L1 batch #1906

Merged
merged 7 commits into from
May 15, 2024

Conversation

slowli
Copy link
Contributor

@slowli slowli commented May 10, 2024

What ❔

Fixes a reorg detector false positive error if the latest remote L1 batch doesn't have its state hash computed.

Why ❔

This error was observed in CI and can theoretically appear on real envs.

Checklist

  • PR title corresponds to the body of PR (we generate changelog entries from PRs).
  • Tests for the changes have been added / updated.
  • Code has been formatted via zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.

@slowli slowli marked this pull request as ready for review May 10, 2024 15:27
tomg10
tomg10 previously approved these changes May 10, 2024
pompon0
pompon0 previously approved these changes May 14, 2024
@slowli slowli added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2024
@slowli slowli added this pull request to the merge queue May 15, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 15, 2024
@popzxc popzxc added this pull request to the merge queue May 15, 2024
Merged via the queue into main with commit 3af5f5b May 15, 2024
43 checks passed
@popzxc popzxc deleted the aov-pla-931-fix-reorg-detector-last-l1-batch-logic branch May 15, 2024 06:38
RomanBrodetski pushed a commit that referenced this pull request May 17, 2024
🤖 I have created a release *beep* *boop*
---


##
[24.3.0](core-v24.2.0...core-v24.3.0)
(2024-05-16)


### Features

* Added support for making EN a (non-leader) consensus validator
(BFT-426)
([#1905](#1905))
([9973629](9973629))
* **configs:** Extract secrets to an additional config
([#1956](#1956))
([bab4d65](bab4d65))
* **en:** Fetch L1 batch root hashes from main node
([#1923](#1923))
([72a3571](72a3571))
* **eth-client:** Generalize RPC client
([#1898](#1898))
([a4e099f](a4e099f))
* **Prover CLI:** `requeue` cmd
([#1719](#1719))
([f722df7](f722df7))
* **Prover CLI:** `status batch --verbose`
([#1899](#1899))
([cf80184](cf80184))
* **pruning:** Vacuum freeze started daily
([#1929](#1929))
([5c85e9f](5c85e9f))
* Remove metrics crate
([#1902](#1902))
([5f7bda7](5f7bda7))
* **state-keeper:** Parallel l2 block sealing
([#1801](#1801))
([9b06dd8](9b06dd8))
* tee_verifier_input_producer
([#1860](#1860))
([fea7f16](fea7f16))
* **vm-runner:** implement output handler for VM runner
([#1856](#1856))
([1e4aeb5](1e4aeb5))


### Bug Fixes

* **basic_types:** bincode deserialization for `web3::Bytes`
([#1928](#1928))
([406ec8c](406ec8c))
* **config:** Fix data-handler-config
([#1919](#1919))
([b6bb041](b6bb041))
* **en:** Delete old txs by (init_addr, nonce)
([#1942](#1942))
([fa5f4a7](fa5f4a7))
* **en:** Fix reorg detector logic for dealing with last L1 batch
([#1906](#1906))
([3af5f5b](3af5f5b))
* parentHash in websocket blocks subscription is shown as 0x0
([#1946](#1946))
([fc2efad](fc2efad))
* **Prover CLI:** `status batch` bugs
([#1865](#1865))
([09682f2](09682f2))
* **utils:** bincode ser-/deserialization for `BytesToHexSerde`
([#1947](#1947))
([a75b917](a75b917))

---
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants