chore: upgrade group/ff/halo2 and rust version #1022

zhenfeizhang · 2023-11-07T16:21:17Z

Description

[PR description]

Issue Link

[link issue here]

Type of change

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update

Rationale

[design decisions and extended information]

How Has This Been Tested?

[explanation]

How to fill a PR description

Please give a concise description of your PR.

The target readers could be future developers, reviewers, and auditors. By reading your description, they should easily understand the changes proposed in this pull request.

MUST: Reference the issue to resolve

Single responsability

Is RECOMMENDED to create single responsibility commits, but not mandatory.

Anyway, you MUST enumerate the changes in a unitary way, e.g.

This PR contains:
- Cleanup of xxxx, yyyy
- Changed xxxx to yyyy in order to bla bla
- Added xxxx function to ...
- Refactored ....

Design choices

RECOMMENDED to:

What types of design choices did you face?
What decisions you have made?
Any valuable information that could help reviewers to think critically

* fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]>

aggregator/src/tests/rlc/gates.rs

lispc · 2023-12-05T10:17:53Z

testing result

tx circuit failures may be due to disabled SigCircuit?

failures:
    evm_circuit::execution::sar::test::test_sar_gadget_with_max_values
    evm_circuit::execution::sar::test::test_sar_gadget_with_negative_a
    evm_circuit::execution::sar::test::test_sar_gadget_with_positive_a
    evm_circuit::execution::sar::test::test_sar_gadget_with_random_values
    tx_circuit::test::tx_circuit_0tx_1max_tx
    tx_circuit::test::tx_circuit_1tx_1max_tx
    tx_circuit::test::tx_circuit_1tx_2max_tx
    tx_circuit::test::tx_circuit_2tx_2max_tx
    tx_circuit::test::tx_circuit_l1_msg_tx
    tx_circuit::test::tx_circuit_to_is_zero

lispc · 2023-12-05T10:19:14Z

current codes seems ok for me. What is the status of sig circuit and ecc circuit? They were disabled due to halo2-libs, but currently halo2-libs are upgraded to ff13, so they can be recovered?

lispc · 2023-12-05T10:22:25Z

another question is why we upgrade rust here? some dep needs it? @zhenfeizhang

zhenfeizhang · 2023-12-05T16:14:05Z

another question is why we upgrade rust here? some dep needs it? @zhenfeizhang

marker::ConstParamTy requires a newer version of rust

zhenfeizhang · 2023-12-05T16:17:57Z

current codes seems ok for me. What is the status of sig circuit and ecc circuit? They were disabled due to halo2-libs, but currently halo2-libs are upgraded to ff13, so they can be recovered?

yes

…into sync-ff-0.13

lispc · 2023-12-06T00:31:33Z

@zhenfeizhang there may be a lot of clippy warning not easy to fix due to rust upgrade. So HHQ Zhang will handle clippy fix later.

lispc · 2023-12-06T00:32:58Z

a4a54b1 may not be correct. Can be reverted

lispc · 2023-12-06T02:46:14Z

https://github.com/scroll-tech/zkevm-circuits/actions/runs/7108484917/job/19351858425?pr=1022 CI fails.. more memory usage? We need to bench speed & memory after these upgrades..

lispc · 2023-12-06T02:46:35Z

\b run testool 1

zkevm-circuits-bots · 2023-12-06T03:34:00Z

Succeed to run testool:
https://circuit-release.s3.us-west-2.amazonaws.com/testool/default.1701830867.5eb0830.html

* chore: upgrade group/ff/halo2 and rust version (#1022) * wip * enforce eth v2.0.7 * update links * clean up zktrie * fix keccak circuit * fix gadgets * fix bus-mapping * everything compiles now * compiles * compiles * clean up * update zktrie links * update dep for zktrie * Fix all dep/compliation issues in Sync ff 0.13 (#1056) * fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]> * upgrade halo2; * build * Upgrade rust-toolchain to `nightly-2023-10-27` in CI. * Fix some byte values (u8) from `u128` to `u64` in `SAR`. * uncomment unit tests for aggregator * fix clippy * uncomment sig circuit and tx circuit * uncomment rlc gates unit tests * fix make doc * uncomment sig/ecc related code * minor fix * clippy * undo last clippy.. * disable some super circuit tests --------- Co-authored-by: Ho Vei <[email protected]> Co-authored-by: Ho <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: Steven Gu <[email protected]> * [chore] update rust toolchain to 1.76 nightly; replace lazy_static/once_cell with std::sync::LazyLock (#1050) * part1 * part2 * wip * enforce eth v2.0.7 * update links * clean up zktrie * fix keccak circuit * fix gadgets * fix bus-mapping * everything compiles now * compiles * compiles * clean up * update zktrie links * update dep for zktrie * [chore] update rust toolchain to 1.76 nightly * Fix all dep/compliation issues in Sync ff 0.13 (#1056) * fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]> * upgrade halo2; * remove lazy_static and once_cell * update snark-verifier * build * Upgrade rust-toolchain to `nightly-2023-10-27` in CI. * Fix some byte values (u8) from `u128` to `u64` in `SAR`. * uncomment unit tests for aggregator * fix clippy * uncomment sig circuit and tx circuit * uncomment rlc gates unit tests * fix make doc * uncomment sig/ecc related code * minor fix * clippy * undo last clippy.. * disable some super circuit tests * update ci script * fix missing * post merge * soundness fix * fix missing * fix missing --------- Co-authored-by: zhenfei <[email protected]> Co-authored-by: Ho Vei <[email protected]> Co-authored-by: lightsing <[email protected]> Co-authored-by: Ho <[email protected]> Co-authored-by: Steven Gu <[email protected]> * post merge --------- Co-authored-by: zhenfei <[email protected]> Co-authored-by: Ho Vei <[email protected]> Co-authored-by: Ho <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: Steven Gu <[email protected]>

* [FEAT] support mainnet block in mainnet.rs (#814) (#1004) * patch for L2 node rpc * constrain max_txs to pass pi circuit * revert get access set to the same implement as upstream * update for using prestateTracer for state * fix coinbase issue * apply mock fill root * better form for mock filling mpt * dep issue * some trivial optimizations * grep mpt standlone circuit from test * update poseidon row params * fix issues in old_root setting * update ethblock for some fields * update more fields * update keccak inputs * update prev state root * update more fields for state root * update code size * fix storage issue on missing field * optimize the pre state handling * induce relax mode to raise some restrict * picking coinbase/difficulity from block instead of default constants * custom diff/coinbase in padding * fix the max_txs issue in pi_circuit * clippy and fmt * support single tx test * adjust params * rebuild mpt state in mock tx proven * fmt * resume some fields in prestate trace * test creating supercircuit from dummy witness block * revert most params * mitigate an issue in prestate tracer * add timeout spec for robust API call * fmt * add readme for test * add more comment according to review --------- Co-authored-by: Steven <[email protected]> * fix: only enable circuit for `BASEFEE` opcode (without opcode mapping) (#1033) * Enable `BlockCtxU256Gadget` for `BASEFEE` opcode in `scroll` feature. * Fix to restrict `DIFFICULTY` execution state only for scroll (to avoid soundness). * Disable applying MPT if non-scroll in integration-tests. (#1034) * Add `AccessListGasCost` to `TxContextFieldTag`. (#1041) * [feat] enum error in GethExecStep (#1037) * make error enum * remove non_exhaustive * [feat] add feature switch of memory/stack/storage (#1038) * add feature switch * add missing * fix merge * parallel assignment of evm circuit (#1027) * done * retry * seem done * fix * Temp to comment out `Cached assign at ...` log. * clean-codes --------- Co-authored-by: Steven Gu <[email protected]> * Refactor PI Circuit (#1042) * refactor assign into sub-methods, more docs * fmt * fix: doc escape square braces * fix offset increment * fix macos build (#1047) * remove halo2wrong (#1048) * feat: Add `TxEip2930Gadget` to handle EIP-2930 (for evm-circuit part) (#1045) * Add `TxEip2930Gadget` to begin-tx to handle EIP-2930 in evm circuit. * Move `AccessList*` to the front of `BlockNumber` to fix tx-circuit tests. * Merge `CopyDataType` of access list to `AccessListAddresses` and `AccessListStorageKeys`. * Delete `is_eip1559_tx` function which should be better to add in the EIP-1559 PR. * Rename function `access_list_address_and_storage_key_sizes` to `access_list_size`. * Add `AccessListRLC` to tx-table. * Fix test. * Remove `AccessListGasCost`, and try to calculate it by `AccessListAddressesLen` and `AccessListStorageKeysLen` --------- Co-authored-by: Rohit Narurkar <[email protected]> * [FEAT] precompile-sha256 (#1032) * init table16 with generic refactoring * update cargo * add required cfgs * add benchmarking * customable bench * fmt * config gates for sha256 circuit * complete sha256 circuit * induce SHA256 in bus mapping * better challenge spec * integrate sha256 circuit into super * readme (wip) * complete precompile and sha256 table * clippies * fmt * better tests * fix issues and better printing for circuit layout * refine and fix issues * fix digest in table16 * fix layout, clippy and fmt * complete sha256 table * fix rw * fix rlc on padding * clippy and fmt * more tests * test added * sha256: update row cost per block * update readme (wip) * lookup input len * enable sha256 * more tests cases * refactoring aux data * fmt * fix precompile call test * fix another callop test * + update bench to circuit-sha256, + update readme * fix vk issue, add more test * trivial fixs * move sha256 circuit into zkevm-circuits * purge unused sha256 dir * bump halo2 version * fix blank comment * fix fmt (#1049) * chore: upgrade group/ff/halo2 and rust version (#1022) * wip * enforce eth v2.0.7 * update links * clean up zktrie * fix keccak circuit * fix gadgets * fix bus-mapping * everything compiles now * compiles * compiles * clean up * update zktrie links * update dep for zktrie * Fix all dep/compliation issues in Sync ff 0.13 (#1056) * fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]> * upgrade halo2; * build * Upgrade rust-toolchain to `nightly-2023-10-27` in CI. * Fix some byte values (u8) from `u128` to `u64` in `SAR`. * uncomment unit tests for aggregator * fix clippy * uncomment sig circuit and tx circuit * uncomment rlc gates unit tests * fix make doc * uncomment sig/ecc related code * minor fix * clippy * undo last clippy.. * disable some super circuit tests --------- Co-authored-by: Ho Vei <[email protected]> Co-authored-by: Ho <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: Steven Gu <[email protected]> * [chore] update rust toolchain to 1.76 nightly; replace lazy_static/once_cell with std::sync::LazyLock (#1050) * part1 * part2 * wip * enforce eth v2.0.7 * update links * clean up zktrie * fix keccak circuit * fix gadgets * fix bus-mapping * everything compiles now * compiles * compiles * clean up * update zktrie links * update dep for zktrie * [chore] update rust toolchain to 1.76 nightly * Fix all dep/compliation issues in Sync ff 0.13 (#1056) * fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]> * upgrade halo2; * remove lazy_static and once_cell * update snark-verifier * build * Upgrade rust-toolchain to `nightly-2023-10-27` in CI. * Fix some byte values (u8) from `u128` to `u64` in `SAR`. * uncomment unit tests for aggregator * fix clippy * uncomment sig circuit and tx circuit * uncomment rlc gates unit tests * fix make doc * uncomment sig/ecc related code * minor fix * clippy * undo last clippy.. * disable some super circuit tests * update ci script * fix missing * post merge * soundness fix * fix missing * fix missing --------- Co-authored-by: zhenfei <[email protected]> Co-authored-by: Ho Vei <[email protected]> Co-authored-by: lightsing <[email protected]> Co-authored-by: Ho <[email protected]> Co-authored-by: Steven Gu <[email protected]> * bus-auto: fixes after merge * bus-auto: support for parallel assign_regions --------- Co-authored-by: Ho <[email protected]> Co-authored-by: Steven <[email protected]> Co-authored-by: Akase Cho <[email protected]> Co-authored-by: Zhang Zhuo <[email protected]> Co-authored-by: Rohit Narurkar <[email protected]> Co-authored-by: zhenfei <[email protected]> Co-authored-by: Ho Vei <[email protected]> Co-authored-by: lightsing <[email protected]> Co-authored-by: Aurélien Nicolas <[email protected]>

zhenfeizhang added 8 commits October 26, 2023 21:09

wip

75a0001

enforce eth v2.0.7

5cfcbd7

update links

d485ecc

clean up zktrie

614f9fc

fix keccak circuit

0672a17

fix gadgets

11d4fe6

fix bus-mapping

95774d8

everything compiles now

bae6f57

github-actions bot added crate-bus-mapping crate-zkevm-circuits crate-gadgets crate-keccak crate-eth-types labels Nov 7, 2023

zhenfeizhang added 2 commits November 9, 2023 10:52

compiles

45cf848

compiles

3b668fe

zhenfeizhang force-pushed the sync-ff-0.13 branch from 9f192c8 to 3b668fe Compare November 9, 2023 15:53

zhenfeizhang changed the title ~~[wip] Sync ff 0.13~~ Sync ff 0.13 Nov 9, 2023

zhenfeizhang marked this pull request as ready for review November 9, 2023 18:12

clean up

c267ed0

zhenfeizhang requested a review from lispc November 20, 2023 23:48

update zktrie links

168c981

zhenfeizhang force-pushed the sync-ff-0.13 branch from e95a36d to 168c981 Compare November 21, 2023 00:04

noel2004 and others added 5 commits December 1, 2023 19:00

update dep for zktrie

16e4095

Fix all dep/compliation issues in Sync ff 0.13 (#1056)

21de060

* fix all dep issue * use updated misc-precompile * fix test issue * purge lock file by upgrading mpt-circuit * final update for dep of mpt-circuits * update deps * build? --------- Co-authored-by: Zhang Zhuo <[email protected]>

Merge remote-tracking branch 'scroll/develop' into sync-ff-0.13

3a30167

upgrade halo2;

1cb7df2

build

0a359e6

lispc reviewed Dec 5, 2023

View reviewed changes

aggregator/src/tests/rlc/gates.rs Outdated Show resolved Hide resolved

Upgrade rust-toolchain to nightly-2023-10-27 in CI.

d7b1631

github-actions bot added the CI label Dec 5, 2023

Fix some byte values (u8) from u128 to u64 in SAR.

303265d

uncomment unit tests for aggregator

582ee69

fix clippy

8d17893

lispc changed the title ~~Sync ff 0.13~~ chore: upgrade group/ff/halo2 and rust version Dec 6, 2023

zhenfeizhang and others added 8 commits December 5, 2023 19:09

uncomment sig circuit and tx circuit

3239d80

uncomment rlc gates unit tests

da8599c

fix make doc

63e685d

Merge branch 'sync-ff-0.13' of github.com:scroll-tech/zkevm-circuits …

f9e113f

…into sync-ff-0.13

uncomment sig/ecc related code

96a03af

Merge branch 'sync-ff-0.13' of github.com:scroll-tech/zkevm-circuits …

a839cec

…into sync-ff-0.13

minor fix

16ef6b1

clippy

a4a54b1

zhenfeizhang and others added 2 commits December 5, 2023 19:35

undo last clippy..

572584e

disable some super circuit tests

5eb0830

lispc approved these changes Dec 6, 2023

View reviewed changes

lispc merged commit 618fd1e into develop Dec 6, 2023
13 of 14 checks passed

lispc deleted the sync-ff-0.13 branch December 6, 2023 06:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: upgrade group/ff/halo2 and rust version #1022

chore: upgrade group/ff/halo2 and rust version #1022

zhenfeizhang commented Nov 7, 2023

lispc commented Dec 5, 2023 •

edited

Loading

lispc commented Dec 5, 2023

lispc commented Dec 5, 2023

zhenfeizhang commented Dec 5, 2023

zhenfeizhang commented Dec 5, 2023 •

edited

Loading

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

zkevm-circuits-bots bot commented Dec 6, 2023

chore: upgrade group/ff/halo2 and rust version #1022

chore: upgrade group/ff/halo2 and rust version #1022

Conversation

zhenfeizhang commented Nov 7, 2023

Description

Issue Link

Type of change

Contents

Rationale

How Has This Been Tested?

How to fill a PR description

Single responsability

Design choices

lispc commented Dec 5, 2023 • edited Loading

lispc commented Dec 5, 2023

lispc commented Dec 5, 2023

zhenfeizhang commented Dec 5, 2023

zhenfeizhang commented Dec 5, 2023 • edited Loading

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

lispc commented Dec 6, 2023

zkevm-circuits-bots bot commented Dec 6, 2023

lispc commented Dec 5, 2023 •

edited

Loading

zhenfeizhang commented Dec 5, 2023 •

edited

Loading