chore: Merge main into kl factory #1740
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
## What ❔ * Fixing docker build and scripts for the local node/setup. ## Why ❔ * This will allow local node to work again - which is crucial before the bridgehub udpate. * This PR is only fixing it in the 'main' branch - there will be a followup PR to the bridgehub branch coming later.
## What ❔ Extract `zksync_core::house_keeper` to separate crate in the `node` folder ## Why ❔ Part of the "modularize the codebase" process, required for legolizer and publishing on crates.io. ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [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`.
## What ❔ Updated the bytecode compression explanation example, to be valid and working. In the connecting contracts PR: matter-labs/era-contracts#193 I added a test that checks the bytecode and runs the `publishCompressBytecode` function with the bytecode from this example. ## Why ❔ The previous example was not valid, it could confuse newcomers, because the example had different bytecode compared to what was described. ## 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 `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. - [x] Linkcheck has been run via `zk linkcheck`.
## What ❔ - Allows to configure concurrency during DB recovery and restricts it to 10 by default. - Sets the "affected" health status while the recovery is in progress. ## Why ❔ - DB recovery is very I/O-heavy, so having concurrency less than the DB pool size can utilize node resources more efficiently. - "Affected" health status is more idiomatic; the node with such a status still passes readiness checks, but it signals that it isn't fully functional. ## 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 `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. - [x] Linkcheck has been run via `zk linkcheck`.
## What ❔ Renames "miniblock" to "L2 block" in types, DAL and state keeper. ## Why ❔ - "Miniblock" is an internal term that is somewhat difficult to understand; "L2 block" is better in this regard. - It makes sense for renaming to be complete (i.e., not only concern logs, but also the codebase), so that naming is reasonably consistent. ## 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 `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. - [x] Linkcheck has been run via `zk linkcheck`.
…s` (#1717) ## What ❔ don't panic in `BlockOutputWithProofs::verify_proofs` and rather return a `Result` ## Why ❔ So `BlockOutputWithProofs::verify_proofs` can be used by other components. ## 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 `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. - [ ] Linkcheck has been run via `zk linkcheck`. Signed-off-by: Harald Hoyer <harald@matterlabs.dev>
## What ❔ Makes local-setup link properly formatted ## Why ❔ Link checker has been failing with below for the last couple of days, e.g. [here](https://github.com/matter-labs/zksync-era/actions/runs/8749278699/job/24010671980?pr=1734) ``` FILE: ./docker/local-node/README.md [✖] https://github.com/matter-labs/local-setup%5D ERROR: 1 dead links found! 1 links checked. [✖] https://github.com/matter-labs/local-setup%5D → Status: 404 ``` ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zk fmt` and `zk lint`. - [ ] Spellcheck has been run via `zk spellcheck`. - [ ] Linkcheck has been run via `zk linkcheck`.
## What ❔ Removes all functionality and tests relating to enum index migration. The only mention left is a reserved field in state keeper proto file. ## Why ❔ Not needed anymore and we keep introducing it to new components to keep compatibility ## 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. - [ ] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. - [ ] Linkcheck has been run via `zk linkcheck`.
StanislavBreadless
requested review from
yorik,
alexandrst88,
artmakh,
hatemosphere,
onyxet and
otani88
and removed request for
a team
StanislavBreadless
changed the title
mm-zk
approved these changes
Apr 19, 2024
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 ❔
Why ❔
Checklist
zk fmtandzk lint.zk spellcheck.zk linkcheck.