Sync halo ecc 1013 by zhenfeizhang · Pull Request #35 · scroll-tech/halo2-snark-aggregator

zhenfeizhang · 2022-10-13T15:49:07Z

No description provided.

…o2-ecc

…verify_circuit now

…alo2_ecc

…iy with zkevm bench

tests for single proof verify in chip for lookup, mul_add pass

…o2_proofs, so they can be uniformly patched at root level

constants during keygen_vk now keygen_vk actually works for tests/mul_add_{single, aggregate}

Made changes because vkey write doesn't currently work.

now passes zkevm_bench with MockProver this resolves an issues where the final_pair computation in verify_circuit was incorrect because halo2_ecc did not detect (0,0) elliptic curve points, which should be treated as identity in the group

circuit and 1 state circuit * switched zkevm and halo2 repos to scroll-dev to get state circuit to prove correctly

* Update Github CI with `secrets.SECRET_REPO_DEPLOY_KEY`. * remove repo token * update cargo lock * switch rust to nightly Co-authored-by: zhenfei <zhenfei.zhang@hotmail.com>

* use embedded template for solidity * fix tera escape * check pairing in soli gen * add pairing check * more log * fix halo2 * log final pair check in instance * fix all... * ..

lispc · 2022-10-25T04:09:31Z

the diffs here is a bit strange... for example most changes in halo2-snark-aggregator-solidity/src/lib.rs seems already in main. the strange history is difficult for reviewing. We can continue development using this branch but before final review & merge we should refactor the git history

lispc · 2022-10-25T04:56:22Z

other case is in halo2-snark-aggregator-solidity/src/lib.rs, 63 becomes 33 again in poseidon param..

Also in halo2-snark-aggregator-circuit/src/verify_circuit.rs

lispc · 2022-10-25T04:57:38Z

btw later the deleted function print_points_profiling should be recovered, it is useful

lispc · 2022-10-26T03:36:04Z

seems fixed.

TODOs before merge of this PR

clean println
poseidon parameter is inconsistent. 63 <-> 33
embed "verify_circuit.config" using "include_str" marco
as a lib, halo2-snark-aggregator better not directly write&read filesystem in get_params_cached
some changes are incorrectly reverted/missed. in verify_circuit.rs, key: format!("{}_p{}", self.0[ci].name, i), reverted to key: format!("c{}p{}", ci, i), incorrectly.
recover the deleted print_points_profiling function.

zhenfeizhang · 2022-10-26T21:30:37Z

seems fixed.

TODOs before merge of this PR

1. clean println

2. poseidon parameter is inconsistent. 63 <-> 33

3. embed "verify_circuit.config" using "include_str" marco

4. as a lib, halo2-snark-aggregator better not directly write&read filesystem in get_params_cached

5. some changes are incorrectly reverted/missed. in [verify_circuit.rs](https://github.com/scroll-tech/halo2-snark-aggregator/pull/35/files#diff-9d3e9bc089e1acbaf6a290358cb32f7247fb281afd9ec5656ae29591f2a8c199), `key: format!("{}_p{}", self.0[ci].name, i),` reverted to `key: format!("c{}p{}", ci, i),` incorrectly.

6. recover the deleted `print_points_profiling` function.

fixed in c5ce8eb

lispc · 2022-10-28T02:03:54Z

LGTM.

I will use this branch for some real tests using common-rs next week.

@JohnWick2ETH do you have time to have a look at this since it is a huge PR?

kunxian-xia · 2022-10-28T02:10:12Z

sure.

zhenfeizhang · 2022-10-29T01:03:05Z

This PR is not to be merged.
Renaming this branch as halo2-ecc and close this PR.

jonathanpwang and others added 25 commits September 15, 2022 21:25

aggregator-circuit: implement ecc_chip and scalar_chip traits for hal…

85bd7e9

…o2-ecc

aggregator-circuit: implemented all traits for halo2-ecc. Working on …

ffb5027

…verify_circuit now

verify_circuit: got synthesize and synthesize_proof compatible with h…

19f6cb5

…alo2_ecc

chore: change all halo2_proofs to more recent commit for compatibilit…

35fba33

…iy with zkevm bench

aggregator-circuit: got tests to pass!

caa2867

tests for single proof verify in chip for lookup, mul_add pass

chore: disable display for halo2_ecc

f46decb

chore: each cargo.toml in workspace now just specifies version of hal…

8cd70ae

…o2_proofs, so they can be uniformly patched at root level

wip: getting zkevm_bench circuit test to work

dc9dc78

temporary commit: back to mul_add mock prover working at least

27a34fe

scalar_chip: add wrapper around AssignedCell to handle getting values of

ff0640f

constants during keygen_vk now keygen_vk actually works for tests/mul_add_{single, aggregate}

sdk: everything should work now. See new readme.

d8dad57

Made changes because vkey write doesn't currently work.

zkevm: add example zkevm-multi to sdk crate for aggregation of 1 EVM

9403172

circuit and 1 state circuit * switched zkevm and halo2 repos to scroll-dev to get state circuit to prove correctly

chore: change CreateProof to regenerate vkey

427d059

circuit: update to work with newer halo2_ecc version

1569271

chore: fix sdk/examples/zkevm to work with newer zkevm branch

61b21e9

update halo2_ecc to use pippenger

e7b34b1

solidity: add hardhat setup files

f344258

fix: change solidity tempalte to use limbs with 88 bits

e16e601

Merge remote-tracking branch 'scroll/scroll-dev-0920' into halo2-ecc

2fc758d

fix aggregator api

c5f61be

build

e6fa28a

everythign comiples

a8e1d88

fix examples

10aa085

add config file

1fb3fff

zhenfeizhang marked this pull request as ready for review October 17, 2022 15:22

zhenfeizhang mentioned this pull request Oct 17, 2022

Scroll dev 1011 #34

Closed

zhenfeizhang closed this Oct 17, 2022

zhenfeizhang reopened this Oct 17, 2022

add CI

45d593f

zhenfeizhang force-pushed the sync-halo-ecc-1013 branch from 74a4747 to 45d593f Compare October 17, 2022 17:16

zhenfeizhang mentioned this pull request Oct 19, 2022

fix: update Github CI with secrets.SECRET_REPO_DEPLOY_KEY #36

Merged

silathdiir and others added 2 commits October 19, 2022 10:26

fix: update Github CI with secrets.SECRET_REPO_DEPLOY_KEY (#36)

06ced20

* Update Github CI with `secrets.SECRET_REPO_DEPLOY_KEY`. * remove repo token * update cargo lock * switch rust to nightly Co-authored-by: zhenfei <zhenfei.zhang@hotmail.com>

fix many inconsistency of halo2 aggregation (#33)

71b60ec

* use embedded template for solidity * fix tera escape * check pairing in soli gen * add pairing check * more log * fix halo2 * log final pair check in instance * fix all... * ..

lispc changed the base branch from scroll-dev-0920 to main October 25, 2022 03:58

lispc changed the base branch from main to scroll-dev-0920 October 25, 2022 03:58

lispc reviewed Oct 26, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-circuit/src/verify_circuit.rs Outdated

lispc reviewed Oct 26, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-api/src/tests/systems/halo2.rs Outdated

lispc reviewed Oct 26, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-api/src/tests/systems/halo2/add_mul_test/verify_single.rs Outdated

lispc reviewed Oct 28, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-circuit/src/tests/mul_add.rs Outdated

lispc reviewed Oct 28, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-circuit/src/tests/mul_add.rs Outdated

lispc reviewed Oct 28, 2022

View reviewed changes

Comment thread halo2-snark-aggregator-api/src/systems/halo2/verify.rs

fix broken tests after halo-0920 sync, and clean up

804fc20

zhenfeizhang force-pushed the sync-halo-ecc-1013 branch from 6b728b8 to 804fc20 Compare October 29, 2022 01:01

zhenfeizhang closed this Oct 29, 2022

zhenfeizhang deleted the sync-halo-ecc-1013 branch October 29, 2022 01:03

zhenfeizhang restored the sync-halo-ecc-1013 branch November 1, 2022 01:39

zhenfeizhang reopened this Nov 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync halo ecc 1013#35

Sync halo ecc 1013#35
zhenfeizhang wants to merge 29 commits into
scroll-dev-0920from
sync-halo-ecc-1013

zhenfeizhang commented Oct 13, 2022

Uh oh!

lispc commented Oct 25, 2022 •

edited

Loading

Uh oh!

lispc commented Oct 25, 2022 •

edited

Loading

Uh oh!

lispc commented Oct 25, 2022

Uh oh!

lispc commented Oct 26, 2022 •

edited

Loading

Uh oh!

zhenfeizhang commented Oct 26, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lispc commented Oct 28, 2022

Uh oh!

kunxian-xia commented Oct 28, 2022

Uh oh!

zhenfeizhang commented Oct 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

zhenfeizhang commented Oct 13, 2022

Uh oh!

lispc commented Oct 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lispc commented Oct 25, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lispc commented Oct 25, 2022

Uh oh!

lispc commented Oct 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhenfeizhang commented Oct 26, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lispc commented Oct 28, 2022

Uh oh!

kunxian-xia commented Oct 28, 2022

Uh oh!

zhenfeizhang commented Oct 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

lispc commented Oct 25, 2022 •

edited

Loading

lispc commented Oct 25, 2022 •

edited

Loading

lispc commented Oct 26, 2022 •

edited

Loading