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

Commit fb271ea

Browse files
lispczhenfeizhangnoel2004lightsingsilathdiir
authored
[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>
1 parent 618fd1e commit fb271ea

File tree

136 files changed

+2805
-2907
lines changed

Some content is hidden

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

136 files changed

+2805
-2907
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 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-2023-10-27
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-2023-10-27
98+
toolchain: nightly-2023-12-03
9999
- name: Setup golang
100100
uses: actions/setup-go@v3
101101
with:
@@ -144,7 +144,7 @@ jobs:
144144
- uses: actions/checkout@v4
145145
- uses: dtolnay/rust-toolchain@master
146146
with:
147-
toolchain: nightly-2023-10-27
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-2023-10-27
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-2023-10-27
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-2023-10-27
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-2023-10-27
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-2023-10-27
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-2023-10-27
45+
toolchain: nightly-2023-12-03
4646

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

‎Cargo.lock

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "devel
3838
halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] }
3939
hex = "0.4"
4040
itertools = "0.11"
41-
lazy_static = "1.4"
4241
libsecp256k1 = "0.7"
4342
log = "0.4"
4443
num = "0.4"
4544
num-bigint = "0.4"
4645
num-traits = "0.2"
47-
once_cell = "1.17"
4846
pretty_assertions = "1.0"
4947
rand = "0.8"
5048
rand_chacha = "0.3"

‎aggregator/src/aggregation/circuit.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,6 @@ impl CircuitExt<Fr> for AggregationCircuit {
401401
config.0.flex_gate().basic_gates[0]
402402
.iter()
403403
.map(|gate| gate.q_enable)
404-
.into_iter()
405404
.chain(
406405
[
407406
config.0.rlc_config.selector,

‎aggregator/src/core.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,6 @@ pub(crate) fn conditional_constraints(
10081008
.iter()
10091009
.skip(1)
10101010
.take((MAX_AGG_SNARKS + 1) * 2)
1011-
.into_iter()
10121011
.chunks(2)
10131012
.into_iter()
10141013
{

‎aggregator/src/tests/mock_chunk.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,10 +111,9 @@ impl Circuit<Fr> for MockChunkCircuit {
111111
let mut index = 0;
112112
let acc_len = if self.has_accumulator { ACC_LEN } else { 0 };
113113

114-
for (_i, byte) in iter::repeat(0)
114+
for byte in iter::repeat(0)
115115
.take(acc_len)
116116
.chain(self.chunk.public_input_hash().as_bytes().iter().copied())
117-
.enumerate()
118117
{
119118
let cell = config
120119
.rlc_config

‎aggregator/src/util.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ pub(crate) fn get_indices(preimages: &[Vec<u8>]) -> (Vec<usize>, Vec<usize>) {
6161
for (i, round) in preimage_padded.chunks(INPUT_LEN_PER_ROUND).enumerate() {
6262
let f_round_offset = round_ctr * keccak_f_rows;
6363
// indices for preimages
64-
for (j, _chunk) in round.chunks(8).into_iter().enumerate() {
64+
for (j, _chunk) in round.chunks(8).enumerate() {
6565
let inner_offset = f_round_offset + (j + 1) * inner_round_rows;
6666
for k in 0..8 {
6767
preimage_indices.push(inner_offset + k);
@@ -83,12 +83,7 @@ pub(crate) fn get_indices(preimages: &[Vec<u8>]) -> (Vec<usize>, Vec<usize>) {
8383
}
8484
// last hash is for data_hash and has various length, so we output all the possible cells
8585
for _i in 0..get_data_hash_keccak_updates(MAX_AGG_SNARKS) {
86-
for (j, _) in (0..INPUT_LEN_PER_ROUND)
87-
.into_iter()
88-
.chunks(8)
89-
.into_iter()
90-
.enumerate()
91-
{
86+
for (j, _) in (0..INPUT_LEN_PER_ROUND).chunks(8).into_iter().enumerate() {
9287
let inner_offset = round_ctr * keccak_f_rows + (j + 1) * inner_round_rows;
9388
for k in 0..8 {
9489
preimage_indices.push(inner_offset + k);

0 commit comments

Comments
 (0)