Merge branch 'succinctlabs:main' into main

succinctlabs · Dec 17, 2024 · ddfc3e3 · ddfc3e3
2 parents 576ad78 + f28db3c
commit ddfc3e3
Show file tree

Hide file tree

Showing 40 changed files with 631 additions and 1,768 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -35,11 +35,13 @@ runs:
           ~/.cargo/registry/cache/
           ~/.cargo/git/db/
           target/
-        key: rust-1.79.0-${{ hashFiles('**/Cargo.toml') }}
-        restore-keys: rust-1.79.0-
+        key: rust-nightly-${{ hashFiles('**/Cargo.toml') }}
+        restore-keys: rust-nightly-
 
     - name: Setup toolchain
       id: rustc-toolchain
       shell: bash
       run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain 1.79.0 -y
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain nightly -y
+        source "$HOME/.cargo/env"
+        rustup default nightly
diff --git a/.github/workflows/compile.yaml b/.github/workflows/compile.yaml
@@ -17,9 +17,8 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Compile the fault proof program
-      run: cargo build --profile release-client-lto
-      working-directory: programs/fault-proof
+    - name: Setup CI
+      uses: ./.github/actions/setup
     - name: Compile the range program
       run: cargo build --profile release-client-lto
       working-directory: programs/range
@@ -37,9 +36,6 @@ jobs:
         ~/.sp1/bin/sp1up 
         ~/.sp1/bin/cargo-prove prove --version
         source ~/.bashrc
-    - name: Compile the fault proof program
-      run: ~/.sp1/bin/cargo-prove prove build --binary fault-proof
-      working-directory: programs/fault-proof
     - name: Compile the range program
       run: ~/.sp1/bin/cargo-prove prove build --binary range
       working-directory: programs/range

diff --git a/.github/workflows/cost-estimator-manual.yml b/.github/workflows/cost-estimator-manual.yml
@@ -18,23 +18,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: rust-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          restore-keys: rust-1.81.0-
-          key: rust-1.81.0-${{ hashFiles('**/Cargo.toml') }}
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
+      - name: Setup CI
+      uses: ./.github/actions/setup
 
       - name: Run cost estimator
         run: |

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -19,7 +19,8 @@ jobs:
       - image=ubuntu22-full-x64
       - run-id=${{ github.run_id }}    
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
       - name: Set up Docker Compose
         uses: docker/setup-buildx-action@v1

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -19,23 +19,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: rust-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          restore-keys: rust-1.81.0-
-          key: rust-1.81.0-${{ hashFiles('**/Cargo.toml') }}
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
+      - name: Setup CI
+      uses: ./.github/actions/setup
 
       - name: OP Sepolia cost estimator on recent block range
         run: |

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -33,7 +33,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: stable
+          toolchain: nightly
           components: rustfmt
 
       - name: Run rustfmt