Merge remote-tracking branch 'origin/main' into john/rename-proposer

.github/workflows/compile.yaml

@@ -17,7 +17,7 @@ jobs:
       uses: actions/checkout@v3
     - name: Compile the fault proof program
       run: cargo build --profile release-client-lto
-      working-directory: client-programs/fault-proof
+      working-directory: programs/fault-proof
     - name: Compile the range program
       run: cargo build --profile release-client-lto
-      working-directory: client-programs/range
+      working-directory: programs/range

.github/workflows/docker_compose_test.yaml

@@ -0,0 +1,26 @@
+name: Docker Compose Test
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  docker-compose-test:
+    name: Docker Compose Test
+    runs-on:
+      - runs-on
+      - runner=64cpu-linux-x64
+      - run-id=${{ github.run_id }}    
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Docker Compose
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build Docker Compose setup
+        run: |
+          docker compose build

.github/workflows/op_proposer.yaml

@@ -33,18 +33,3 @@ jobs:
         L2_NODE_RPC: ${{ secrets.L2_NODE_RPC }}
         L1_RPC: ${{ secrets.L1_RPC }}
         L1_BEACON_RPC: ${{ secrets.L1_BEACON_RPC }}
-  docker-compose-test:
-    name: Docker Compose Test
-    runs-on:
-      - runs-on
-      - runner=64cpu-linux-x64
-      - run-id=${{ github.run_id }}    
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up Docker Compose
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build Docker Compose setup
-        run: |
-          docker compose build

.github/workflows/pr.yaml

@@ -8,7 +8,7 @@ on:
       - "**"
     paths:
       - "crates/**"
-      - "client-programs/**"
+      - "programs/**"
       - "native-host/**"
       - "zkvm-host/**"
       - "op-succinct-proposer/**"

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
 members = [
-    "client-programs/*",
+    "programs/*",
     "crates/*",
     "native-host",
     "zkvm-host",

README.md

@@ -17,7 +17,7 @@ Standalone repo to use Kona & SP1 to verify OP Stack blocks.
 **`op-succinct`**
 - `native-host`: The host program which runs the `op-succinct` program natively using `kona`.
 - `zkvm-host`: The host program which runs the `op-succinct` program in the SP1 zkVM.
-- `client-programs`: The programs proven in SP1.
+- `programs`: The programs proven in SP1.
     - `fault-proof` and `range` are used to verifiably derive and execute single blocks
     and batches of blocks respectively. Their binary's are first run in native mode on the `kona-host` to
     fetch the witness data, then they use SP1 to verifiably execute the program.

proposer/succinct/Dockerfile.server

@@ -32,7 +32,7 @@ COPY proposer/succinct ./proposer/succinct
 COPY native-host ./native-host
 COPY elf ./elf
 COPY crates ./crates
-COPY client-programs ./client-programs
+COPY programs ./programs
 
 # Build the server
 RUN cargo build --bin server --release

proposer/succinct/build.rs

@@ -44,7 +44,7 @@ fn build_native_host_runner() {
 // /// Build a program for the zkVM.
 // fn build_zkvm_program(program: &str) {
 //     build_program_with_args(
-//         &format!("../client-programs/{}", program),
+//         &format!("../programs/{}", program),
 //         BuildArgs {
 //             elf_name: format!("{}-elf", program),
 //             // docker: true,

zkvm-host/build.rs

@@ -19,7 +19,7 @@
 // /// Build a program for the zkVM.
 // fn build_zkvm_program(program: &str) {
 //     build_program_with_args(
-//         &format!("../client-programs/{}", program),
+//         &format!("../programs/{}", program),
 //         BuildArgs {
 //             elf_name: format!("{}-elf", program),
 //             // docker: true,