afae216 upstream merge

.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

.github/workflows/compile.yaml

@@ -17,32 +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
-  build_zkvm_programs:
-    runs-on:
-      - runs-on
-      - runner=64cpu-linux-arm64
-      - run-id=${{ github.run_id }} 
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
-    - name: Install SP1 toolchain
-      run: |
-        curl -L https://sp1.succinct.xyz | bash
-        ~/.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
-    - name: Compile the aggregation program
-      run: ~/.sp1/bin/cargo-prove prove build --binary aggregation
-      working-directory: programs/aggregation

.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: |

.github/workflows/docker-build.yaml

@@ -0,0 +1,96 @@
+name: Docker Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Build Docker Images
+    runs-on:
+      - runs-on
+      - cpu=16
+      - ram=64
+      - family=m7a+m7i-flex
+      - image=ubuntu22-full-x64
+      - run-id=${{ github.run_id }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta for op-proposer
+        id: meta-op-proposer
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}/op-proposer
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Docker meta for succinct-proposer
+        id: meta-succinct
+        uses: docker/metadata-action@v5
+        with:
+          images: ghcr.io/${{ github.repository }}/succinct-proposer
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha
+
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Pre-build debug
+        run: |
+          echo "Meta tags: ${{ steps.meta-op-proposer.outputs.tags }}"
+          echo "Push condition: ${{ github.event_name != 'pull_request' }}"
+          echo "Event name: ${{ github.event_name }}"
+
+      - name: Build and push op-proposer
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: proposer/op/Dockerfile.op_proposer
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-op-proposer.outputs.tags }}
+          labels: ${{ steps.meta-op-proposer.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+      - name: Post-build debug
+        run: |
+          docker images
+          echo "Checking authentication:"
+          docker login ghcr.io -u ${{ github.actor }} -p ${{ secrets.GITHUB_TOKEN }} 2>&1 || true
+
+      - name: Build and push succinct-proposer
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: proposer/succinct/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta-succinct.outputs.tags }}
+          labels: ${{ steps.meta-succinct.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker.yaml → .github/workflows/docker-test.yaml

@@ -17,9 +17,11 @@ jobs:
       - ram=64
       - family=m7a+m7i-flex
       - image=ubuntu22-full-x64
+      - disk=large
       - 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

.github/workflows/elf.yml

@@ -0,0 +1,44 @@
+name: ELF
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  elf:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+      - name: Install SP1 toolchain
+        run: |
+          curl -L https://sp1.succinct.xyz | bash
+          ~/.sp1/bin/sp1up 
+          ~/.sp1/bin/cargo-prove prove --version
+          source ~/.bashrc
+      - name: Setup Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Verify the OP Succinct binaries
+        run: |
+          # Build the binaries
+          cd programs/range
+          ~/.sp1/bin/cargo-prove prove build --elf-name range-elf --docker --tag v4.0.0-rc.10 --output-directory ../../elf
+          cd ../aggregation
+          ~/.sp1/bin/cargo-prove prove build --elf-name aggregation-elf --docker --tag v4.0.0-rc.10 --output-directory ../../elf
+          cd ../../
+
+          # Check for any changes in the elf directory
+          if [ -n "$(git status --porcelain elf/)" ]; then
+            echo "❌ ELF files changed during build!"
+            git diff elf/
+            exit 1
+          else
+            echo "✅ ELF files remained unchanged"
+          fi

.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: |

.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

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "contracts/lib/sp1-contracts"]
 	path = contracts/lib/sp1-contracts
 	url = https://github.com/succinctlabs/sp1-contracts
+[submodule "contracts/lib/solady"]
+	path = contracts/lib/solady
+	url = https://github.com/vectorized/solady