chore: Merge main into sync-layer-stable #3408
Merged
Conversation
This file contains hidden or 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 ❔ The duration of a view timeout was previously hard-coded in era-consensus (at 2 seconds). This caused excessive view changes in networks with low traffic. era-consensus v0.7 now has view timeout duration as a config parameter and downgraded view change logging from `error` to `warn`. This PR includes those changes in zksync-era.
## What ❔ * erc configuration was overwriting the initial configuration (it was using wrong file constant)
Implements an account validation gas limit and the validation tracer for vm2, along with better tests for validation. Instead of a second gas limit like in vm_latest, the normal gas limit is used. Unfortunately this means that the VM is not safe to use in the sequencer until we forbid the use of gasleft. I didn't do it here because it requires something like taint analysis and could break existing contracts that didn't know that gasleft is forbidden. --------- Co-authored-by: Alex Ostrovski <[email protected]> Co-authored-by: Alex Ostrovski <[email protected]>
tbd --------- Co-authored-by: zksync-admin-bot2 <[email protected]> Co-authored-by: Lech <[email protected]>
🤖 I have created a release *beep* *boop* --- ## [25.4.0](core-v25.3.0...core-v25.4.0) (2024-12-19) ### Features * add support for custom genesis state ([#3259](#3259)) ([3cffdb2](3cffdb2)) * **consensus:** Added view_timeout to consensus config ([#3383](#3383)) ([fc02a8f](fc02a8f)) * Support stable compiler for VM (and some other crates) ([#3248](#3248)) ([cbee99d](cbee99d)) * vm2 account validation ([#2863](#2863)) ([af149a0](af149a0)) ### Bug Fixes * **contract-verifier:** Fix version extraction in gh resolver ([#3378](#3378)) ([9a10dcf](9a10dcf)) --- 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]>
## What ❔ After latest EVM emulator contract changes, EVM bytecode doesn't include any king of prefix with bytecode length. Actual unpadded raw EVM bytecode length is encoded directly in versioned bytecode hash. ## 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 `zkstack dev fmt` and `zkstack dev lint`.
## What ❔ Following the latest changes to the EVM emulator contracts, the process for enabling the EVM emulator has changed. ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## 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). - [ ] 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`.
## What ❔ This PR includes: - Changes to VM. Note, that since they are only activated during usage of the new ProtocolVersion, they should not affect the current behavior. - Changes to the VM introduce the max new factory deps as equal to 64 (but only to the last subversion) - The block reverted made to work on top of gateway, but most of the diff is due to the removal of the support for env-based instead of file based inputs - Gateway config ported - Some various changes to gateway-specific logic that should not be active before the upgrade ## Why ❔ <!-- Why are these changes done? What goal do they contribute to? What are the principles behind them? --> <!-- Example: PR templates ensure PR reviewers, observers, and future iterators are in context about the evolution of repos. --> ## 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 `zkstack dev fmt` and `zkstack dev lint`.
…#3386) We have a limit on priority fee, if an eth-sender transaction hits it, we panic. Currently eth-sender transactions may in some very rare situations hit this limits as base_fees may grow slower than priority_fees (it happened today), this change forces base_fee to grow at least as fast as priority fee.
StanislavBreadless
changed the title
Base automatically changed from
sb-additional-server-cleanup
to
sync-layer-stable
December 30, 2024 13:13
StanislavBreadless
requested review from
alexandrst88,
artmakh,
hatemosphere,
iluwaa,
onyxet,
otani88 and
yorik
and removed request for
a team
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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 ❔
Reduces the diff + the automatic fetching of priority start index was added
Why ❔
Checklist
zkstack dev fmtandzkstack dev lint.