Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit b766af5

Browse files
lightsingzhenfeizhangnoel2004lispcsilathdiir
authored
Merge develop head to hi-lo (#1057)
* 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 <mycinbrin@gmail.com> * 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 <noelwei@gmail.com> Co-authored-by: Ho <noel.wei@gmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> Co-authored-by: Steven Gu <asongala@163.com> * [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 <mycinbrin@gmail.com> * 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 <zhenfei.zhang@hotmail.com> Co-authored-by: Ho Vei <noelwei@gmail.com> Co-authored-by: lightsing <light.tsing@gmail.com> Co-authored-by: Ho <noel.wei@gmail.com> Co-authored-by: Steven Gu <asongala@163.com> * post merge --------- Co-authored-by: zhenfei <zhenfei.zhang@hotmail.com> Co-authored-by: Ho Vei <noelwei@gmail.com> Co-authored-by: Ho <noel.wei@gmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> Co-authored-by: Steven Gu <asongala@163.com>
1 parent 2cc777d commit b766af5

File tree

177 files changed

+3580
-3575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+3580
-3575
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
echo "HOME=/home/CI" >> $GITHUB_ENV
5353
- uses: dtolnay/rust-toolchain@master
5454
with:
55-
toolchain: nightly-2022-12-10
55+
toolchain: nightly-2023-12-03
5656
- name: Setup golang
5757
uses: actions/setup-go@v3
5858
with:
@@ -95,7 +95,7 @@ jobs:
9595
echo "HOME=/home/CI" >> $GITHUB_ENV
9696
- uses: dtolnay/rust-toolchain@master
9797
with:
98-
toolchain: nightly-2022-12-10
98+
toolchain: nightly-2023-12-03
9999
- name: Setup golang
100100
uses: actions/setup-go@v3
101101
with:
@@ -119,7 +119,7 @@ jobs:
119119
- name: Run light tests # light tests are run in parallel
120120
run: cargo test --verbose --release --all --features scroll --exclude integration-tests --exclude circuit-benchmarks --exclude testool
121121
- name: Run heavy tests
122-
run: cargo test --verbose --release --features scroll --all --exclude integration-tests --exclude circuit-benchmarks serial_ -- --ignored
122+
run: cargo test --verbose --release --features scroll --all --exclude integration-tests --exclude circuit-benchmarks serial_ -- --ignored --skip max_tx
123123
- name: Run parallel assignment tests(bytecode)
124124
run: cargo test --release --package zkevm-circuits --lib bytecode_circuit::test --features scroll,parallel_syn -- --nocapture
125125
- name: Run parallel assignment tests(state)
@@ -144,7 +144,7 @@ jobs:
144144
- uses: actions/checkout@v4
145145
- uses: dtolnay/rust-toolchain@master
146146
with:
147-
toolchain: nightly-2022-12-10
147+
toolchain: nightly-2023-12-03
148148
- name: Add target
149149
run: rustup target add ${{ matrix.target }}
150150
# Go cache for building geth-utils
@@ -181,7 +181,7 @@ jobs:
181181
- uses: actions/checkout@v4
182182
- uses: dtolnay/rust-toolchain@master
183183
with:
184-
toolchain: nightly-2022-12-10
184+
toolchain: nightly-2023-12-03
185185
# Go cache for building geth-utils
186186
- name: Go cache
187187
uses: actions/cache@v3
@@ -214,7 +214,7 @@ jobs:
214214
- uses: actions/checkout@v4
215215
- uses: dtolnay/rust-toolchain@master
216216
with:
217-
toolchain: nightly-2022-12-10
217+
toolchain: nightly-2023-12-03
218218
# Go cache for building geth-utils
219219
- name: Go cache
220220
uses: actions/cache@v3
@@ -251,7 +251,7 @@ jobs:
251251
- uses: actions/checkout@v4
252252
- uses: dtolnay/rust-toolchain@master
253253
with:
254-
toolchain: nightly-2022-12-10
254+
toolchain: nightly-2023-12-03
255255
components: rustfmt
256256
# Go cache for building geth-utils
257257
- name: Go cache

‎.github/workflows/integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- uses: actions/checkout@v4
6262
- uses: dtolnay/rust-toolchain@master
6363
with:
64-
toolchain: nightly-2022-12-10
64+
toolchain: nightly-2023-12-03
6565
- name: Setup golang
6666
uses: actions/setup-go@v3
6767
with:

‎.github/workflows/lints.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- uses: actions/checkout@v4
4444
- uses: dtolnay/rust-toolchain@master
4545
with:
46-
toolchain: nightly-2022-12-10
46+
toolchain: nightly-2023-12-03
4747
components: clippy
4848
# Go cache for building geth-utils
4949
- name: Go cache

‎.github/workflows/test-features.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343
- uses: dtolnay/rust-toolchain@master
4444
with:
45-
toolchain: nightly-2022-12-10
45+
toolchain: nightly-2023-12-03
4646

4747
# Go cache for building geth-utils
4848
- name: Go cache

0 commit comments

Comments
 (0)