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.

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

feat(contracts)!: synclayer integration #1934

Draft
wants to merge 295 commits into
base: main
Choose a base branch
from
Draft

feat(contracts)!: synclayer integration #1934

wants to merge 295 commits into from

Conversation

StanislavBreadless
Copy link
Contributor

@StanislavBreadless StanislavBreadless commented May 14, 2024 •
edited
Loading

What ❔

This is a semi-stable branch for sync layer integration. It is still WIP and big changes are expected

Why ❔

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 zk fmt and zk lint.
  • Spellcheck has been run via zk spellcheck.

@StanislavBreadless StanislavBreadless changed the title Sync layer stable WIP: synclayer May 14, 2024
@StanislavBreadless StanislavBreadless changed the title WIP: synclayer feat(contracts)!: synclayer integration May 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

Detected VM performance changes

Benchmark name change in estimated runtime change in number of opcodes executed
deploy_simple_contract N/A -105 (-0.6%)
event_spam N/A +65 (+0.0%)
write_and_decode N/A +183 (+0.0%)
finish_eventful_frames N/A -42 (-0.0%)
call_far N/A -72 (-0.0%)
decode_shl_sub N/A +194 (+0.0%)
slot_hash_collision N/A +183 (+0.0%)
access_memory N/A +183 (+0.0%)

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

StanislavBreadless and others added 26 commits June 20, 2024 15:56
@StanislavBreadless
custom DA with SL for first layer
7983315
@StanislavBreadless
custom da layer with server
9276bc5
@StanislavBreadless
remove debug info
811efe6
@StanislavBreadless
make rust unit tests pass
b1e5e23
@StanislavBreadless
cargo fix1
023a2f1
@StanislavBreadless
cargo fix2
91a976f
@StanislavBreadless
cargo fix
ce79734
@StanislavBreadless
resolve lint
b008063
@ly0va
It compiles
c645e22
@StanislavBreadless
latest contracts
e514925
@StanislavBreadless
upd configs
e0ad4ca
@StanislavBreadless
Update contracts (#2288)
a1f1a69 
## What ❔

Brings updates from this PR:
matter-labs/era-contracts#541

## 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 `zk fmt` and `zk lint`.
- [ ] Spellcheck has been run via `zk spellcheck`.
@StanislavBreadless
upd contracts
10c4f7f
@StanislavBreadless
upd contracts
61f4a7f
@StanislavBreadless
return from accidental change
87dad50
@StanislavBreadless
sync with base
a45cfd3
@StanislavBreadless
upd contracts
8badad6
@StanislavBreadless
Merge pull request #2295 from matter-labs/sb-custom-da-with-sl
8b8d427 
feat!: Custom DA with SyncLayer
@StanislavBreadless
wip contracts
267f742
@StanislavBreadless
upd contracts
6deefc0
@StanislavBreadless
basic integration
75dfe4a
@StanislavBreadless
make withdrawals on top of one chain pass
09c0391
@StanislavBreadless
some basic api for proofs of batch inclusion
e252bdc
@ly0va
Add priorityTree layer
3b4c0aa
@ly0va
Bump contracts
13d1321
@StanislavBreadless
agg root in db
c28acb4
@StanislavBreadless
use synced contracts
4e76ddd
@StanislavBreadless
merge with main
8b20416
@StanislavBreadless
latest contracts
33f847c
@StanislavBreadless
fix rust unit
4b32fce
@StanislavBreadless
comment out unused methods
abe5880
@StanislavBreadless
lint fix
6ec1373
@StanislavBreadless
solve lint
41db321
@StanislavBreadless
Merge pull request #2932 from matter-labs/sb-sync-layer-toolbox-funct…
1b619cd 
…ions-with-main

chore: Merge main into toolbox functions
@StanislavBreadless
feat(gateway): Improve variety of chains for sync layer stable (#2938)
01593b0 
## What ❔

Add Validium and ERC20 chains

## 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 `zk fmt` and `zk lint`.
@perekopskiy @slowli
@tomg10 @brunoffranca @zksync-era-bot
fix(vm): small fixes for sync-layer-stable (#2943)
86617dd 
## What ❔

fixes state diff filter (leftover from debug)
uses correct protocol version id to get log tree size

## Why ❔



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

---------

Co-authored-by: Alex Ostrovski <[email protected]>
Co-authored-by: Tomasz Grześkiewicz <[email protected]>
Co-authored-by: Bruno França <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
@perekopskiy
fix: fix state_diff_hash usage (#2960)
3352655 
## What ❔

- squashes some migration (there is no need for them to be separate)
- makes `state_diff_hash`, `local_root`, `aggregated_root` optional in
L1BatchMetadata
- `metadata.state_diff_hash` is used for new batches, system log is used
for old batches
- removes pre boojum code from proof_data_handler 

## 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 `zk fmt` and `zk lint`.
@dimazhornyk
feat: provide inclusion data as operator_da_input (#2965)
cf814d1 
## What ❔

Provide inclusion data as `operator_da_input`

## Why ❔

It allows for the inclusion proofs to be passed to the DA contracts

## 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`.
@perekopskiy
fix(commiment-generator): compatibility with older protocol versions (#…
0c9b1e3 
…2963)

## What ❔

- fixes compatibility with older protocol versions
- refactor code

## 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 `zk fmt` and `zk lint`.
@perekopskiy @slowli
@tomg10 @brunoffranca @zksync-era-bot @EmilLuta @matias-gonz @yorik @mtzsky @popzxc @Deniallugo @Artemka374 @nbaztec @pompon0 @sachanayush47 @dimazhornyk
feat: sync layer merge main (#2982)
e4fcbba 
## What ❔

merge upstream changes

## 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 `zk fmt` and `zk lint`.

---------

Signed-off-by: Danil <[email protected]>
Signed-off-by: tomg10 <[email protected]>
Co-authored-by: Alex Ostrovski <[email protected]>
Co-authored-by: Tomasz Grześkiewicz <[email protected]>
Co-authored-by: Bruno França <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
Co-authored-by: EmilLuta <[email protected]>
Co-authored-by: Matías Ignacio González <[email protected]>
Co-authored-by: Yury Akudovich <[email protected]>
Co-authored-by: mtzsky <[email protected]>
Co-authored-by: Igor Aleksanov <[email protected]>
Co-authored-by: Danil <[email protected]>
Co-authored-by: Artem Fomiuk <[email protected]>
Co-authored-by: Nisheeth Barthwal <[email protected]>
Co-authored-by: Grzegorz Prusak <[email protected]>
Co-authored-by: Ayush Sachan <[email protected]>
Co-authored-by: Dima Zhornyk <[email protected]>
@perekopskiy
test: Restore commitment tests (#2991)
d17546c 
## What ❔

Restores commitment unit tests, adds post-gateway test

## 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`.
@perekopskiy
fix(eth-client): fix l2_fee_history (#2984)
257a77a 
## What ❔

There was a wrong assertion: `if
fee_history.inner.base_fee_per_gas.len() !=
fee_history.l2_pubdata_price.len()`. Instead `base_fee_per_gas.len()`
should equal `l2_pubdata_price.len() + 1`.

Refactors code of l*_fee_history methods: 
- adds exhaustive assertions
- returns errors instead of only logging

## 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`.
@perekopskiy
fix
30636e9
@StanislavBreadless
upd contracts
4a14dc4
@perekopskiy
fix: sync layer compatibility (#2976)
2ab3f98 
## What ❔

Sync layer code backward compatibility. Makes it possible to run server
from this branch if chain was initialized with version < 25

## 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 `zk fmt` and `zk lint`.
@perekopskiy
feat: sync layer merge main (#2997)
8137980 
## What ❔

sync layer merge main

## 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_supervisor fmt` and `zk_supervisor
lint`.
@perekopskiy
Resolve conflicts
fb21d00
@StanislavBreadless
Merge branch 'sync-layer-stable' into sb-use-reorg-in-stable
6b5acb2
@StanislavBreadless
Merge pull request #2996 from matter-labs/sb-use-reorg-in-stable
8f43a5f 
chore(gateway): Update contracts
@kelemeno @Raid5594
feat: l2 native token tests (#2916)
dfe03d3 
## 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? -->
<!-- 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 `zk fmt` and `zk lint`.

---------

Co-authored-by: Raid5594 <[email protected]>
Co-authored-by: Raid Ateir <[email protected]>
@perekopskiy
fix: remove l1 tx merkle tree from eth watch (#3099)
d31dc15 
## What ❔

Previously eth sender relied on eth watch to populate shared l1 tx
merkle tree with new hashes. It works as long as eth sender and eth
watch are run in the same process but it's not guaranteed.
I've changed the approach, now eth sender loads new txs from DB and
populates its tree. We don't need tree in eth watch anymore

## Why ❔

Node should work if eth sender and eth watch are run as different
processes.

## 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`.
@perekopskiy
feat: merge main to sync-layer-stable (#3182)
a5df3c2 
## 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? -->
<!-- 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`.
@perekopskiy
feat: merge main to sync-layer-stable (#3184)
0835f8d 
## What ❔

merge main to sync-layer-stable

## 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`.
@perekopskiy
finally resolve conflicts
8d6de59
@perekopskiy
chore: restore DA hash test (#3191)
c291a2b 
## What ❔

Restore test + clean up

## 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`.
@perekopskiy
feat(gateway): refine l2 l1 logs proofs (#3078)
4897a6e 
## What ❔

Reworks how node generates proofs for l2-l1 logs. Adds new eth-watch
processor that listens to `AppendedChainBatchRoot` events, updates batch
tree and saves proof to DB. API reads those proofs on requests


## Why ❔

- optimize for performance -- no need to rebuild batch tree each time,
now eth watch holds only one tree
- brush up code 

## 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_supervisor fmt` and `zk_supervisor
lint`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kelemeno kelemeno kelemeno left review comments

@perekopskiy perekopskiy perekopskiy left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@StanislavBreadless @EmilLuta @kelemeno @perekopskiy @ly0va @koloz193 @tomg10 @dimazhornyk