chore: move proposer

.github/workflows/op_proposer.yaml

@@ -5,12 +5,12 @@ on:
     branches:
       - main
     paths:
-      - 'op-proposer-go/**'
+      - 'proposer/**', 'elf/**'
   push:
     branches:
       - main
     paths:
-      - 'op-proposer-go/**'
+      - 'proposer/**', 'elf/**'
 
 jobs:
   test_op_proposer_go:
@@ -27,7 +27,7 @@ jobs:
         go-version: '1.22'
     - name: Run main_test.go
       run: go test -v ./server/main_test.go
-      working-directory: op-proposer-go
+      working-directory: proposer/op
       env:
         L2_RPC: ${{ secrets.L2_RPC }}
         L2_NODE_RPC: ${{ secrets.L2_NODE_RPC }}

.github/workflows/pr.yaml

@@ -11,7 +11,7 @@ on:
       - "programs/**"
       - "native-host/**"
       - "zkvm-host/**"
-      - "op-succinct-proposer/**"
+      - "proposer/succinct/**"
       - "Cargo.toml"
   merge_group:
 

Cargo.toml

@@ -4,7 +4,7 @@ members = [
     "crates/*",
     "native-host",
     "zkvm-host",
-    "op-succinct-proposer",
+    "proposer/succinct",
 ]
 resolver = "2"
 
@@ -61,7 +61,7 @@ hex = "0.4.3"
 client-utils = { path = "crates/client-utils" }
 host-utils = { path = "crates/host-utils" }
 zkvm-host = { path = "zkvm-host" }
-op-succinct-proposer = { path = "op-succinct-proposer" }
+op-succinct-proposer = { path = "proposer/succinct" }
 
 # ethereum
 alloy = { version = "0.2", default-features = false, features = ["full"] }

docker-compose.yml

@@ -3,7 +3,7 @@ services:
   op-succinct-server:
     build:
       context: .
-      dockerfile: ./op-succinct-proposer/Dockerfile.server
+      dockerfile: ./proposer/succinct/Dockerfile.server
     env_file:
       - .env.server
     restart: unless-stopped
@@ -14,7 +14,7 @@ services:
   op-succinct-proposer:
     build:
       context: .
-      dockerfile: ./op-succinct-proposer/Dockerfile.op_proposer
+      dockerfile: ./proposer/op/Dockerfile.op_proposer
     env_file:
       - .env.server
     restart: unless-stopped

op-succinct-proposer/Dockerfile.op_proposer → proposer/op/Dockerfile.op_proposer

@@ -4,7 +4,7 @@ FROM golang:1.22 AS go-builder
 # Set up Go environment
 FROM go-builder AS optimism-builder
 WORKDIR /optimism
-COPY ./op-proposer-go/ /optimism/op-proposer
+COPY ./proposer/op /optimism/op-proposer
 WORKDIR /optimism/op-proposer/proposer
 RUN make op-proposer
 RUN ls -l /optimism/op-proposer/proposer
@@ -23,7 +23,7 @@ RUN apt-get update && apt-get install -y \
 COPY --from=optimism-builder /optimism/op-proposer/proposer/bin/op-proposer /usr/local/bin/op-proposer
 
 # Set the entrypoint to run op-proposer with environment variables
-COPY ./op-succinct-proposer/op_proposer.sh /usr/local/bin/op_proposer.sh
+COPY ./proposer/op/op_proposer.sh /usr/local/bin/op_proposer.sh
 
 # Make the binary and entrypoint executable.
 RUN ls -l /usr/local/bin/

op-succinct-proposer/Dockerfile.span_batch_server → proposer/op/Dockerfile.span_batch_server

@@ -6,8 +6,6 @@ RUN apt-get update && apt-get install -y \
     wget \
     git \
     build-essential \
-    # g++-x86-64-linux-gnu \
-    # libc6-dev-amd64-cross \
     && rm -rf /var/lib/apt/lists/*
 
 # Install Go 1.22
@@ -23,8 +21,8 @@ ENV PATH="${GOPATH}/bin:${PATH}"
 # Set up Go environment
 WORKDIR /app
 
-# Copy the local op-proposer-go directory
-COPY ./op-proposer-go /app/op-proposer-go
+# Copy the local proposer/op directory
+COPY ./proposer/op /app/op-proposer-go
 
 # Change to the server directory and build the application
 WORKDIR /app/op-proposer-go/server

op-proposer-go/Makefile → proposer/op/Makefile

@@ -5,9 +5,9 @@ SHELL := /bin/bash
 bindings:
 	@echo "Generating bindings for ZKL2OutputOracle.sol..."
 	@mkdir -p bin generated_bindings
-	@cd ../contracts/src/ && forge install && forge build
-	@cd ../contracts/ && forge inspect src/ZKL2OutputOracle.sol:ZKL2OutputOracle abi > ../op-proposer-go/generated_bindings/ZKL2OutputOracle.abi
-	@cd ../contracts/ && forge inspect src/ZKL2OutputOracle.sol:ZKL2OutputOracle bytecode > ../op-proposer-go/generated_bindings/ZKL2OutputOracle.bin
+	@cd ../contracts/ && forge install && forge build
+	@cd ../contracts/ && forge inspect src/ZKL2OutputOracle.sol:ZKL2OutputOracle abi > ../proposer/op/generated_bindings/ZKL2OutputOracle.abi
+	@cd ../contracts/ && forge inspect src/ZKL2OutputOracle.sol:ZKL2OutputOracle bytecode > ../proposer/op/generated_bindings/ZKL2OutputOracle.bin
 	@abigen --abi generated_bindings/ZKL2OutputOracle.abi --bin generated_bindings/ZKL2OutputOracle.bin --pkg bindings --type ZKL2OutputOracle --out ./bindings/zkl2outputoracle.go
 	@rm -rf generated_bindings
 	@echo "Bindings generated successfully."

op-succinct-proposer/COST_ESTIMATOR.md → proposer/succinct/COST_ESTIMATOR.md

@@ -8,7 +8,7 @@ just
 
 Then start the host in the background.
 ```bash
-docker build -t span_batch_server -f op-succinct-proposer/Dockerfile.span_batch_server .
+docker build -t span_batch_server -f proposer/op/Dockerfile.span_batch_server .
 docker run -p 8080:8080 -d span_batch_server
 ```
 

op-succinct-proposer/Dockerfile.server → proposer/succinct/Dockerfile.server

@@ -28,7 +28,7 @@ RUN curl -L https://sp1.succinct.xyz | bash && \
 # Copy the relevant OP Succinct server files.
 COPY Cargo.toml Cargo.lock ./
 COPY zkvm-host ./zkvm-host
-COPY op-succinct-proposer ./op-succinct-proposer
+COPY proposer/succinct ./proposer/succinct
 COPY native-host ./native-host
 COPY elf ./elf
 COPY crates ./crates

op-succinct-proposer/bin/cost_estimator.rs → proposer/succinct/bin/cost_estimator.rs

@@ -23,7 +23,7 @@ use std::{
 };
 use tokio::task::block_in_place;
 
-pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../elf/range-elf");
+pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/range-elf");
 
 /// The arguments for the host executable.
 #[derive(Debug, Clone, Parser)]

op-succinct-proposer/bin/server.rs → proposer/succinct/bin/server.rs

@@ -22,8 +22,8 @@ use sp1_sdk::{
 use std::{env, fs, time::Duration};
 use tower_http::limit::RequestBodyLimitLayer;
 
-pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../elf/range-elf");
-pub const AGG_ELF: &[u8] = include_bytes!("../../elf/aggregation-elf");
+pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/range-elf");
+pub const AGG_ELF: &[u8] = include_bytes!("../../../elf/aggregation-elf");
 
 #[derive(Deserialize, Serialize, Debug)]
 struct SpanProofRequest {

op-succinct-proposer/bin/vkey.rs → proposer/succinct/bin/vkey.rs

@@ -4,8 +4,8 @@ use anyhow::Result;
 use log::info;
 use sp1_sdk::{utils, HashableKey, ProverClient};
 
-pub const AGG_ELF: &[u8] = include_bytes!("../../elf/aggregation-elf");
-pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../elf/range-elf");
+pub const AGG_ELF: &[u8] = include_bytes!("../../../elf/aggregation-elf");
+pub const MULTI_BLOCK_ELF: &[u8] = include_bytes!("../../../elf/range-elf");
 
 use clap::Parser;