Merge branch 'main' into lunkai/p256

openvm-org · Dec 19, 2024 · fd8ff5b · fd8ff5b
2 parents 7f4d7d3 + 56caed2
commit fd8ff5b
Show file tree

Hide file tree

Showing 117 changed files with 2,040 additions and 783 deletions.
diff --git a/.github/workflows/algebra-extension.yml b/.github/workflows/algebra-extension.yml
@@ -34,3 +34,9 @@ jobs:
         working-directory: extensions/algebra/circuit
         run: |
           cargo nextest run --cargo-profile=fast
+
+      - name: Run algebra integration tests
+        working-directory: extensions/algebra/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          cargo nextest run --cargo-profile=fast
diff --git a/.github/workflows/benchmark-call.yml b/.github/workflows/benchmark-call.yml
@@ -283,6 +283,7 @@ jobs:
           echo "BENCHMARK_RESULTS_PATH=${BENCHMARK_RESULTS_PATH}" >> $GITHUB_ENV
 
       - name: Update PR github pages with new bench results
+        if: github.event.pull_request.head.repo.fork == false # forks do not have write access
         run: |
           mkdir -p ${BENCHMARK_RESULTS_PATH}
           s3_md_file="${METRIC_NAME}-${current_sha}.md"

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -213,7 +213,7 @@ jobs:
           git config --global user.name "github-actions[bot]"
 
       - name: Update github pages with new bench results
-        if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
+        if: (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) || (github.event_name == 'push' && github.ref == 'refs/heads/main')
         run: |
           mkdir -p ${BENCHMARK_RESULTS_PATH}
           cp /tmp/benchmark-results/summary.md ${BENCHMARK_RESULTS_PATH}/summary.md

diff --git a/.github/workflows/bigint-extension.yml b/.github/workflows/bigint-extension.yml
@@ -34,3 +34,9 @@ jobs:
         working-directory: extensions/bigint/circuit
         run: |
           cargo nextest run --cargo-profile=fast
+
+      - name: Run bigint integration tests
+        working-directory: extensions/bigint/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          cargo nextest run --cargo-profile=fast
diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
@@ -10,6 +10,7 @@ on:
       - "crates/vm/**"
       - "crates/sdk/**"
       - "crates/cli/**"
+      - "examples/**"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
@@ -23,39 +24,39 @@ env:
 jobs:
   app-level-cli:
     runs-on:
-      - runs-on
-      - run-id=${{ github.run_id }}
-      - family=m7
+      - runs-on=${{ github.run_id }}
+      - runner=32cpu-linux-arm64
 
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/rust-toolchain@nightly
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@nextest
       - name: Install solc # svm should support arm64 linux
         run: (hash svm 2>/dev/null || cargo install --version 0.2.23 svm-rs) && svm install 0.8.19 && solc --version
 
-      - name: Install architecture specific tools
+      - name: Install tools
         run: |
-          arch=$(uname -m)
-          case $arch in
-            arm64|aarch64)
-              rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
-              ;;
-            x86_64|amd64)
-              rustup component add rust-src --toolchain nightly-2024-10-30-x86_64-unknown-linux-gnu
-              ;;
-            *)
-              echo "Unsupported architecture: $arch"
-              exit 1
-              ;;
-          esac
+          rustup component add rust-src --toolchain nightly-2024-10-30
 
-      - name: Setup halo2
+      - name: Install cargo-openvm
+        working-directory: crates/cli
+        run: |
+          cargo install --force --locked --path .
+
+      - name: Build book examples
+        working-directory: examples
         run: |
-          bash ./extensions/native/recursion/trusted_setup_s3.sh
+          for dir in */; do
+            if [ -f "${dir}Cargo.toml" ]; then
+              echo "Building ${dir%/}"
+              cd "$dir"
+              cargo openvm build
+              cd ..
+            fi
+          done
 
       # TODO: CLI build, transpile, run, (keygen), prove, contract, verify
       - name: Run app-level CLI commands

diff --git a/.github/workflows/ecc.yml b/.github/workflows/ecc.yml
@@ -50,13 +50,25 @@ jobs:
         run: |
           RUST_MIN_STACK=8388608 cargo nextest run --cargo-profile=fast
 
+      - name: Run pairing integration tests
+        working-directory: extensions/pairing/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          RUST_MIN_STACK=8388608 cargo nextest run --cargo-profile=fast
+
       - name: Install cargo-openvm
         working-directory: crates/cli
         run: |
-          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30
           cargo install --force --locked --path .
 
       - name: Build openvm-ecc-guest crate for openvm
         working-directory: extensions/ecc/guest
         run: |
           cargo openvm build --no-transpile
+
+      - name: Run ecc integration tests
+        working-directory: extensions/ecc/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          cargo nextest run --cargo-profile=fast
diff --git a/.github/workflows/keccak256-extension.yml b/.github/workflows/keccak256-extension.yml
@@ -34,3 +34,9 @@ jobs:
         working-directory: extensions/keccak256/circuit
         run: |
           cargo nextest run --cargo-profile=fast
+
+      - name: Run keccak256 integration tests
+        working-directory: extensions/keccak256/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          cargo nextest run --cargo-profile=fast
diff --git a/.github/workflows/riscv.yml b/.github/workflows/riscv.yml
@@ -49,5 +49,5 @@ jobs:
       - name: Run RISC-V test vector tests
         working-directory: crates/toolchain/tests
         run: |
-          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
+          rustup component add rust-src --toolchain nightly-2024-10-30
           cargo nextest run --cargo-profile=fast --run-ignored only -- test_rv32im_riscv_vector_runtime
diff --git a/.github/workflows/rv32im-extension.yml b/.github/workflows/rv32im-extension.yml
@@ -34,3 +34,9 @@ jobs:
         working-directory: extensions/rv32im/circuit
         run: |
           cargo nextest run --cargo-profile=fast
+
+      - name: Run rv32im integration tests
+        working-directory: extensions/rv32im/tests
+        run: |
+          rustup component add rust-src --toolchain nightly-2024-10-30
+          cargo nextest run --cargo-profile=fast
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -31,9 +31,3 @@ jobs:
         with:
           cache-on-failure: true
       - uses: taiki-e/install-action@nextest
-
-      - name: Run toolchain tests
-        working-directory: crates/toolchain/tests
-        run: |
-          rustup component add rust-src --toolchain nightly-2024-10-30-aarch64-unknown-linux-gnu
-          RUST_MIN_STACK=8388608 cargo nextest run --cargo-profile=fast
diff --git a/Cargo.lock b/Cargo.lock