resolved conflicts with experimental

succinctlabs · Aug 8, 2024 · 97126d6 · 97126d6
2 parents d1b16ff + d66664f
commit 97126d6
Show file tree

Hide file tree

Showing 267 changed files with 10,495 additions and 1,894 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -37,11 +37,11 @@ runs:
           ~/.cargo/git/db/
           target/
           ~/.rustup/
-        key: rust-nightly-2024-04-17-${{ hashFiles('**/Cargo.toml') }}
-        restore-keys: rust-nightly-2024-04-17-
+        key: rust-1.79.0-${{ hashFiles('**/Cargo.toml') }}
+        restore-keys: rust-1.79.0-
 
     - name: Setup toolchain
       id: rustc-toolchain
       shell: bash
       run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly-2024-04-17 -y
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.79.0 -y
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,3 +17,4 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    target-branch: "dev"
diff --git a/.github/workflows/book.yml b/.github/workflows/book.yml
@@ -108,7 +108,7 @@ jobs:
             .
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: github-pages
           path: ${{ runner.temp }}/artifact.tar
@@ -135,4 +135,4 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/docker-gnark.yml b/.github/workflows/docker-gnark.yml
@@ -15,7 +15,13 @@ on:
 jobs:
   test-docker:
     name: Test
-    runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
+    runs-on:
+      [
+        runs-on,
+        runner=64cpu-linux-arm64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -35,5 +41,5 @@ jobs:
           SP1_GNARK_IMAGE: sp1-gnark
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release -p sp1-prover -- --exact tests::test_e2e
diff --git a/.github/workflows/docker-publish-gnark.yml b/.github/workflows/docker-publish-gnark.yml
@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
         with:
           install: true
@@ -44,7 +44,7 @@ jobs:
       - name: Log into registry ${{ env.REGISTRY }}
         # Ensure this doesn't trigger on PR's
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -54,7 +54,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -86,7 +86,7 @@ jobs:
       # https://github.com/docker/build-push-action
       # https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile.gnark-ffi

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Docker BuildX
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         id: buildx
         with:
           install: true
@@ -41,7 +41,7 @@ jobs:
       - name: Log into registry ${{ env.REGISTRY }}
         # Ensure this doesn't trigger on PR's
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -51,7 +51,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -83,7 +83,7 @@ jobs:
       # https://github.com/docker/build-push-action
       # https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: ./cli/docker
           file: ./cli/docker/Dockerfile

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
@@ -41,7 +41,7 @@ jobs:
           ./eval.sh
 
       - name: Upload Benchmark as Artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: benchmark-results-${{ matrix.arch }}
           path: benchmark.csv
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,17 @@ concurrency:
 jobs:
   plonk:
     name: Plonk Native
-    runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64,spot=false
+    runs-on:
+      [
+        runs-on,
+        cpu=64,
+        ram=256,
+        family=m7i+m7a,
+        hdd=80,
+        image=ubuntu22-full-x64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -34,15 +44,25 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release -p sp1-sdk --features native-gnark -- test_e2e_prove_plonk --nocapture
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
 
   plonk-docker:
     name: Plonk Docker
-    runs-on: runs-on,cpu=64,ram=256,family=m7i+m7a,hdd=80,image=ubuntu22-full-x64,spot=false
+    runs-on:
+      [
+        runs-on,
+        cpu=64,
+        ram=256,
+        family=m7i+m7a,
+        hdd=80,
+        image=ubuntu22-full-x64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -56,25 +76,31 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release -p sp1-sdk -- test_e2e_prove_plonk --nocapture
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
           RUST_BACKTRACE: 1
 
   check-branch:
     name: Check branch
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-latest, "run-id=${{ github.run_id }}"]
     steps:
       - name: Check branch
-        if: github.head_ref != 'dev' && !startsWith(github.ref, 'release/') && !startsWith(github.ref, 'hotfix/')
+        if: github.head_ref != 'dev' && !startsWith(github.head_ref, 'release/') && !startsWith(github.head_ref, 'hotfix/')
         run: |
           echo "ERROR: You can only merge to main from dev, release/*, or hotfix/*."
           exit 1
 
   ssz-withdrawals:
     name: Example (SSZ Withdrawals)
-    runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
+    runs-on:
+      [
+        runs-on,
+        runner=64cpu-linux-arm64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -108,7 +134,13 @@ jobs:
 
   tendermint:
     name: Example (Tendermint)
-    runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
+    runs-on:
+      [
+        runs-on,
+        runner=64cpu-linux-arm64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -41,14 +41,14 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: check
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --all-targets --all-features
 
       - name: Run cargo test core-v2
         uses: actions-rs/cargo@v1
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release --package sp1-recursion-core-v2 --package sp1-recursion-circuit-v2 --features native-gnark
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
@@ -60,7 +60,13 @@ jobs:
 
   test-x86:
     name: Test (x86-64)
-    runs-on: runs-on,runner=64cpu-linux-x64,spot=false
+    runs-on:
+      [
+        runs-on,
+        runner=64cpu-linux-x64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -74,14 +80,14 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: check
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --all-targets --all-features
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release --features native-gnark
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
@@ -91,7 +97,13 @@ jobs:
 
   test-arm:
     name: Test (ARM)
-    runs-on: runs-on,runner=64cpu-linux-arm64,spot=false
+    runs-on:
+      [
+        runs-on,
+        runner=64cpu-linux-arm64,
+        spot=false,
+        "run-id=${{ github.run_id }}",
+      ]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -105,14 +117,14 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: check
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --all-targets --all-features
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
         with:
           command: test
-          toolchain: nightly-2024-04-17
+          toolchain: 1.79.0
           args: --release --features native-gnark
         env:
           RUSTFLAGS: -Copt-level=3 -Cdebug-assertions -Coverflow-checks=y -Cdebuginfo=0 -C target-cpu=native
@@ -122,7 +134,7 @@ jobs:
 
   lint:
     name: Formatting & Clippy
-    runs-on: runs-on,runner=8cpu-linux-x64
+    runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}"]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -150,7 +162,7 @@ jobs:
 
   examples:
     name: Examples
-    runs-on: runs-on,runner=8cpu-linux-x64
+    runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}"]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps:
@@ -180,7 +192,7 @@ jobs:
 
   cli:
     name: CLI
-    runs-on: runs-on,runner=8cpu-linux-x64
+    runs-on: [runs-on, runner=8cpu-linux-x64, "run-id=${{ github.run_id }}"]
     env:
       CARGO_NET_GIT_FETCH_WITH_CLI: "true"
     steps: