Merge remote-tracking branch 'scroll/main' into feat/poseidon_bn254

scroll-tech · Jun 13, 2024 · 46cd5a9 · 46cd5a9
2 parents 7eb3efb + 8c0f501
commit 46cd5a9
Show file tree

Hide file tree

Showing 385 changed files with 6,665 additions and 5,264 deletions.
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
@@ -20,7 +20,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up git private repo access
         run: |

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,14 +18,14 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    groth16:
-        name: Groth16
+    plonk:
+        name: Plonk
         runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64
         env:
           CARGO_NET_GIT_FETCH_WITH_CLI: "true"
         steps:
           - name: Checkout sources
-            uses: actions/checkout@v2
+            uses: actions/checkout@v4
 
           - name: Setup CI
             uses: ./.github/actions/setup
@@ -35,7 +35,16 @@ jobs:
             with:
               command: test
               toolchain: nightly-2024-04-17
-              args: --release -p sp1-sdk -- test_e2e_prove_groth16 --nocapture
+              args: --release -p sp1-sdk --features plonk -- test_e2e_prove_plonk --nocapture
             env:
               RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
-              RUST_BACKTRACE: 1
+              RUST_BACKTRACE: 1
+    check-branch:
+        name: Check branch
+        runs-on: ubuntu-latest
+        steps:
+          - name: Check branch
+            if: github.head_ref != 'dev'
+            run: |
+              echo "ERROR: You can only merge to main from dev."
+              exit 1
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -2,7 +2,7 @@ name: PR
 
 on:
   push:
-    branches: [main, dev]
+    branches: [main]
   pull_request:
     branches:
       - "**"
@@ -13,6 +13,9 @@ on:
       - "recursion/**"
       - "derive/**"
       - "sdk/**"
+      - "zkvm/**"
+      - "tests/**"
+      - "examples/**"
       - ".github/workflows/**"
   merge_group:
 
@@ -28,7 +31,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup CI
         uses: ./.github/actions/setup
@@ -45,7 +48,7 @@ jobs:
         with:
           command: test
           toolchain: nightly-2024-04-17
-          args: --release -- --nocapture
+          args: --release --features plonk
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
@@ -59,7 +62,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup CI
         uses: ./.github/actions/setup
@@ -76,7 +79,7 @@ jobs:
         with:
           command: test
           toolchain: nightly-2024-04-17
-          args: --release
+          args: --release --features plonk
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
@@ -90,7 +93,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup CI
         uses: ./.github/actions/setup
@@ -118,7 +121,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup CI
         uses: ./.github/actions/setup
@@ -147,7 +150,7 @@ jobs:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup CI
         uses: ./.github/actions/setup

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,12 +32,17 @@ jobs:
         with:
           pull_token: ${{ secrets.PULL_TOKEN }}
 
+      # If it's a nightly release, tag with the release time. If the tag is `main`, we want to use 
+      # `latest` as the tag name. Else, use the tag name as is.
       - name: Compute release name and tag
         id: release_info
         run: |
           if [[ $IS_NIGHTLY ]]; then
             echo "tag_name=nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT
             echo "release_name=Nightly ($(date '+%Y-%m-%d'))" >> $GITHUB_OUTPUT
+          elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then
+            echo "tag_name=latest" >> $GITHUB_OUTPUT
+            echo "release_name=Latest" >> $GITHUB_OUTPUT
           else
             echo "tag_name=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
             echo "release_name=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
@@ -200,14 +205,14 @@ jobs:
         with:
           name: ${{ needs.prepare.outputs.release_name }}
           tag_name: ${{ needs.prepare.outputs.tag_name }}
-          prerelease: ${{ env.IS_NIGHTLY }}
+          prerelease: ${{ env.IS_NIGHTLY || needs.prepare.outputs.tag_name == 'latest' }}
           body: ${{ needs.prepare.outputs.changelog }}
           files: |
             ${{ steps.artifacts.outputs.file_name }}
             ${{ steps.man.outputs.cargo_prove_man }}
 
       # If this is a nightly release, it also updates the release
-      # tagged `nightly` for compatibility with `foundryup`
+      # tagged `nightly` for compatibility with `sp1up`
       - name: Update nightly release
         if: ${{ env.IS_NIGHTLY }}
         uses: softprops/action-gh-release@v1
@@ -260,4 +265,4 @@ jobs:
             ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
         with:
           update_existing: true
-          filename: .github/RELEASE_FAILURE_ISSUE_TEMPLATE.md
+          filename: .github/RELEASE_FAILURE_ISSUE_TEMPLATE.md