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 plonk into dev #72

Merged
merged 38 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b3ed7b4
feat: exit code (#750)
kevjue Jun 12, 2024
d88bb5e
chore: clippy
huitseeker Jun 12, 2024
fe5f943
chore: manage dependencies
huitseeker Jun 12, 2024
a5d750a
chore: manage dependencies
huitseeker Jun 12, 2024
259d63d
chore: rebuild tests
huitseeker Jun 12, 2024
c2f4186
chore: rebuild examples
huitseeker Jun 12, 2024
b83a59e
chore: OK OpenSSL
huitseeker Jun 12, 2024
53ab730
fix: allow gnark compilation for osx
huitseeker Jun 13, 2024
ff4cb30
chore: fix is_prime
huitseeker Jun 14, 2024
6462820
ci: activate plonk feature for plonk tests
huitseeker Jun 14, 2024
e1be930
chore: fix typos
huitseeker Jun 14, 2024
ee262fe
fix: read env variables for prover configuration
huitseeker Jun 14, 2024
561ac63
refactor: reinstate shard_batch_size
huitseeker Jun 15, 2024
b4bf1bc
fix: double fibonacci program (#781)
ctian1 May 29, 2024
0c09a8c
fix: rename remote to network
ratankaliani May 30, 2024
2c345fc
fix
ratankaliani May 30, 2024
c9b3fcf
prover type
ratankaliani May 30, 2024
e817174
chore: fix linting, deps & licenses
huitseeker Jun 15, 2024
8de1888
chore: rebuild tests & examples
huitseeker Jun 15, 2024
4947ba7
refactor: adapt test_ssz_withdrawals_program_run_report
huitseeker Jun 16, 2024
36e8db8
ci: adjust CI parameters to trigger plonk feature
huitseeker Jun 16, 2024
e2d034e
removing overkill clippy allows
huitseeker Jun 16, 2024
5e6ea01
refactor: Rename 'pad_vec_rows' function to 'pad_rows' across all mod…
huitseeker Jun 17, 2024
7e55aeb
chore: fixes (#821)
jtguibas Jun 3, 2024
50e8881
fix: Adapt Sphinx chips to nonce changes
wwared Jun 17, 2024
64be76d
chore: clippy and fmt
wwared Jun 18, 2024
d7ec63c
fix: Revert some memory chip constraints
wwared Jun 19, 2024
18e09dd
feat: Incorporate downloading Sphinx parameters using AWS cli (#63)
storojs72 Jun 20, 2024
30e2f78
fix: Deactivate G2 precompiles (#62)
huitseeker Jun 21, 2024
e42b2bf
feat: optimize cpu tracegen
wwared Jun 20, 2024
09322a2
feat: optimize byte trace generation
wwared Jun 20, 2024
1444171
refactor: hashbrown instead of std
tchataigner Jun 20, 2024
c3b68c0
refactor: par_iter memory chip
tchataigner Jun 20, 2024
2e7a2ca
chore: ignore ide conf
tchataigner Jun 20, 2024
531b725
fix: parallelize flatten permutation traces and collect domains
huitseeker Jun 21, 2024
e51a37d
chore: E2E test for checking if Plonk parameters require regenerating…
storojs72 Jun 21, 2024
8b7ed48
chore: update examples
huitseeker Jun 24, 2024
8d0b36e
chore: update to new Plonky3 branch
huitseeker Jun 24, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Run exhaustive tests
run: |
cargo nextest run --cargo-profile dev-ci --profile ci --workspace --run-ignored all -E 'all()'
cargo nextest run --cargo-profile dev-ci --profile ci --workspace --features "plonk" --run-ignored all -E 'all()'
- name: Open an issue on failure
if: failure()
uses: JasonEtco/create-an-issue@v2
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

env:
AWS_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_KEY }}

jobs:
test:
name: CI Test Suite
Expand All @@ -23,12 +27,12 @@ jobs:
uses: ./.github/actions/setup
with:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Run cargo test on sphinx except the test_e2e_prove_groth16 recursion test
- name: Run cargo test on *all of* sphinx except the test_e2e_prove_plonk recursion test
run: |
cargo nextest run --cargo-profile dev-ci --profile ci --workspace -E 'all() - test(test_e2e_prove_groth16)'
cargo nextest run --cargo-profile dev-ci --profile ci --workspace --features "plonk" -E 'all() - test(test_e2e_prove_plonk)'
- name: Run cargo test with no default features
run: |
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features debug -- cpu::trace::tests::generate_trace
cargo nextest run -p sphinx-core --cargo-profile dev-ci --profile ci --no-default-features --features "debug" -E 'test(cpu::trace::tests)'
working-directory: ${{ github.workspace }}/examples

test-recursion-circuit:
Expand All @@ -46,7 +50,7 @@ jobs:
pull_token: ${{ secrets.REPO_TOKEN }}
- name: Run cargo test on the recursion circuit
run: |
cargo nextest run --cargo-profile dev-ci --profile ci -p sphinx-recursion-circuit
cargo nextest run --cargo-profile dev-ci --profile ci --features "plonk" -E 'package(sphinx-recursion-circuit)'

clippy:
runs-on: warp-ubuntu-latest-x64-16x
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@ benchmark.csv
# Build Artifacts
recursion/gnark-ffi/build
prover/build
prover/*.tar.gz
prover/*.tar.gz

# IDE Conf
.idea
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@
],
"rust-analyzer.showUnlinkedFileNotification": false,
"rust-analyzer.check.features": null,
"rust-analyzer.server.extraEnv": {
"CARGO_PROFILE_DEV_BUILD_OVERRIDE_DEBUG": "true",
},
// "rust-analyzer.showUnlinkedFileNotification": false,
// "rust-analyzer.check.workspace": false,
// "rust-analyzer.check.invocationStrategy": "once",
Expand Down
Loading
Loading