chore: move proposer

succinctlabs · Aug 30, 2024 · 4758125 · 4758125
1 parent 8c86a57
commit 4758125
Show file tree

Hide file tree

Showing 58 changed files with 8 additions and 8 deletions.
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"
 

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/succinct/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-proposer-go/Makefile → proposer/op/Makefile b/op-proposer-go/Makefile → proposer/op/Makefile
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-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/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
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.op_proposer → proposer/succinct/Dockerfile.op_proposer b/op-succinct-proposer/Dockerfile.op_proposer → proposer/succinct/Dockerfile.op_proposer
diff --git a/op-succinct-proposer/Dockerfile.server → proposer/succinct/Dockerfile.server b/op-succinct-proposer/Dockerfile.server → proposer/succinct/Dockerfile.server
diff --git a/...nct-proposer/Dockerfile.span_batch_server → ...ser/succinct/Dockerfile.span_batch_server b/...nct-proposer/Dockerfile.span_batch_server → ...ser/succinct/Dockerfile.span_batch_server
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/op_proposer.sh → proposer/succinct/op_proposer.sh b/op-succinct-proposer/op_proposer.sh → proposer/succinct/op_proposer.sh
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