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.

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

[WIP] Validium PoC #5

Closed
wants to merge 185 commits into from
Closed

[WIP] Validium PoC #5

wants to merge 185 commits into from

Conversation

igamigo
Copy link

@igamigo igamigo commented Nov 2, 2023

What ❔

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.

# What ❔

* Fixing compilation error in Cargo
* and clippy warning

## Why ❔

* To make CI pass
# What ❔

* Changed witness for snark wrapper - to pass the previous AUX and META
fields
* updated snark_wrapper_verification key to the latest version
* updated the vk_hash to match the newly generated JSON, and made sure
that it is being loaded at genesis.

## Why ❔

* to make boojnet work locally
# What ❔

* Adding zk status prover command to see the current state of FRI prover
* mostly focused on local deployments (might require some changes before
we run it on boojnet)

## Why ❔

* to better see what's going on in the prover pipeline

## Checklist

```shell
zk status prover
```


![image](https://github.com/matter-labs/zksync-era/assets/128217157/75cf1137-2479-449d-98cd-0eda75091bf6)
…inputs (#157)

# What ❔

* We were passing incorrect argument to the prover

## Why ❔

* to make prover work, the original problem was a simple bug/typo.
# What ❔

* Added CONTRACTS_PROVER_AT_GENESIS flag to control which prover should
be used during genesis
* Updated zk status command to compare the keys in the database and in
the contracts

## Why ❔

* without this flag, we were pushing the old keys to the contracts,
which resulted in failed proofs.
# What ❔

Prover and Witgen now use snark wrapper VKs to pick their jobs.

## Why ❔

`prover_protocol_versions` table had SNARK wrapper VKs, but prover and
witgens picked jobs based on FRI scheduler VKs.

Since if one changes the other also does, we can use the SNARK one
instead, since it's also used in `eth_sender`.

---------

Co-authored-by: Stanislav Bezkorovainyi <stanislavbezkor@gmail.com>
# What ❔

Checking out latest 'dev' branches in era-contracts and
era-system-contracts

## Why ❔

To have the latest contracts changes after boojum-integration branches
were merged to dev

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

Merge main branch into boojum-integration

## Why ❔

To not get far behind

## 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 <deniallugo@gmail.com>
Co-authored-by: Yury Akudovich <ya@matterlabs.dev>
Co-authored-by: Shahar Kaminsky <sk@matterlabs.dev>
Co-authored-by: Aleksandr Stepanov <alexandrst88@gmail.com>
Co-authored-by: Maksym <maksym.kryva@gmail.com>
Co-authored-by: Danil <deniallugo@gmail.com>
Co-authored-by: Alex Ostrovski <slowli@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: agolajko <57454127+agolajko@users.noreply.github.com>
Co-authored-by: AnastasiiaVashchuk <72273339+AnastasiiaVashchuk@users.noreply.github.com>
# What ❔

Use SNARK wrapper VK instead of FRI scheduler VK in proof_data_handler

## Why ❔

It will be saved to `prover_fri_protocol_versions`, and we need them
consistent with `protocol_versions`.


## 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`.
chore: Merge main into boojum-integration
@shahar4
Copy link

shahar4 commented Nov 10, 2023

@igamigo I'd love to see the draft. Do you mind rebasing this onto the main branch as the boojum-integration branch was merged into it?

@ColoCarletti ColoCarletti changed the base branch from boojum-integration to main November 17, 2023 15:18
@ColoCarletti ColoCarletti changed the base branch from main to boojum-integration November 17, 2023 15:31
@ColoCarletti ColoCarletti changed the base branch from boojum-integration to main November 17, 2023 15:31
@mationorato mationorato changed the title Validium PoC [WIP] Validium PoC Dec 13, 2023
@ilitteri
Copy link
Collaborator

Superseded by #11

@ilitteri ilitteri closed this Dec 15, 2023
@ilitteri ilitteri deleted the validium branch January 23, 2024 21:06
Oppen pushed a commit that referenced this pull request Feb 9, 2024
Add comment on `MAX_SYSTEM_CONTRACT_ADDRESS` choice
fkrause98 pushed a commit that referenced this pull request Feb 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.