chore: move proposer (#87)

* chore: move proposer * fix proposer * proposer succinct * fix: docker --------- Co-authored-by: Ubuntu <[email protected]>
succinctlabs · Aug 30, 2024 · 62751dd · 62751dd
1 parent 5895a14
commit 62751dd
Show file tree

Hide file tree

Showing 61 changed files with 22 additions and 24 deletions.
diff --git a/.github/workflows/op_proposer.yaml b/.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 }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -11,7 +11,7 @@ on:
       - "programs/**"
       - "native-host/**"
       - "zkvm-host/**"
-      - "op-succinct-proposer/**"
+      - "proposer/succinct/**"
       - "Cargo.toml"
   merge_group:
 

diff --git a/Cargo.toml b/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"] }

diff --git a/docker-compose.yml b/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

diff --git a/op-proposer-go/.gitignore → proposer/op/.gitignore b/op-proposer-go/.gitignore → proposer/op/.gitignore
diff --git a/op-succinct-proposer/Dockerfile.op_proposer → proposer/op/Dockerfile.op_proposer b/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/

diff --git a/...nct-proposer/Dockerfile.span_batch_server → proposer/op/Dockerfile.span_batch_server b/...nct-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

diff --git a/op-proposer-go/Makefile → proposer/op/Makefile b/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."
diff --git a/op-proposer-go/bindings/zkl2outputoracle.go → proposer/op/bindings/zkl2outputoracle.go b/op-proposer-go/bindings/zkl2outputoracle.go → proposer/op/bindings/zkl2outputoracle.go
diff --git a/op-proposer-go/cmd/main.go → proposer/op/cmd/main.go b/op-proposer-go/cmd/main.go → proposer/op/cmd/main.go
diff --git a/op-proposer-go/go.mod → proposer/op/go.mod b/op-proposer-go/go.mod → proposer/op/go.mod
diff --git a/op-proposer-go/go.sum → proposer/op/go.sum b/op-proposer-go/go.sum → proposer/op/go.sum
diff --git a/op-succinct-proposer/op_proposer.sh → proposer/op/op_proposer.sh b/op-succinct-proposer/op_proposer.sh → proposer/op/op_proposer.sh
diff --git a/op-proposer-go/proposer/Makefile → proposer/op/proposer/Makefile b/op-proposer-go/proposer/Makefile → proposer/op/proposer/Makefile
diff --git a/op-proposer-go/proposer/cmd/main.go → proposer/op/proposer/cmd/main.go b/op-proposer-go/proposer/cmd/main.go → proposer/op/proposer/cmd/main.go
diff --git a/op-proposer-go/proposer/config.go → proposer/op/proposer/config.go b/op-proposer-go/proposer/config.go → proposer/op/proposer/config.go
diff --git a/op-proposer-go/proposer/db/db.go → proposer/op/proposer/db/db.go b/op-proposer-go/proposer/db/db.go → proposer/op/proposer/db/db.go
diff --git a/op-proposer-go/proposer/db/ent/client.go → proposer/op/proposer/db/ent/client.go b/op-proposer-go/proposer/db/ent/client.go → proposer/op/proposer/db/ent/client.go
diff --git a/op-proposer-go/proposer/db/ent/ent.go → proposer/op/proposer/db/ent/ent.go b/op-proposer-go/proposer/db/ent/ent.go → proposer/op/proposer/db/ent/ent.go
diff --git a/...ser-go/proposer/db/ent/enttest/enttest.go → ...ser/op/proposer/db/ent/enttest/enttest.go b/...ser-go/proposer/db/ent/enttest/enttest.go → ...ser/op/proposer/db/ent/enttest/enttest.go
diff --git a/op-proposer-go/proposer/db/ent/generate.go → proposer/op/proposer/db/ent/generate.go b/op-proposer-go/proposer/db/ent/generate.go → proposer/op/proposer/db/ent/generate.go
diff --git a/op-proposer-go/proposer/db/ent/hook/hook.go → proposer/op/proposer/db/ent/hook/hook.go b/op-proposer-go/proposer/db/ent/hook/hook.go → proposer/op/proposer/db/ent/hook/hook.go
diff --git a/...ser-go/proposer/db/ent/migrate/migrate.go → ...ser/op/proposer/db/ent/migrate/migrate.go b/...ser-go/proposer/db/ent/migrate/migrate.go → ...ser/op/proposer/db/ent/migrate/migrate.go
diff --git a/...oser-go/proposer/db/ent/migrate/schema.go → ...oser/op/proposer/db/ent/migrate/schema.go b/...oser-go/proposer/db/ent/migrate/schema.go → ...oser/op/proposer/db/ent/migrate/schema.go
diff --git a/op-proposer-go/proposer/db/ent/mutation.go → proposer/op/proposer/db/ent/mutation.go b/op-proposer-go/proposer/db/ent/mutation.go → proposer/op/proposer/db/ent/mutation.go
diff --git a/...go/proposer/db/ent/predicate/predicate.go → ...op/proposer/db/ent/predicate/predicate.go b/...go/proposer/db/ent/predicate/predicate.go → ...op/proposer/db/ent/predicate/predicate.go
diff --git a/...oposer-go/proposer/db/ent/proofrequest.go → proposer/op/proposer/db/ent/proofrequest.go b/...oposer-go/proposer/db/ent/proofrequest.go → proposer/op/proposer/db/ent/proofrequest.go
diff --git a/...poser/db/ent/proofrequest/proofrequest.go → ...poser/db/ent/proofrequest/proofrequest.go b/...poser/db/ent/proofrequest/proofrequest.go → ...poser/db/ent/proofrequest/proofrequest.go
diff --git a/...-go/proposer/db/ent/proofrequest/where.go → .../op/proposer/db/ent/proofrequest/where.go b/...-go/proposer/db/ent/proofrequest/where.go → .../op/proposer/db/ent/proofrequest/where.go
diff --git a/...go/proposer/db/ent/proofrequest_create.go → ...op/proposer/db/ent/proofrequest_create.go b/...go/proposer/db/ent/proofrequest_create.go → ...op/proposer/db/ent/proofrequest_create.go
diff --git a/...go/proposer/db/ent/proofrequest_delete.go → ...op/proposer/db/ent/proofrequest_delete.go b/...go/proposer/db/ent/proofrequest_delete.go → ...op/proposer/db/ent/proofrequest_delete.go
diff --git a/...-go/proposer/db/ent/proofrequest_query.go → .../op/proposer/db/ent/proofrequest_query.go b/...-go/proposer/db/ent/proofrequest_query.go → .../op/proposer/db/ent/proofrequest_query.go
diff --git a/...go/proposer/db/ent/proofrequest_update.go → ...op/proposer/db/ent/proofrequest_update.go b/...go/proposer/db/ent/proofrequest_update.go → ...op/proposer/db/ent/proofrequest_update.go
diff --git a/op-proposer-go/proposer/db/ent/runtime.go → proposer/op/proposer/db/ent/runtime.go b/op-proposer-go/proposer/db/ent/runtime.go → proposer/op/proposer/db/ent/runtime.go
diff --git a/...ser-go/proposer/db/ent/runtime/runtime.go → ...ser/op/proposer/db/ent/runtime/runtime.go b/...ser-go/proposer/db/ent/runtime/runtime.go → ...ser/op/proposer/db/ent/runtime/runtime.go
diff --git a/...go/proposer/db/ent/schema/proofrequest.go → ...op/proposer/db/ent/schema/proofrequest.go b/...go/proposer/db/ent/schema/proofrequest.go → ...op/proposer/db/ent/schema/proofrequest.go
diff --git a/op-proposer-go/proposer/db/ent/tx.go → proposer/op/proposer/db/ent/tx.go b/op-proposer-go/proposer/db/ent/tx.go → proposer/op/proposer/db/ent/tx.go
diff --git a/op-proposer-go/proposer/driver.go → proposer/op/proposer/driver.go b/op-proposer-go/proposer/driver.go → proposer/op/proposer/driver.go
diff --git a/op-proposer-go/proposer/flags/flags.go → proposer/op/proposer/flags/flags.go b/op-proposer-go/proposer/flags/flags.go → proposer/op/proposer/flags/flags.go
diff --git a/...oposer-go/proposer/l2_output_submitter.go → proposer/op/proposer/l2_output_submitter.go b/...oposer-go/proposer/l2_output_submitter.go → proposer/op/proposer/l2_output_submitter.go
diff --git a/op-proposer-go/proposer/proposer_test.go → proposer/op/proposer/proposer_test.go b/op-proposer-go/proposer/proposer_test.go → proposer/op/proposer/proposer_test.go
diff --git a/op-proposer-go/proposer/prove.go → proposer/op/proposer/prove.go b/op-proposer-go/proposer/prove.go → proposer/op/proposer/prove.go
diff --git a/op-proposer-go/proposer/service.go → proposer/op/proposer/service.go b/op-proposer-go/proposer/service.go → proposer/op/proposer/service.go
diff --git a/op-proposer-go/proposer/span_batches.go → proposer/op/proposer/span_batches.go b/op-proposer-go/proposer/span_batches.go → proposer/op/proposer/span_batches.go
diff --git a/op-proposer-go/proposer/utils/utils.go → proposer/op/proposer/utils/utils.go b/op-proposer-go/proposer/utils/utils.go → proposer/op/proposer/utils/utils.go
diff --git a/op-proposer-go/server/main.go → proposer/op/server/main.go b/op-proposer-go/server/main.go → proposer/op/server/main.go
diff --git a/op-proposer-go/server/main_test.go → proposer/op/server/main_test.go b/op-proposer-go/server/main_test.go → proposer/op/server/main_test.go
diff --git a/op-succinct-proposer/COST_ESTIMATOR.md → proposer/succinct/COST_ESTIMATOR.md b/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
 ```
 

diff --git a/op-succinct-proposer/Cargo.toml → proposer/succinct/Cargo.toml b/op-succinct-proposer/Cargo.toml → proposer/succinct/Cargo.toml
diff --git a/op-succinct-proposer/Dockerfile.server → proposer/succinct/Dockerfile.server b/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

diff --git a/op-succinct-proposer/OP_SUCCINCT_PROPOSER.md → proposer/succinct/OP_SUCCINCT_PROPOSER.md b/op-succinct-proposer/OP_SUCCINCT_PROPOSER.md → proposer/succinct/OP_SUCCINCT_PROPOSER.md
diff --git a/op-succinct-proposer/README.md → proposer/succinct/README.md b/op-succinct-proposer/README.md → proposer/succinct/README.md
diff --git a/op-succinct-proposer/TUTORIAL.md → proposer/succinct/TUTORIAL.md b/op-succinct-proposer/TUTORIAL.md → proposer/succinct/TUTORIAL.md
diff --git a/op-succinct-proposer/bin/cost_estimator.rs → proposer/succinct/bin/cost_estimator.rs b/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)]

diff --git a/...inct-proposer/bin/fetch_and_save_proof.rs → ...oser/succinct/bin/fetch_and_save_proof.rs b/...inct-proposer/bin/fetch_and_save_proof.rs → ...oser/succinct/bin/fetch_and_save_proof.rs
diff --git a/op-succinct-proposer/bin/load_stdin.rs → proposer/succinct/bin/load_stdin.rs b/op-succinct-proposer/bin/load_stdin.rs → proposer/succinct/bin/load_stdin.rs
diff --git a/op-succinct-proposer/bin/server.rs → proposer/succinct/bin/server.rs b/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 {

diff --git a/...uccinct-proposer/bin/span_batch_ranges.rs → proposer/succinct/bin/span_batch_ranges.rs b/...uccinct-proposer/bin/span_batch_ranges.rs → proposer/succinct/bin/span_batch_ranges.rs
diff --git a/op-succinct-proposer/bin/vkey.rs → proposer/succinct/bin/vkey.rs b/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;
 

diff --git a/op-succinct-proposer/build.rs → proposer/succinct/build.rs b/op-succinct-proposer/build.rs → proposer/succinct/build.rs
diff --git a/op-succinct-proposer/src/lib.rs → proposer/succinct/src/lib.rs b/op-succinct-proposer/src/lib.rs → proposer/succinct/src/lib.rs