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

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

Merged
merged 31 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
75a0001
wip
zhenfeizhang Oct 27, 2023
5cfcbd7
enforce eth v2.0.7
zhenfeizhang Oct 27, 2023
d485ecc
update links
zhenfeizhang Oct 27, 2023
614f9fc
clean up zktrie
zhenfeizhang Oct 27, 2023
0672a17
fix keccak circuit
zhenfeizhang Oct 27, 2023
11d4fe6
fix gadgets
zhenfeizhang Oct 27, 2023
95774d8
fix bus-mapping
zhenfeizhang Oct 27, 2023
bae6f57
everything compiles now
zhenfeizhang Oct 30, 2023
45cf848
compiles
zhenfeizhang Nov 9, 2023
3b668fe
compiles
zhenfeizhang Nov 9, 2023
c267ed0
clean up
zhenfeizhang Nov 13, 2023
168c981
update zktrie links
zhenfeizhang Nov 20, 2023
16e4095
update dep for zktrie
noel2004 Dec 1, 2023
21de060
Fix all dep/compliation issues in Sync ff 0.13 (#1056)
noel2004 Dec 5, 2023
3a30167
Merge remote-tracking branch 'scroll/develop' into sync-ff-0.13
lispc Dec 5, 2023
1cb7df2
upgrade halo2;
lispc Dec 5, 2023
0a359e6
build
lispc Dec 5, 2023
d7b1631
Upgrade rust-toolchain to `nightly-2023-10-27` in CI.
silathdiir Dec 5, 2023
303265d
Fix some byte values (u8) from `u128` to `u64` in `SAR`.
silathdiir Dec 5, 2023
582ee69
uncomment unit tests for aggregator
zhenfeizhang Dec 5, 2023
8d17893
fix clippy
zhenfeizhang Dec 5, 2023
3239d80
uncomment sig circuit and tx circuit
zhenfeizhang Dec 6, 2023
da8599c
uncomment rlc gates unit tests
zhenfeizhang Dec 6, 2023
63e685d
fix make doc
lispc Dec 6, 2023
f9e113f
Merge branch 'sync-ff-0.13' of github.com:scroll-tech/zkevm-circuits …
lispc Dec 6, 2023
96a03af
uncomment sig/ecc related code
zhenfeizhang Dec 6, 2023
a839cec
Merge branch 'sync-ff-0.13' of github.com:scroll-tech/zkevm-circuits …
zhenfeizhang Dec 6, 2023
16ef6b1
minor fix
zhenfeizhang Dec 6, 2023
a4a54b1
clippy
zhenfeizhang Dec 6, 2023
572584e
undo last clippy..
zhenfeizhang Dec 6, 2023
5eb0830
disable some super circuit tests
lispc Dec 6, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
echo "HOME=/home/CI" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
- name: Setup golang
uses: actions/setup-go@v3
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
echo "HOME=/home/CI" >> $GITHUB_ENV
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
- name: Setup golang
uses: actions/setup-go@v3
with:
Expand All @@ -119,7 +119,7 @@ jobs:
- name: Run light tests # light tests are run in parallel
run: cargo test --verbose --release --all --features scroll --exclude integration-tests --exclude circuit-benchmarks --exclude testool
- name: Run heavy tests
run: cargo test --verbose --release --features scroll --all --exclude integration-tests --exclude circuit-benchmarks serial_ -- --ignored
run: cargo test --verbose --release --features scroll --all --exclude integration-tests --exclude circuit-benchmarks serial_ -- --ignored --skip max_tx
- name: Run parallel assignment tests(bytecode)
run: cargo test --release --package zkevm-circuits --lib bytecode_circuit::test --features scroll,parallel_syn -- --nocapture
- name: Run parallel assignment tests(state)
Expand All @@ -144,7 +144,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
- name: Add target
run: rustup target add ${{ matrix.target }}
# Go cache for building geth-utils
Expand Down Expand Up @@ -181,7 +181,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
# Go cache for building geth-utils
- name: Go cache
uses: actions/cache@v3
Expand Down Expand Up @@ -251,7 +251,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
components: rustfmt
# Go cache for building geth-utils
- name: Go cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
- name: Setup golang
uses: actions/setup-go@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27
components: clippy
# Go cache for building geth-utils
- name: Go cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-features.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2022-12-10
toolchain: nightly-2023-10-27

# Go cache for building geth-utils
- name: Go cache
Expand Down
Loading