Skip to content

[WIP] Zksync os integration #4121

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
Open
wants to merge 202 commits into
base: main
Choose a base branch
from
Open

[WIP] Zksync os integration #4121

wants to merge 202 commits into from

Conversation

RomanBrodetski
Copy link
Collaborator

What ❔

Why ❔

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.

popzxc and others added 30 commits October 30, 2024 10:52
@popzxc
Fix deps for zksync_utils
34f542d
@popzxc
Glue sort_storage_access_queries to latest sequencer API
f27a2a4
@popzxc
Multivm compiles on stable
6dc05d8
@popzxc
Merge branch 'main' into popzxc-stable-rust
175986c
@popzxc
Merge main
1f6c673
@popzxc
Merge main
c3b2460
@popzxc
Core compiles
e10cc0a
@popzxc
Prover compiles
6a6c6c0
@popzxc
fmt
88eacad
@popzxc
Remove unneded file
e24d512
@popzxc
Fix build for gpu prover
07dfdf9
@RomanBrodetski
WIP
f8c3605
@RomanBrodetski
use of zk_ee
02c5fab
@RomanBrodetski
more changes
9bb0a48
@RomanBrodetski
temporary use older branch of zk_ee
ab953b6
@RomanBrodetski
readme
9593692
@RomanBrodetski
readme
2613d39
@RomanBrodetski
readme
1efa6c8
@RomanBrodetski
readme
442be18
@AntonD3
feat(zk_os): works with main zk_ee branch (#3380)
9947071 
## What ❔

Use main branch of zk_ee and fixes to make it works.

## Why ❔

to integrate newest zk_ee 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`.
@AntonD3
Support l1 -> l2 transactions
bd30ee2
@AntonD3
Remove debug println
0ce6ea5
@AntonD3
Update contracts
017d738
@AntonD3
l1 settlement works with mock data
6444d46
@AntonD3
Temporary fix to get deployment address in receipt
611889a
@perekopskiy
sqlx-data upd
b567231
@RomanBrodetski @perekopskiy
use nonces from storage
df16311
@perekopskiy
some test are working
4e11952
@perekopskiy
ci
8e0097e
@perekopskiy
fmt
77e23e8
mm-zk and others added 2 commits July 2, 2025 22:08
@mm-zk
feat: Updated to airbender 0.3.3 (#4274)
a6c784e 
## What ❔

* Updated dependencies to airbender 0.3.3 & zkos-wrapper 0.3.3
* updated keys
* I did NOT update the app.bin - it still uses 'older' 0.0.4 version
from zksync-os
@Deniallugo @onyxet
@zksync-dev-robot @mm-zk
feat(ci): Generate verification keys (#4261)
720666c 
## 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]>
Co-authored-by: Rodion Sabodash <[email protected]>
Co-authored-by: zksync-admin-bot2 <[email protected]>
Co-authored-by: mm <[email protected]>
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 2, 2025
View reviewed changes
.github/workflows/release-zkos-stage.yml
Comment on lines +79 to +91
name: Build and push images
needs: [ setup, changed_files ]
uses: ./.github/workflows/build-zksync-os-prover-template.yml
if: needs.changed_files.outputs.prover == 'true' || needs.changed_files.outputs.all == 'true'
with:
image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
action: "push"
secrets:
DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}


regenerate-keys:

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
.github/workflows/release-zkos-stage.yml
Comment on lines +92 to +95
name: Regenerate keys
needs: [ setup, changed_files ]
if: needs.changed_files.outputs.execution_environment == 'true'
uses: ./.github/workflows/update-verification-keys.yml

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {}
.github/workflows/update-verification-keys.yml Outdated
Comment on lines 8 to 65
name: Generate verification keys and create PR
runs-on: [ matterlabs-ci-runner-high-performance ]
steps:
- name: Checkout Repo A (with submodules)
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
token: ${{ secrets.GH_PUBLIC_TOKEN }}

- name: Setup environment
run: |
echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
echo $(pwd)/bin >> $GITHUB_PATH
echo IN_DOCKER=1 >> .env
echo "SCCACHE_GCS_BUCKET=matterlabs-infra-sccache-storage" >> .env
echo "SCCACHE_GCS_SERVICE_ACCOUNT=gha-ci-runners@matterlabs-infra.iam.gserviceaccount.com" >> .env
echo "SCCACHE_GCS_RW_MODE=READ_WRITE" >> .env
echo "RUSTC_WRAPPER=sccache" >> .env
echo "CONTRACTS_STABLE_BRANCH=zksync-os-stable" >> $GITHUB_ENV

- name: Git config
run: |
git config --global user.email "[email protected]"
git config --global user.name "zksync-admin-bot2"

- name: Start services
run: |
ci_localnet_up

- name: git config for cloning private repos
run: |
ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf ssh://[email protected]/
ci_run git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:[email protected]/".insteadOf https://github.com/

- name: Install zkstack
run: |
ci_run ./zkstack_cli/zkstackup/install -g --path ./zkstack_cli/zkstackup/zkstackup
ci_run zkstackup -g --local

- name: Generate verification keys
run: |
ci_run zkstack prover generate-snark-keys -v


- name: Make changes in submodule
run: |
cd contracts
git checkout ${{ env.CONTRACTS_STABLE_BRANCH }}
git add .
git commit -m "Update Verification keys" || echo "No changes"
git push origin ${{ env.CONTRACTS_STABLE_BRANCH }}

- name: Update submodule
run: |
git add contracts
git commit -m "Update verification keys" || echo "No changes"
git push origin HEAD

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
mm-zk and others added 4 commits July 2, 2025 22:56
@mm-zk
chore: also fix commitments (#4275)
193db61 
## What ❔
* also fix commitments - set the proper hash there too.
@Deniallugo
fix(generate-keys): Update genesis (#4277)
b1bc46f 
## 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]>
@kelemeno @Deniallugo
Kl/zkos default upgrades support (#4295)
af6225c 
## 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]>
Co-authored-by: Danil <[email protected]>
@Deniallugo
new formatter (#4304)
83c4208 
## 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]>
github-advanced-security[bot]
github-advanced-security bot found potential problems Jul 10, 2025
View reviewed changes
core/tests/recovery-test/src/index.ts
}
}
try {
await promisify(exec)(`killall -q -${signal} zksync_external_node`);

Check warning

Code scanning / CodeQL

Unsafe shell command constructed from library input Medium test

This string concatenation which depends on
library input
Loading
is later used in a
shell command
Loading
.
docs/js/version-box.js
versionSelector.addEventListener("change", function () {
const selectedVersion = versionSelector.value;
// Redirect to the selected version URL
window.location.href = "/zksync-era/core" + selectedVersion;

Check warning

Code scanning / CodeQL

DOM text reinterpreted as HTML Medium documentation

DOM text
Loading
is reinterpreted as HTML without escaping meta-characters.
etc/utils/src/index.ts
});
command = command.replace(/\n/g, " ");
console.log(`+ ${command}`);
const child = _spawn(command, { stdio: "inherit", shell: true });

Check failure

Code scanning / CodeQL

Uncontrolled command line Critical

This command line depends on a
user-provided value
Loading
.
prover/docs/js/version-box.js
versionSelector.addEventListener("change", function () {
const selectedVersion = versionSelector.value;
// Redirect to the selected version URL
window.location.href = "/zksync-era/prover" + selectedVersion;

Check warning

Code scanning / CodeQL

DOM text reinterpreted as HTML Medium documentation

DOM text
Loading
is reinterpreted as HTML without escaping meta-characters.
@Deniallugo
fix(ci): do not build other server components (#4305)
84f23bc 
## 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]>
@Deniallugo
a few fixes
2aead39 
Signed-off-by: Danil <[email protected]>
@Deniallugo
Add some metrics
6b2c28c 
Signed-off-by: Danil <[email protected]>
@Deniallugo
Run house keeper and expose prover metrics
72d43cf 
Signed-off-by: Danil <[email protected]>
@Deniallugo
Rename house keeper
63f74cc 
Signed-off-by: Danil <[email protected]>
@Deniallugo
fix(ci): Rename containers (#4315)
016d8cd 
## 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]>
EmilLuta and others added 6 commits July 23, 2025 14:26
@EmilLuta
Add aggregated SNARKifying (#4339)
e42730a
@EmilLuta
Update README & .dockerignore (#4340)
feb5b59 
README for notes on updating the app.bin.
.dockerignore so docker build succeeds
@yorik
fix: Install cmake for snark prover (#4341)
e2f3d4f 
## What ❔

Install cmake for snark prover, set CUDA ARCH.

<!-- 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 ❔

To fix snark prover build.

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

- [x] 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`.

ref ZKD-2889
@EmilLuta
Unpin universal verifier (#4342)
81ff1ba
@perekopskiy
feat: merge zksync-os-integration-0.0.5 to zksync-os-integration (#4348)
18f23d2 
## 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`.
@otani88
revert
b5f7e0e
@otani88 otani88 force-pushed the zksync-os-integration branch from 69a9ff8 to b5f7e0e Compare July 25, 2025 09:30
@otani88 otani88 force-pushed the zksync-os-integration branch from fd700b6 to 84373c9 Compare July 25, 2025 10:39
mm-zk and others added 4 commits July 28, 2025 09:37
@mm-zk
chore: Updated contracts to add mock verifier (#4356)
83bddf0 
## What ❔

* Added mock verifier
@RomanBrodetski
update app.bins
862a5e9
@perekopskiy @itegulov
feat: add fri prover lib and update app (#4366)
21fcbbb 
## What ❔

 add fri prover lib and update app

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

---------

Co-authored-by: Daniyar Itegulov <[email protected]>
@RomanBrodetski
update genesis.yaml to match the one in zksync-os after state commitm…
a87a3f4 
…ent change
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

@otani88 otani88 Awaiting requested review from otani88 otani88 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

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.