Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge scroll 1.1 branch #11

Open
wants to merge 77 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
3a71974
feat: add assign_regions api
kunxian-xia Feb 7, 2023
d2b83b3
fix lifetime compilation error
kunxian-xia Feb 8, 2023
ce99b2d
include assign_regions in plonk_api test
kunxian-xia Feb 8, 2023
7af66a8
fmt
kunxian-xia Feb 8, 2023
032cd5d
feat: implement fork for MockProver (WIP)
kunxian-xia Feb 8, 2023
04b3509
add MockProver fork (continue)
kunxian-xia Feb 9, 2023
7e8cfe4
fmt
kunxian-xia Feb 9, 2023
87aaef3
finished adding fork for MockProver
kunxian-xia Feb 9, 2023
49a136f
log
kunxian-xia Feb 10, 2023
73c70ed
add impl for keygen
kunxian-xia Feb 10, 2023
28116e1
add impl for prover
kunxian-xia Feb 10, 2023
eeed482
bug_fix: update fixed in MockProver
kunxian-xia Feb 13, 2023
fa5b1b0
bug-fix: merge
kunxian-xia Feb 13, 2023
843feaa
add parallel_syn feature and refactor code using macro
kunxian-xia Mar 9, 2023
b09c358
fix
kunxian-xia Mar 10, 2023
460e708
fmt
kunxian-xia Mar 10, 2023
f5f5e29
clippy
kunxian-xia Mar 10, 2023
4e36256
clippy
kunxian-xia Mar 10, 2023
ed4985f
fix unit test error
kunxian-xia Mar 10, 2023
13a4381
clippy
kunxian-xia Mar 10, 2023
ea67b33
clippy
kunxian-xia Mar 10, 2023
088a066
Merge remote-tracking branch 'origin/scroll-dev-0220' into parallel_syn
kunxian-xia Mar 10, 2023
1c21e5b
Merge pull request #32 from scroll-tech/parallel_syn
kunxian-xia Mar 22, 2023
2e9710c
[chore] update cargo.toml
zhenfeizhang Mar 23, 2023
1163395
add num_simple_selector
lispc Mar 29, 2023
b9cfd56
lock poseidon version
lispc Mar 29, 2023
1e51790
update cargo lock
lispc Mar 29, 2023
e67fc53
Merge branch 'v0.3' into halo2-ecc-snark-verifier-0323
lispc Apr 9, 2023
3d40ae4
update cargo lock
lispc Apr 9, 2023
1c78e16
add default implementation for fork and merge functions (#39)
kunxian-xia Apr 3, 2023
9bf3562
export advices for MockProver
lispc Apr 27, 2023
aab39d5
fix load_slice panic in mock prover err display
lispc Jul 4, 2023
90e22c6
boundary handling of the fork() function in MockProver
Velaciela Jul 5, 2023
ea07115
keygen, prover, and error message
Velaciela Jul 5, 2023
b2f596a
lints
Velaciela Jul 5, 2023
103ce21
Merge pull request #50 from scroll-tech/mockprover_fork
kunxian-xia Jul 6, 2023
a00de9e
disable selector compression (#54)
lispc Jul 11, 2023
fcf53dc
Fix clippy warnings and comment out outdated integration test cases (…
kunxian-xia Jul 18, 2023
7012b49
change ConstraintSystem::general_column_annotations from hashmap to b…
lispc Jul 21, 2023
4d8a405
derive Eq for cs
lispc Jul 21, 2023
01f0b52
MockProver can report phase error better
lispc Aug 7, 2023
b612b1e
Fix: false alarm in phase check of mock prover (#61)
kunxian-xia Aug 17, 2023
19de67c
Perf: batch invert on CellValue for MockProver (#62)
Velaciela Aug 18, 2023
aa86c10
feature flag: mock-batch-inv (#63)
Velaciela Aug 30, 2023
ca3066c
expose param field for re-randomization (#67)
zhenfeizhang Sep 19, 2023
e3fe25e
change log level
lispc Sep 20, 2023
92fe9b3
Use thread pool for assign_regions (#57)
alannotnerd Oct 17, 2023
5cf9a37
Move `env_logger` dependency to dev-depdendencies (only for test). (#69)
silathdiir Nov 7, 2023
ae6e02c
sync ff/group 0.13
CPerezz Mar 7, 2023
0bfe0c9
fix clippy
zhenfeizhang Nov 14, 2023
6edad9d
fix clippy
zhenfeizhang Nov 20, 2023
2f5ee10
fmg
zhenfeizhang Nov 20, 2023
d84c083
[FEAT] Upgrading table16 for SHA256 (#73)
noel2004 Nov 30, 2023
cf9765a
Bus auto (#72)
naure Nov 30, 2023
5f758e0
fix-tob-scroll-21 (#59)
zhenfeizhang Nov 30, 2023
5b9a3d7
enable accessing for table16 (#75)
noel2004 Nov 30, 2023
44dbed4
chore: update poseidon link
zhenfeizhang Dec 1, 2023
b6942ea
Merge remote-tracking branch 'scroll/develop' into v1.0
lispc Dec 5, 2023
45c4539
merge sha256 gadget changes
lispc Dec 5, 2023
8deec99
Merge branch 'v1.0' of github.com:scroll-tech/halo2 into v1.0
lispc Dec 5, 2023
f427aca
Fix the CI errors (#78)
kunxian-xia Dec 7, 2023
84003a2
Feat: switch to logup scheme for lookup argument (#71)
kunxian-xia Dec 8, 2023
0008b86
[wip] Sync halo2 lib 0.4.0 (#80)
zhenfeizhang Jan 12, 2024
7a0566d
fix a bug in logup's verifier (#83)
kunxian-xia Jan 19, 2024
5181ad7
change version to 1.1.0
lispc Jan 31, 2024
fb47448
change version to 1.1.0
lispc Jan 31, 2024
909d647
correct lookup name
lispc Jan 31, 2024
a244c33
adjust log level
lispc Feb 1, 2024
c90df71
Fix mockprover memory (#85)
DreamWuGit Mar 14, 2024
7179a60
log vk.transcript_repr; fix debug format of LookupTracker
lispc Mar 29, 2024
6c5e9ee
add more assignment log
lispc May 23, 2024
e5ddf67
better err for mv lookup failure
lispc May 30, 2024
e66cc4a
Merge remote-tracking branch 'scroll/v1.1' into dev
chokobole Jul 5, 2024
5235155
fix(halo2_proofs): enable (de)serailzing `minimum_degree`
chokobole Jul 8, 2024
4c095d8
feat(halo2_proofs): add `drop_but_fixed_values()` to `ProvingKey`
chokobole Jul 9, 2024
7d4b503
chore: add .clang-format
chokobole Jul 9, 2024
43bed8c
feat(halo2_proofs): apply new tachyon to support scroll Halo2 v1.1
chokobole Jul 9, 2024
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
31 changes: 31 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
BasedOnStyle: Google
# This defaults to 'Auto'. Explicitly set it for a while, so that
# 'vector<vector<int> >' in existing files gets formatted to
# 'vector<vector<int>>'. ('Auto' means that clang-format will only use
# 'int>>' if the file already contains at least one such instance.)
Standard: Cpp11

# Specify the #include statement order. This implements the order mandated by
# the Google C++ Style Guide: related header, C headers, C++ headers, library
# headers, and finally the project headers.
#
# To obtain updated lists of system headers used in the below expressions, see:
# http://stackoverflow.com/questions/2027991/list-of-standard-header-files-in-c-and-c/2029106#2029106.
#
# Reference URL: https://github.com/RobotLocomotion/drake/blob/master/.clang-format
IncludeBlocks: Regroup
IncludeCategories:
# C system headers. The header_dependency_test.py contains a copy of this
# list; be sure to update that test anytime this list changes.
- Regex: '^[<"](aio|arm_neon|arpa/inet|assert|complex|cpio|ctype|curses|dirent|dlfcn|errno|fcntl|fenv|float|fmtmsg|fnmatch|ftw|glob|grp|iconv|immintrin|inttypes|iso646|langinfo|libgen|limits|locale|math|monetary|mqueue|ndbm|netdb|net/if|netinet/in|netinet/tcp|nl_types|poll|pthread|pwd|regex|sched|search|semaphore|setjmp|signal|spawn|stdalign|stdarg|stdatomic|stdbool|stddef|stdint|stdio|stdlib|stdnoreturn|string|strings|stropts|sys/ioctl|sys/ipc|syslog|sys/mman|sys/msg|sys/resource|sys/select|sys/sem|sys/shm|sys/socket|sys/stat|sys/statvfs|sys/time|sys/times|sys/types|sys/uio|sys/un|sys/utsname|sys/wait|tar|term|termios|tgmath|threads|time|trace|uchar|ulimit|uncntrl|unistd|utime|utmpx|wchar|wctype|wordexp)\.h[">]$'
Priority: 20
# C++ system headers (as of C++23). The header_dependency_test.py contains a
# copy of this list; be sure to update that test anytime this list changes.
- Regex: '^[<"](algorithm|any|array|atomic|barrier|bit|bitset|cassert|ccomplex|cctype|cerrno|cfenv|cfloat|charconv|chrono|cinttypes|ciso646|climits|clocale|cmath|codecvt|compare|complex|concepts|condition_variable|coroutine|csetjmp|csignal|cstdalign|cstdarg|cstdbool|cstddef|cstdint|cstdio|cstdlib|cstring|ctgmath|ctime|cuchar|cwchar|cwctype|deque|exception|execution|expected|filesystem|flat_map|flat_set|format|forward_list|fstream|functional|future|generator|initializer_list|iomanip|ios|iosfwd|iostream|istream|iterator|latch|limits|list|locale|map|mdspan|memory|memory_resource|mutex|new|numbers|numeric|optional|ostream|print|queue|random|ranges|ratio|regex|scoped_allocator|semaphore|set|shared_mutex|source_location|span|spanstream|sstream|stack|stacktrace|stdexcept|stdfloat|stop_token|streambuf|string|string_view|strstream|syncstream|system_error|thread|tuple|type_traits|typeindex|typeinfo|unordered_map|unordered_set|utility|valarray|variant|vector|version)[">]$'
Priority: 30
# Other libraries' h files (with angles).
- Regex: '^<'
Priority: 40
# Other libraries' h files (with quotes).
- Regex: '^"'
Priority: 50
79 changes: 75 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
name: CI checks

on: [pull_request, push]
on:
merge_group:
pull_request:
push:
branches:
- main

jobs:
test:
name: Test on ${{ matrix.os }}
name: Test on ${{ matrix.os }} with ${{ matrix.feature_set }} features
runs-on: ${{ matrix.os }}
strategy:
matrix:
feature_set: [basic, all]
os: [ubuntu-latest, windows-latest, macOS-latest]
include:
- feature_set: basic
features: batch,dev-graph,gadget-traces
- feature_set: all
features: batch,dev-graph,gadget-traces,multicore,test-dev-graph,thread-safe-region,sanity-checks,circuit-params

steps:
- uses: actions/checkout@v3
Expand All @@ -19,8 +30,67 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --verbose --release --all --all-features
if: ${{ false }}
args: --verbose --release --workspace --no-default-features --features "${{ matrix.features }}"

build:
name: Build target ${{ matrix.target }}
runs-on: ubuntu-latest
strategy:
matrix:
target:
- wasm32-unknown-unknown
- wasm32-wasi

steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
override: false
- name: Add target
run: rustup target add ${{ matrix.target }}
- name: cargo build
uses: actions-rs/cargo@v1
with:
command: build
args: --no-default-features --features batch,dev-graph,gadget-traces --target ${{ matrix.target }}

bitrot:
name: Bitrot check
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
override: false
# Build benchmarks to prevent bitrot
- name: Build benchmarks
uses: actions-rs/cargo@v1
with:
command: build
args: --benches --examples --all-features

doc-links:
name: Intra-doc links
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
override: false
- name: cargo fetch
uses: actions-rs/cargo@v1
with:
command: fetch

# Ensure intra-documentation links all resolve correctly
# Requires #![deny(intra_doc_link_resolution_failure)] in crates.
- name: Check intra-doc links
uses: actions-rs/cargo@v1
with:
command: doc
args: --all --document-private-items

fmt:
name: Rustfmt
Expand All @@ -36,3 +106,4 @@ jobs:
with:
command: fmt
args: --all -- --check

106 changes: 0 additions & 106 deletions .github/workflows/ci_main.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/target
**/*.rs.bk
Cargo.lock
.vscode
**/*.html
.DS_Store
.DS_Store
Loading
Loading