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 309 commits into
base: main
Choose a base branch
from
Draft

feat(contracts)!: synclayer integration #1934

wants to merge 309 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 24, 2024 10:39
@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
@ly0va
Add the forgotten file
16ef371
@ly0va
Merge branch 'sync-layer-stable' into lyova-integrate-priority-merkle…
f4ab30f 
…-tree_
@StanislavBreadless
withdrawals work for 1 layer and agg proof is corect
06c118e
@ly0va
Bump contracts
ba6a188
@ly0va
zk fmt
ecc0d2a
@kelemeno @Raid5594 @StanislavBreadless
feat: more system contracts support, WIP (#2273)
066232f 
## 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`.
- [ ] Spellcheck has been run via `zk spellcheck`.

---------

Co-authored-by: Raid Ateir <[email protected]>
Co-authored-by: Raid5594 <[email protected]>
Co-authored-by: Stanislav Breadless <[email protected]>
@StanislavBreadless
comms work
29a49e8
@ly0va
Fix caching bug
b416ea8
@ly0va
Tests and fixes
a0eebb1
@StanislavBreadless
new contracts
52c99cd
@StanislavBreadless
sync with base
67a40b3
@StanislavBreadless
int tests with withdrawals work
a6a8c0f
@kelemeno
feat: blobhash-compilation-fix-support (#2336)
2b928a0 
## 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`.
- [ ] Spellcheck has been run via `zk spellcheck`.
@StanislavBreadless
partially resolve unit tests
c61ac5d
perekopskiy and others added 30 commits October 2, 2024 11:59
@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`.
@perekopskiy
add gateway changes to fast vm
5df1976
@perekopskiy
resolve conflicts; add subversion to vm_fast
0823efb
@perekopskiy
uncomment tests
3ed7362
@perekopskiy
remove todo
996e132
@perekopskiy
uncomment more tests
9dd4416
@perekopskiy
fix zkstack init
3f61eff
@perekopskiy
uncomment vm-benchmark tests; remove timestamp_asserter_addr from zks…
2e6f673 
…tack config for now
@perekopskiy
add timestamp asserter
4b4ff81
@perekopskiy
fmt
7fbb1c1
@perekopskiy
uncomment one more test
59e8367
@perekopskiy @itegulov
@dimazhornyk @yorik @pompon0 @manuelmauro @cytadela8 @ischasny @slowli @zksync-era-bot @EmilLuta @joonazan @Deniallugo
feat(vm): support vm_fast in gateway branch with tests (#3238)
84bd2c6 
## What ❔

Ports VM changes to vm_fast that are needed for gateway version. Code
changes are mostly copied from vm_latest.
Uncomments some tests.

## 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]>
Co-authored-by: Daniyar Itegulov <[email protected]>
Co-authored-by: Dima Zhornyk <[email protected]>
Co-authored-by: Yury Akudovich <[email protected]>
Co-authored-by: Grzegorz Prusak <[email protected]>
Co-authored-by: Manuel Mauro <[email protected]>
Co-authored-by: Artur Puzio <[email protected]>
Co-authored-by: Ivan Schasny <[email protected]>
Co-authored-by: Alex Ostrovski <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
Co-authored-by: EmilLuta <[email protected]>
Co-authored-by: Joonatan Saarhelo <[email protected]>
Co-authored-by: Ivan Schasny <[email protected]>
Co-authored-by: Danil <[email protected]>
Co-authored-by: zksync-era-bot <[email protected]>
@StanislavBreadless
Revert "feat(vm): support vm_fast in gateway branch with tests (#3238)"
0fce417 
This reverts commit 84bd2c6.
@StanislavBreadless
Merge pull request #3261 from matter-labs/revert-3238-gateway-vm-fast…
4e05691 
…-with-tests

Revert "feat(vm): support vm_fast in gateway branch with tests"
@StanislavBreadless
Merge pull request #3262 from matter-labs/gateway-vm-fast-with-tests
b1ff2ab 
Gateway vm fast with tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@perekopskiy perekopskiy perekopskiy left review comments

@kelemeno kelemeno kelemeno 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