Skip to content

feat(v30): Remove custom DA #3970

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.

Sign up for GitHub

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

Jump to bottom
Merged
0xValera merged 196 commits into from
Sep 23, 2025
Merged

feat(v30): Remove custom DA #3970

0xValera merged 196 commits into from
Sep 23, 2025

Conversation

@0xVolosnikov
Copy link
Contributor

@0xVolosnikov 0xVolosnikov commented May 7, 2025 •
edited by Deniallugo
Loading

What ❔

Instead of using custom DA validators, now we have a specific set of possible DA validators and we use them instead.

Why ❔

It's a rare occasion to introduce new DA validator

Is this a breaking change?

  • Yes
  • No

Operational changes

Checklist

  • 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.

0xValera and others added 30 commits May 27, 2025 19:08
@0xValera
update scripts, zkstack.yaml
a1474d9
@0xValera
bump repos in scripts and contracts commit
e4909dd
@0xValera
Merge branch 'kl/reduced-interop-support' of https://github.com/matte…
5a135b8 
…r-labs/zksync-era into vg/v29-upgrade-process
@0xValera
Update contracts
450374b
@0xValera
Merge branch 'kl/reduced-interop-support' of https://github.com/matte…
25e52e6 
…r-labs/zksync-era into vg/v29-upgrade-process
@0xValera
Merge branch 'draft-v29' of https://github.com/matter-labs/zksync-era …
3001dae 
…into vg/v29-upgrade-process
@zkzoomer
feat: extract vm changes from draft-v29
10da406
@zkzoomer
rm irrelevant changes
c70f7f0
@zkzoomer
comment fixes
edea763
@zkzoomer
AllocationGuard fixes
58ae1a0
@zkzoomer
Merge branch 'main' into feat/multivm-v29
75b32dd
@zkzoomer
spacing
5cdb4f6
@zkzoomer
revert to v28 tests
c8596ac
@zkzoomer
fix get_preexisting_blocks_number
dc82d66
@zkzoomer
rename to get_number_of_applied_interop_roots
2b2ef9b
@zkzoomer
use L2BlockApplicationConfig
3f8de65
@zkzoomer
minor fixes
8f71f89
@zkzoomer
modify types
747d424
@zkzoomer
fix comments
8e59d8d
@zkzoomer
rm interop_roots from StoredL2BlockEnv
30e8ae5
@zkzoomer
use InteropRootApplicationConfig
eefbac7
@zkzoomer
fix first_empty_slot
d233477
@zkzoomer
define number_of_applied_interop_roots
d6e7534
@zkzoomer
consistency
de64f2c
@zkzoomer
fix: merge processors (#4256)
3099772 
## What ❔

Merges `BatchRootProcessor` and `BatchRootProcessorInterop` into a
single one

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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`.
@zkzoomer
Merge remote-tracking branch 'origin/main' into draft-v29
0d4d436
@cytadela8
Merge branch 'main' into draft-v29
7c1fea7
@zkzoomer
Merge branch 'main' into draft-v29
793f39e
@zkzoomer
nits
f2da4b1
@zkzoomer
lint
0568590
dimazhornyk
dimazhornyk reviewed Sep 17, 2025
View reviewed changes
Copy link
Contributor

@dimazhornyk dimazhornyk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't have a chance to review everything, but here is a fix for the issue raised earlier

@Deniallugo
add comments
164a069 
Signed-off-by: Danil <[email protected]>
@Deniallugo
Fix tests and lints
2bd1556 
Signed-off-by: Danil <[email protected]>
@Deniallugo
Remove default
8c11b4e 
Signed-off-by: Danil <[email protected]>
perekopskiy
perekopskiy reviewed Sep 17, 2025
View reviewed changes
cytadela8 and others added 2 commits September 18, 2025 12:27
@cytadela8
fix(EN): properly set chain_id for old batch transactions (#4488)
634b6dd 
## What ❔

If received batch details contain None/Null chain_id (commit_chain_id,
prove_chain_id, execute_chain_id) set it to config provided chain id for
L1. This happens for old batches.

## Why ❔

If you try syning EN from scratch with a "old" chain you will encounter
following error:
```
Error: One or more tasks failed: ["Task transaction_finality_updater failed: No batch transactions to process for chain id 1 while there are some for None chain_id.Error is thrown so node can restart and reload SL data. If node doesn't make any progress after restart, then it's bug, please contact developers."]
```

Logic for fetching batch transactions to process their finality status
assumes chain_ids are set properly and no transaction should have
chain_id = None. However this is the case for old chains. When fetching
they return *_chain_id: null in zks_getL1BatchDetails for some old
batches.

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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`.
@Deniallugo
feat(en): Check commitment allonside with roothashes (#4492)
6e8f526 
## What ❔

During the reorg detection take into account not only root hash, but the
whole commitment

## Why ❔

We have at least one example, where during wrong execution we have
correct root hash, but wrong commitment

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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`.

---------

Signed-off-by: Danil <[email protected]>
dimazhornyk
dimazhornyk reviewed Sep 18, 2025
View reviewed changes
Copy link
Contributor

@dimazhornyk dimazhornyk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good! usually the most problematic part with DA is ENs, but everything seems to be fine here

zkstack_cli/crates/zkstack/src/commands/chain/deploy_l2_contracts.rs
@@ -236,7 +236,7 @@ pub async fn deploy_l2_da_validator(
shell: &Shell,
Copy link
Contributor

@dimazhornyk dimazhornyk Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we completely remove this function? it is not needed in v30 if I understand correctly

Copy link
Contributor

@Deniallugo Deniallugo Sep 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we still need to deploy it...

Deniallugo and others added 3 commits September 18, 2025 16:34
@Deniallugo
fix(en): Add check for commitment in diverged batch (#4493)
e693fd0 
## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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`.

Signed-off-by: Danil <[email protected]>
@cytadela8
fix: only apply EN seal criteria checks on >=v29 protocol (#4491)
782c8b9 
## What ❔

Only apply seal criteria checks through PanicSealer on >=v29 protocol

## Why ❔

Some older protocol versions had higher circuit (and maybe other) limits
that are no longer avilable in code constants

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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`.
@zksync-era-bot
chore(main): release core 29.3.0 (#4445)
136c75c 
🤖 I have created a release *beep* *boop*
---


##
[29.3.0](core-v29.2.0...core-v29.3.0)
(2025-09-18)


### Features

* **en:** Check commitment allonside with roothashes
([#4492](#4492))
([6e8f526](6e8f526))
* **en:** Improved en commitment generation error handling
([#4483](#4483))
([1bb82d6](1bb82d6))


### Bug Fixes

* **en:** Add check for commitment in diverged batch
([#4493](#4493))
([e693fd0](e693fd0))
* **en:** allow to disable sanity checks for commitment generation
([#4487](#4487))
([7692f31](7692f31))
* **EN:** properly set chain_id for old batch transactions
([#4488](#4488))
([634b6dd](634b6dd))
* **eth-proof-manager:** don't fail component if proof was incorrect
([#4444](#4444))
([daa1161](daa1161))
* **eth-proof-manager:** verify protocol version and proving mode
alignment
([#4473](#4473))
([99e0423](99e0423))
* **eth-sender:** Fix selector for old batches
([#4489](#4489))
([bb42dcf](bb42dcf))

---
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]>
@0xValera 0xValera requested a review from a team as a code owner September 22, 2025 12:02
@0xValera 0xValera requested review from zksync-admin-bot2 and removed request for a team September 22, 2025 12:02
@github-actions
Copy link
Contributor

github-actions bot commented Sep 23, 2025

⚠ Detected differing instruction counts

Benchmark Old count New count
access_memory 4747755 4747569
call_far 319928 319919
decode_shl_sub 4747860 4747674
deploy_simple_contract 15892 15895
event_spam 2558407 2558308
finish_eventful_frames 786338 786307
heap_read_write 4252318 4252171
slot_hash_collision 4748771 4748585
write_and_decode 4748771 4748585

Changes in number of opcodes executed indicate that the gas price of the benchmark has changed, which causes it to run out of gas at a different time.

@0xValera 0xValera merged commit bcb6359 into draft-v30 Sep 23, 2025
74 of 82 checks passed
@0xValera 0xValera deleted the v29/remove-custom-da branch September 23, 2025 12:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Deniallugo Deniallugo Deniallugo left review comments

@kelemeno kelemeno kelemeno approved these changes

@perekopskiy perekopskiy perekopskiy approved these changes

@dimazhornyk dimazhornyk dimazhornyk approved these changes

@yorik yorik Awaiting requested review from yorik yorik is a code owner automatically assigned from matter-labs/devops

@alexandrst88 alexandrst88 Awaiting requested review from alexandrst88 alexandrst88 is a code owner automatically assigned from matter-labs/devops

@artmakh artmakh Awaiting requested review from artmakh artmakh is a code owner automatically assigned from matter-labs/devops

@hatemosphere hatemosphere Awaiting requested review from hatemosphere hatemosphere is a code owner automatically assigned from matter-labs/devops

@onyxet onyxet Awaiting requested review from onyxet onyxet is a code owner automatically assigned from matter-labs/devops

@iluwaa iluwaa Awaiting requested review from iluwaa iluwaa is a code owner automatically assigned from matter-labs/devops

@zksync-admin-bot2 zksync-admin-bot2 Awaiting requested review from zksync-admin-bot2 zksync-admin-bot2 is a code owner automatically assigned from matter-labs/core-release-managers

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.