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

Implement CircuitExt for EVM circuits #8

Merged
merged 10 commits into from
Mar 31, 2023
Merged

Implement CircuitExt for EVM circuits #8

merged 10 commits into from
Mar 31, 2023

Conversation

silathdiir
Copy link

@silathdiir silathdiir commented Mar 30, 2023 •
edited
Loading

Summary

  1. For EvmCircuit, return zero for num_instance and an empty vector for instances (accumulator_indices and selectors are left as default).

  2. Update other evm circuits as above.

  3. Add test cases to test each circuit verification.

Test

The test case test_evm_circuit_verification, test_poseidon_circuit_verification and test_state_circuit_verification are passed, could be run as:

cargo test -F zkevm -- --nocapture test_evm_circuit_verification

@silathdiir silathdiir mentioned this pull request Mar 30, 2023
Closed
@silathdiir silathdiir changed the title Implement CircuitExt for EvmCircuit Implement CircuitExt for EVM circuits Mar 30, 2023
@zhenfeizhang
Copy link

LGTM. Thanks! will merge once all the tests are completed over super

@zhenfeizhang zhenfeizhang force-pushed the impl-circuit-ext-for-zkevm-circuits branch from ea130e7 to 377b355 Compare March 31, 2023 01:02
@zhenfeizhang zhenfeizhang merged commit f6d18e4 into halo2-ecc-snark-verifier-0323 Mar 31, 2023
@silathdiir silathdiir deleted the impl-circuit-ext-for-zkevm-circuits branch March 31, 2023 01:12
zhenfeizhang added a commit that referenced this pull request Apr 12, 2023
@zhenfeizhang
[macro] squashing commits for pre-rebase diffs
17ded0e 
[chore] update cargo.toml

[fix] use shplonk instead of gwc for aggregation

[feat] tests cases for the sdk

[feat] testing scripts

[placeholer] impl CircuitExt for zkevm-circuits.

Fix the build for branch `halo2-ecc-snark-verifier-0323`. (#3)

[feat] single layer testing with variant circuits

[feat] api wrappers for SNARK's rust native verifier

[feat] unit test for correct CircuitExt implementation

Implement `CircuitExt` for EVM circuits (#8)

* Implement trait `CircuitExt` for zkevm circuits.

* Add `EvmCircuit` test case.

* add test script

* [feat] expand circuit unit tests with aggregation and evm verification; two layers recursion unit test

---------

Co-authored-by: Zhuo Zhang <[email protected]>
Co-authored-by: zhenfei <[email protected]>

[chore] update cargo lock

Update Cargo.toml

[revert] undo cargo fmt

This reverts commit 77c9bd4.

make zkevm-circuits dependency as dev dependency; get rid of jemalloc

add default CircuitExt impl
zhenfeizhang added a commit that referenced this pull request Apr 12, 2023
@zhenfeizhang
[macro] squashing commits for pre-rebase diffs
1a2d092 
[chore] update cargo.toml

[fix] use shplonk instead of gwc for aggregation

[feat] tests cases for the sdk

[feat] testing scripts

[placeholer] impl CircuitExt for zkevm-circuits.

Fix the build for branch `halo2-ecc-snark-verifier-0323`. (#3)

[feat] single layer testing with variant circuits

[feat] api wrappers for SNARK's rust native verifier

[feat] unit test for correct CircuitExt implementation

Implement `CircuitExt` for EVM circuits (#8)

* Implement trait `CircuitExt` for zkevm circuits.

* Add `EvmCircuit` test case.

* add test script

* [feat] expand circuit unit tests with aggregation and evm verification; two layers recursion unit test

---------

Co-authored-by: Zhuo Zhang <[email protected]>
Co-authored-by: zhenfei <[email protected]>

[chore] update cargo lock

Update Cargo.toml

[revert] undo cargo fmt

This reverts commit 77c9bd4.

make zkevm-circuits dependency as dev dependency; get rid of jemalloc

add default CircuitExt impl
zhenfeizhang pushed a commit that referenced this pull request Sep 25, 2023
@jonathanpwang
Minor update (#8)
57aaba5 
* feat(sdk): remove duplicate code in
`RangeWithInstanceCircuitBuilder::synthesize`

* feat(sdk): Proof caching when using feature 'halo2-pse'

* chore: sync with halo2-lib

* chore: switch to halo2-lib release-0.3.0 branch
zhenfeizhang pushed a commit that referenced this pull request Sep 25, 2023
@jonathanpwang @han0110
@DoHoonKim8 @ChihChengLiang @CPerezz @alexander-camuto
Release 0.1.1 (#19)
43e95ce 
* Rollback to pse halo2 and halo2wrong for first release (#5)

* feat: move `Accumulator` to `accumulator.rs`

* feat: update due to halo2

* feat: upgrade to use branch `feature/generic-instructions` of `halo2wrong`

* refactor: rollback to `{halo2,halo2_wrong}` without challenge API and cleanup dependencies

* chore: rename statement to instance and auxliary to witness

* chore: use `finalize` instead of `code`

* feat: add `Code::deployment` and `EvmLoader::deployment_code`; add example `evm-verifier-codegen`

* fix: typo

* feat: reduce generated evm verifier size; rename to `evm-verifier` and add another example `evm-verifier-with-accumulator`

* fix: due to `halo2wrong`

* feat: reorganize mods and traits

* fix: allow empty `values` in `sum_*` and move them under `ScalarLoader`

* ci: use `--all-features` for `cargo test`

* fix: use same strategy for aggregation testing

* fix: simplify trait `PlonkVerifier` again

* fix: move system specified transcript under mod `system`

* feat: add `quotient_poly` info in `Protocol`

* feat: implement linearization for circom integration

* feat: re-export loader's dependency for consumer

* refactor: for circom's integration

* tmp: pin `revm` to rev

* fix: remove parentheses

* fix: upgrade for multi-phase halo2

* feat: improve error reporting

* chore: rename crate to snake case

* feat: add `Domain` as an input of `PolynomialCommitmentScheme::read_proof`

* refactor: for further integration

* feat: generalize to suppoer also ipa and add builder fns to `system::halo2::Config`

* feat: add `KzgDecider` for simple evm verifier

* refactor: split `AccumulationScheme` and `AccumulatorEncoding`

* refactor: split `PolynomialCommitmentScheme` and `MultiOpenScheme`

* fix: not need sealed actually

* fix: `chunk_size` should be `LIMBS` when recovering accumulator

* feat: add `Expression::DistributePowers` to avoid stack overflow

* fix: update and pin foundry

* fix: move testing circuits under `system/halo2`

* fix: allow accumulate single accumulator

* feat: remove all patch and make less depending `halo2wrong`

* Generalized `Halo2Loader` (#12)

* feat: generalize `Protocol` for further usage

* feat: add `EccInstruction::{fixed_base_msm,variable_base_msm,sum_with_const}`

* chore: move `rand_chacha` as dev dependency

* General refactor for further integration (#13)

* feat: remove dev-dependency `foundry` and vendor necessary part of it

* refactor: simplify traits and remove unused stuff

* refactor: much less clone

* feat: generalized `AccumulatorEncoding` for `EccInstructions`

* feat: implement ipa pcs and accumulation (#14)

* ci: add `svm-rs` and install `[email protected]` in job `test` (#16)

* Update `EvmLoader` to generate Yul code instead of bytecode (#15)

* Update `EvmLoader` to generate Yul instead of bytecode

* feat: simplify

* feat: Add missing end_gas_metering impl

Co-authored-by: Han <[email protected]>

Co-authored-by: Han <[email protected]>

* fix: pin all `revm` dependencies (#18)

* fix: looser trait bound on impl `CostEstimation` for `Plonk` (#20)

* Restructure for more kind of verifier (#21)

* feat: restructure to monorepo and expand the project scope to be generic (s)nark verifier

* feat: reorganize mods and traits for further new features

* refactor: simplify trait bounds

* chore: use hyphen case for crate name (`snark_verifier` -> `snark-verifier`)

* docs: add `#![deny(missing_docs)]` and simple documents

* refactor: remove redudant check `validate_ec_point` (still doesn not support identity)

* feat: expand more things and fix typos

Co-authored-by: Chih Cheng Liang <[email protected]>
Co-authored-by: Carlos Pérez <[email protected]>

* fix: rustdoc warnings

* chore: update dependencies (#24)

* chore: update `halo2` and `halo2wrong` version (#25)

* fix: enable `util::hash::poseidon` only when `feature = loader_halo2` (#27)

* feat: working update to halo2-lib v0.3.0

* feat: update zkevm bench

* feat: update recursion example

* feat: switch poseidon native implementation to Scroll's audited version

* fix: invert determinant only once in Cramer's rule

* chore: fix doc

* chore

* chore: forgot to update halo2-base dependency in snark-verifier-sdk

* Minor update (#8)

* feat(sdk): remove duplicate code in
`RangeWithInstanceCircuitBuilder::synthesize`

* feat(sdk): Proof caching when using feature 'halo2-pse'

* chore: sync with halo2-lib

* chore: switch to halo2-lib release-0.3.0 branch

* Moved `RangeWithInstanceCircuitBuilder` to halo2-lib (#9)

* chore: sync with halo2-lib

* fix: clippy

* chore: fix halo2-base branch in sdk

* feat: update to halo2-lib new types (#10)

* feat: add `assert` for non-empty accumulators in `decide_all` (#11)

* feat: use `zip_eq` for `Polynomial` add/sub (#12)

* fix: git CI turn off all features

* fix: `rotate_scalar` misbehaves on `i32::MIN` (#13)

Should never actually be callable with such a large negative rotation

* fix: cleanup code quality (#14)

* fix: `split_by_ascii_whitespace` (#15)

* fix: `batch_invert_and_mul` do not allow zeros (#16)

* feat: verify proof in release mode (#17)

Verify proof before caching it as extra safety

* fix: add better error messages/docs for catching empty inputs (#18)

* chore: add Cargo.lock

* chore: update Cargo dependencies

* feat: fix versions and tags for dependencies

---------

Co-authored-by: Han <[email protected]>
Co-authored-by: DoHoon Kim <[email protected]>
Co-authored-by: Chih Cheng Liang <[email protected]>
Co-authored-by: Carlos Pérez <[email protected]>
Co-authored-by: dante <[email protected]>
Co-authored-by: Jonathan Wang <[email protected]>
z2trillion pushed a commit that referenced this pull request Jun 24, 2024
@jonathanpwang @han0110
@DoHoonKim8 @ChihChengLiang @CPerezz @alexander-camuto @rpalakkal
Release 0.1.6 (axiom-crypto#47)
229ceab 
* Rollback to pse halo2 and halo2wrong for first release (#5)

* feat: move `Accumulator` to `accumulator.rs`

* feat: update due to halo2

* feat: upgrade to use branch `feature/generic-instructions` of `halo2wrong`

* refactor: rollback to `{halo2,halo2_wrong}` without challenge API and cleanup dependencies

* chore: rename statement to instance and auxliary to witness

* chore: use `finalize` instead of `code`

* feat: add `Code::deployment` and `EvmLoader::deployment_code`; add example `evm-verifier-codegen`

* fix: typo

* feat: reduce generated evm verifier size; rename to `evm-verifier` and add another example `evm-verifier-with-accumulator`

* fix: due to `halo2wrong`

* feat: reorganize mods and traits

* fix: allow empty `values` in `sum_*` and move them under `ScalarLoader`

* ci: use `--all-features` for `cargo test`

* fix: use same strategy for aggregation testing

* fix: simplify trait `PlonkVerifier` again

* fix: move system specified transcript under mod `system`

* feat: add `quotient_poly` info in `Protocol`

* feat: implement linearization for circom integration

* feat: re-export loader's dependency for consumer

* refactor: for circom's integration

* tmp: pin `revm` to rev

* fix: remove parentheses

* fix: upgrade for multi-phase halo2

* feat: improve error reporting

* chore: rename crate to snake case

* feat: add `Domain` as an input of `PolynomialCommitmentScheme::read_proof`

* refactor: for further integration

* feat: generalize to suppoer also ipa and add builder fns to `system::halo2::Config`

* feat: add `KzgDecider` for simple evm verifier

* refactor: split `AccumulationScheme` and `AccumulatorEncoding`

* refactor: split `PolynomialCommitmentScheme` and `MultiOpenScheme`

* fix: not need sealed actually

* fix: `chunk_size` should be `LIMBS` when recovering accumulator

* feat: add `Expression::DistributePowers` to avoid stack overflow

* fix: update and pin foundry

* fix: move testing circuits under `system/halo2`

* fix: allow accumulate single accumulator

* feat: remove all patch and make less depending `halo2wrong`

* Generalized `Halo2Loader` (#12)

* feat: generalize `Protocol` for further usage

* feat: add `EccInstruction::{fixed_base_msm,variable_base_msm,sum_with_const}`

* chore: move `rand_chacha` as dev dependency

* General refactor for further integration (#13)

* feat: remove dev-dependency `foundry` and vendor necessary part of it

* refactor: simplify traits and remove unused stuff

* refactor: much less clone

* feat: generalized `AccumulatorEncoding` for `EccInstructions`

* feat: implement ipa pcs and accumulation (#14)

* ci: add `svm-rs` and install `[email protected]` in job `test` (#16)

* Update `EvmLoader` to generate Yul code instead of bytecode (#15)

* Update `EvmLoader` to generate Yul instead of bytecode

* feat: simplify

* feat: Add missing end_gas_metering impl

Co-authored-by: Han <[email protected]>

Co-authored-by: Han <[email protected]>

* fix: pin all `revm` dependencies (#18)

* fix: looser trait bound on impl `CostEstimation` for `Plonk` (#20)

* Restructure for more kind of verifier (#21)

* feat: restructure to monorepo and expand the project scope to be generic (s)nark verifier

* feat: reorganize mods and traits for further new features

* refactor: simplify trait bounds

* chore: use hyphen case for crate name (`snark_verifier` -> `snark-verifier`)

* docs: add `#![deny(missing_docs)]` and simple documents

* refactor: remove redudant check `validate_ec_point` (still doesn not support identity)

* feat: expand more things and fix typos

Co-authored-by: Chih Cheng Liang <[email protected]>
Co-authored-by: Carlos Pérez <[email protected]>

* fix: rustdoc warnings

* chore: update dependencies (#24)

* chore: update `halo2` and `halo2wrong` version (#25)

* fix: enable `util::hash::poseidon` only when `feature = loader_halo2` (#27)

* feat: working update to halo2-lib v0.3.0

* feat: update zkevm bench

* feat: update recursion example

* feat: switch poseidon native implementation to Scroll's audited version

* fix: invert determinant only once in Cramer's rule

* chore: fix doc

* chore

* chore: forgot to update halo2-base dependency in snark-verifier-sdk

* Minor update (#8)

* feat(sdk): remove duplicate code in
`RangeWithInstanceCircuitBuilder::synthesize`

* feat(sdk): Proof caching when using feature 'halo2-pse'

* chore: sync with halo2-lib

* chore: switch to halo2-lib release-0.3.0 branch

* Moved `RangeWithInstanceCircuitBuilder` to halo2-lib (#9)

* chore: sync with halo2-lib

* fix: clippy

* chore: fix halo2-base branch in sdk

* feat: update to halo2-lib new types (#10)

* feat: add `assert` for non-empty accumulators in `decide_all` (#11)

* feat: use `zip_eq` for `Polynomial` add/sub (#12)

* fix: git CI turn off all features

* fix: `rotate_scalar` misbehaves on `i32::MIN` (#13)

Should never actually be callable with such a large negative rotation

* fix: cleanup code quality (#14)

* fix: `split_by_ascii_whitespace` (#15)

* fix: `batch_invert_and_mul` do not allow zeros (#16)

* feat: verify proof in release mode (#17)

Verify proof before caching it as extra safety

* fix: add better error messages/docs for catching empty inputs (#18)

* chore: add Cargo.lock

* chore: update Cargo dependencies

* chore: update dependencies

* Minor: merge v0.1.1 to develop (#21)

Just cargo fixes

* feat: remove use of env vars for circuit configuration (#22)

* feat: remove use of env vars for circuit configuration

This is a companion to axiom-crypto/halo2-lib#92

* chore: remove rustfmt CI check

PSE upstream uses different rustfmt configuration than us, so some files
disagree in formatting

* chore: fix dependencies

* Feat/read pk buffer capacity (#24)

* feat: change default `read_pk` buffer capacity to 1MB

* feat: add bench for read_pk

* [Update] use ff v0.13 (#28)

* feat(snark-verifier): update to ff v0.13

* feat(snark-verifier): update examples

* feat(snark-verifier-sdk): update to ff v0.13

* fix: conversion from BaseConfigParams to AggregationConfigParams

* chore: pin poseidon rev

* refactor(sdk): add `AggregationCtxBuilder` for aggregation

Contains the populated builder after aggregating, without creating the
`AggregationCircuit`. Doesn't need config parameters and break points.

* chore: update cargo

* [Feat] Universal verifier circuit (#26)

* feat: add example with different vkey as private witness

Same aggregation circuit, verifies different snarks with different vkeys
(same standard plonk gate, but different selectors / copy constraints)

* fix: save break points when generating agg circuit for first time (#23)

* fix: save break points when generating agg circuit for first time

* chore: add circuit files to gitignore

* feat: halo2-lib universal verifier example

* chore: cargo fix

* feat: allow circuit size (number of rows) to be loaded as witness

* chore: clippy fix

* fix(n_as_witness): computation of shifts depends on `omega`

`omega` which changes when `k` changes, so all shift computations need
to be done as witness. Current implementation is likely not the most
optimal. Instead of storing `shift` as `omega^i`, we store just
`Rotation(i)`. We de-duplicate when possible using `BTreeMap` of
`Rotation`. Note you must use `Rotation` instead of `F` for `BTreeMap`
because the ordering of `omega^i` may change depending on `omega`.

* fix: temp remove pow_var

* add universal verifier range check test

* chore: do not serialize domain_as_witness if none

* Revert "fix: temp remove pow_var"

This reverts commit 69f648e.

* fix: halo2_lib example

* test: halo2_lib with variable lookup table passes

* Bump version to 0.1.3

---------

Co-authored-by: Roshan <[email protected]>

* chore: derive Default for VerifierUniversality

* feat: upgrade `revm` to support lastest hardfork (axiom-crypto#40)

* Update: use `halo2-lib` v0.4.0 (#29)

* feat: update snark-verifier

* update: use `halo2-lib` v0.4.0

* feat: load `k` as witness and compute `n = 2^k` and `omega` from `k` (#30)

* feat: load `k` as witness and compute `n = 2^k` and `omega` from `k`

Removes need to make `omega` a public output in universal verifier.

* fix: bit_length

* Move `OptimizedPoseidonSpec` to `halo2-base` (#31)

* chore: move `OptimizedPoseidonSpec` to `halo2-base`

* Bump version to 0.1.5 and remove poseidon-rs dep

* chore: util::hash available without loader_halo2 feature

* chore: nit

* [feat] change yul code into Solidity assembly (#32)

feat: change yul code into Solidity assembly

Just changes to wrapping yul in solidity assembly block

* chore: change halo2-lib branch

* chore: `snark-verifier` re-exports `halo2-base`, `halo2-ecc` (axiom-crypto#38)

and `snark-verifier-sdk` re-exports `snark-verifier`. This is to
minimize cargo dependency / version issues until we publish to crates.io.

* [feat] make assembly block Solidity memory safe (axiom-crypto#39)

* feat: make assembly block Solidity memory safe

* chore: add back example solidity code

* chore: switch CI to solidity v0.8.19

* [chore] add `cargo audit` and update dependencies (axiom-crypto#40)

* chore: add `cargo audit` and update dependencies

disabling zkevm benches due to versioning issues

* chore: autobenches false

* fix: audit-check CI

* [chore] fix hyperlinks in docs (axiom-crypto#41)

chore: fix hyperlinks in docs

* [chore] separate `revm` import into separate feature (axiom-crypto#44)

* chore: import `ruint` separately to not rely on `revm`

* feat: add feature `revm` to toggle `revm` import

Separates `revm` import, which is only used for testing EVM execution,
from `loader_evm` feature, which is used more broadly for generating
proofs to be sent to on-chain verifier.

* chore: add CI to check `--release` compilation with assembly

* fix: import under revm

* fix: compute `system_challenge_offset` correctly (axiom-crypto#53)

* chore: turn off halo2-pse for crates.io

* chore: add package descriptions

* chore: update description

* chore: add snark-verifier version

---------

Co-authored-by: Han <[email protected]>
Co-authored-by: DoHoon Kim <[email protected]>
Co-authored-by: Chih Cheng Liang <[email protected]>
Co-authored-by: Carlos Pérez <[email protected]>
Co-authored-by: dante <[email protected]>
Co-authored-by: Jonathan Wang <[email protected]>
Co-authored-by: Roshan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lispc lispc Awaiting requested review from lispc

@zhenfeizhang zhenfeizhang Awaiting requested review from zhenfeizhang

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

Successfully merging this pull request may close these issues.
3 participants
@silathdiir @zhenfeizhang @lispc