Merge branch 'succinctlabs:dev' into feat/docker-optional-workspace-dev

succinctlabs · Nov 2, 2024 · 3b81b4c · 3b81b4c
2 parents 31ad852 + 4370aad
commit 3b81b4c
Show file tree

Hide file tree

Showing 160 changed files with 13,251 additions and 2,254 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -75,6 +75,8 @@ runs:
           ~/.cargo/git/db/
           target/
           ~/.rustup/
+          ~/.sp1/circuits/plonk/
+          ~/.sp1/circuits/groth16/
         key: rust-1.81.0-${{ hashFiles('**/Cargo.toml') }}
         restore-keys: rust-1.81.0-
 

diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -5,9 +5,9 @@ name: book
 
 on:
   push:
-    branches: [main]
+    branches: [dev]
   pull_request:
-    branches: [main]
+    branches: [dev]
     paths:
       - "book/**"
   merge_group:
@@ -117,7 +117,7 @@ jobs:
 
   deploy:
     # Only deploy if a push to main
-    if: github.ref_name == 'main' && github.event_name == 'push'
+    if: github.ref_name == 'dev' && github.event_name == 'push'
     runs-on: ubuntu-latest
     needs: [lint, build]
 

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -52,7 +52,6 @@ jobs:
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
-          # FRI_QUERIES: 1
           SP1_DEV: 1
 
   test-arm:
@@ -89,7 +88,6 @@ jobs:
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
-          # FRI_QUERIES: 1
           SP1_DEV: 1
 
   lint:
@@ -404,3 +402,25 @@ jobs:
       - uses: getsentry/action-git-diff-suggestions@main
         with:
           message: typos
+
+  check-verifier-no-std:
+    name: Check Verifier `no_std`
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Actions Repository
+        uses: actions/checkout@v4
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: riscv32imac-unknown-none-elf
+
+      - name: Install target support
+        run: rustup target add riscv32imac-unknown-none-elf
+
+      - name: Check build
+        run: cargo check --target riscv32imac-unknown-none-elf --no-default-features -p sp1-verifier
+
diff --git a/.github/workflows/suite.yml b/.github/workflows/suite.yml
@@ -26,7 +26,13 @@ jobs:
       matrix:
         workload: ${{ fromJSON(github.event.inputs.cpu_workloads) }}
     name: ${{ matrix.workload }} (cpu)
-    runs-on: ["runs-on", "runner=64cpu-linux-x64", "spot=false", "run-id=${{ github.run_id }}"]
+    runs-on:
+      [
+        "runs-on",
+        "runner=64cpu-linux-x64",
+        "spot=false",
+        "run-id=${{ github.run_id }}",
+      ]
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -71,44 +77,52 @@ jobs:
       matrix:
         workload: ${{ fromJSON(github.event.inputs.cuda_workloads) }}
     name: ${{ matrix.workload }} (gpu)
-    runs-on: ["runs-on", "family=g6.4xlarge", "hdd=200", "ami=ami-0a63dc9cb9e934ba3", "spot=false", "run-id=${{ github.run_id }}"]
+    runs-on:
+      [
+        "runs-on",
+        "family=g6.4xlarge",
+        "hdd=200",
+        "ami=ami-0a63dc9cb9e934ba3",
+        "spot=false",
+        "run-id=${{ github.run_id }}",
+      ]
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-
-    - name: Setup CI
-      uses: ./.github/actions/setup
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_S3 }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3 }}
-        aws-region: us-west-2
-
-    - name: Copy files from S3
-      run: |
-        mkdir -p workdir
-        aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/program.bin workdir/program.bin
-        aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/stdin.bin workdir/stdin.bin
-
-    - name: Clean Cargo cache
-      uses: actions-rs/cargo@v1
-      with:
-        command: clean
-        toolchain: 1.81.0
-
-    - name: Run sp1-perf
-      uses: actions-rs/cargo@v1
-      with:
-        command: run
-        toolchain: 1.81.0
-        args: --release -p sp1-perf -- --program workdir/program.bin --stdin workdir/stdin.bin --mode cuda
-      env:
-        RUST_LOG: debug
-        RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
-        RUST_BACKTRACE: 1
-        SP1_PROVER: cuda
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Setup CI
+        uses: ./.github/actions/setup
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_S3 }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3 }}
+          aws-region: us-west-2
+
+      - name: Copy files from S3
+        run: |
+          mkdir -p workdir
+          aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/program.bin workdir/program.bin
+          aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/stdin.bin workdir/stdin.bin
+
+      - name: Clean Cargo cache
+        uses: actions-rs/cargo@v1
+        with:
+          command: clean
+          toolchain: 1.81.0
+
+      - name: Run sp1-perf
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          toolchain: 1.81.0
+          args: --release -p sp1-perf -- --program workdir/program.bin --stdin workdir/stdin.bin --mode cuda
+        env:
+          RUST_LOG: debug
+          RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
+          RUST_BACKTRACE: 1
+          SP1_PROVER: cuda
 
   test-network:
     if: ${{ fromJSON(github.event.inputs.network_workloads)[0] != null }}
@@ -117,43 +131,48 @@ jobs:
       matrix:
         workload: ${{ fromJSON(github.event.inputs.network_workloads) }}
     name: ${{ matrix.workload }} (network)
-    runs-on: ["runs-on", "runner=16cpu-linux-x64", "spot=false", "run-id=${{ github.run_id }}"]
+    runs-on:
+      [
+        "runs-on",
+        "runner=16cpu-linux-x64",
+        "spot=false",
+        "run-id=${{ github.run_id }}",
+      ]
     steps:
-    - name: Checkout sources
-      uses: actions/checkout@v4
-
-    - name: Setup CI
-      uses: ./.github/actions/setup
-
-    - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v1
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_S3 }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3 }}
-        aws-region: us-west-2
-
-    - name: Copy files from S3
-      run: |
-        mkdir -p workdir
-        aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/program.bin workdir/program.bin
-        aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/stdin.bin workdir/stdin.bin
-
-    - name: Clean Cargo cache
-      uses: actions-rs/cargo@v1
-      with:
-        command: clean
-        toolchain: 1.81.0
-
-    - name: Run sp1-perf
-      uses: actions-rs/cargo@v1
-      with:
-        command: run
-        toolchain: 1.81.0
-        args: --release -p sp1-perf --features native-gnark -- --program workdir/program.bin --stdin workdir/stdin.bin --mode network
-      env:
-        RUST_LOG: info
-        RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
-        RUST_BACKTRACE: 1
-        SP1_PROVER: network
-        SP1_PRIVATE_KEY: ${{ secrets.SP1_PRIVATE_KEY }}
-        PROVER_NETWORK_RPC: https://rpc-staging.succinct.xyz
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Setup CI
+        uses: ./.github/actions/setup
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_S3 }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY_S3 }}
+          aws-region: us-west-2
+
+      - name: Copy files from S3
+        run: |
+          mkdir -p workdir
+          aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/program.bin workdir/program.bin
+          aws s3 cp s3://sp1-testing-suite/${{ matrix.workload }}/stdin.bin workdir/stdin.bin
+
+      - name: Clean Cargo cache
+        uses: actions-rs/cargo@v1
+        with:
+          command: clean
+          toolchain: 1.81.0
+
+      - name: Run sp1-perf
+        uses: actions-rs/cargo@v1
+        with:
+          command: run
+          toolchain: 1.81.0
+          args: --release -p sp1-perf --features "native-gnark,network-v2" -- --program workdir/program.bin --stdin workdir/stdin.bin --mode network
+        env:
+          RUST_LOG: info
+          RUSTFLAGS: -Copt-level=3 -Ctarget-cpu=native
+          RUST_BACKTRACE: 1
+          SP1_PROVER: network
+          SP1_PRIVATE_KEY: ${{ secrets.SP1_PRIVATE_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,10 @@ pgo-data.profdata
 **/program.bin
 **/stdin.bin
 
+# Example fibonacci groth16 / plonk proofs
+examples/fibonacci/fibonacci-groth16.bin
+examples/fibonacci/fibonacci-plonk.bin
+
 # Benchmark
 benchmark.csv
 
@@ -33,4 +37,7 @@ crates/prover/pk
 crates/prover/powersOfTau28_hez_final.ptau
 crates/prover/semaphore-gnark-11
 crates/prover/trusted-setup
-crates/prover/vk
+crates/prover/vk
+
+# Example legacy elf
+examples/elf