chore: validity, fault-proof (#424)

* chore: refactor * fix * add * simplify
succinctlabs · Mar 8, 2025 · 9763801 · 9763801
1 parent 6271c58
commit 9763801
Show file tree

Hide file tree

Showing 60 changed files with 45 additions and 46 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,6 @@
 /target
 /data
-/execution-reports
+/execution-reports
+/book
+/audits
+.github
diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
@@ -46,7 +46,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: proposer/succinct/Dockerfile
+          file: validity/Dockerfile
           push: true
           tags: ${{ steps.meta-succinct.outputs.tags }}
           labels: ${{ steps.meta-succinct.outputs.labels }}

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -11,7 +11,8 @@ on:
       - "programs/**"
       - "scripts/**"
       - "utils/**"
-      - "proposer/succinct/**"
+      - "fault-proof/**"
+      - "validity/**"
       - "Cargo.toml"
   merge_group:
 

diff --git a/.github/workflows/sqlx-check.yml b/.github/workflows/sqlx-check.yml
@@ -27,4 +27,4 @@ jobs:
         run: cargo install sqlx-cli --no-default-features --features native-tls,postgres
 
       - name: Verify SQLx query files
-        run: cd proposer/succinct && cargo sqlx prepare --check
+        run: cd validity && cargo sqlx prepare --check
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,8 +3,8 @@ members = [
     "utils/*",
     "programs/*",
     "scripts/*",
-    "proposer/succinct",
-    "fault_proof",
+    "validity",
+    "fault-proof",
 ]
 resolver = "2"
 
@@ -72,7 +72,8 @@ op-succinct-prove = { path = "scripts/prove" }
 op-succinct-client-utils = { path = "utils/client" }
 op-succinct-host-utils = { path = "utils/host" }
 op-succinct-build-utils = { path = "utils/build" }
-op-succinct-proposer = { path = "proposer/succinct" }
+op-succinct-validity = { path = "validity" }
+op-succinct-fp = { path = "fault-proof" }
 
 # Alloy (Network)
 alloy-signer-local = { version = "0.11.1" }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ services:
   op-succinct:
     build:
       context: .
-      dockerfile: ./proposer/succinct/Dockerfile
+      dockerfile: ./validity/Dockerfile
     env_file:
       - ${ENV_FILE:-.env}
     restart: unless-stopped
diff --git a/fault_proof/Cargo.toml → fault-proof/Cargo.toml b/fault_proof/Cargo.toml → fault-proof/Cargo.toml
diff --git a/fault_proof/Dockerfile.challenger → fault-proof/Dockerfile.challenger b/fault_proof/Dockerfile.challenger → fault-proof/Dockerfile.challenger
diff --git a/fault_proof/Dockerfile.proposer → fault-proof/Dockerfile.proposer b/fault_proof/Dockerfile.proposer → fault-proof/Dockerfile.proposer
diff --git a/fault_proof/bin/challenger.rs → fault-proof/bin/challenger.rs b/fault_proof/bin/challenger.rs → fault-proof/bin/challenger.rs
diff --git a/fault_proof/bin/proposer.rs → fault-proof/bin/proposer.rs b/fault_proof/bin/proposer.rs → fault-proof/bin/proposer.rs
diff --git a/fault_proof/docker-compose.yml → fault-proof/docker-compose.yml b/fault_proof/docker-compose.yml → fault-proof/docker-compose.yml
diff --git a/fault_proof/src/config.rs → fault-proof/src/config.rs b/fault_proof/src/config.rs → fault-proof/src/config.rs
diff --git a/fault_proof/src/contract.rs → fault-proof/src/contract.rs b/fault_proof/src/contract.rs → fault-proof/src/contract.rs
diff --git a/fault_proof/src/lib.rs → fault-proof/src/lib.rs b/fault_proof/src/lib.rs → fault-proof/src/lib.rs
diff --git a/fault_proof/src/proposer.rs → fault-proof/src/proposer.rs b/fault_proof/src/proposer.rs → fault-proof/src/proposer.rs
diff --git a/fault_proof/src/utils.rs → fault-proof/src/utils.rs b/fault_proof/src/utils.rs → fault-proof/src/utils.rs
diff --git a/fault_proof/tests/e2e.rs → fault-proof/tests/e2e.rs b/fault_proof/tests/e2e.rs → fault-proof/tests/e2e.rs
diff --git a/fault_proof/tests/integration.rs → fault-proof/tests/integration.rs b/fault_proof/tests/integration.rs → fault-proof/tests/integration.rs
diff --git a/...8c9cf86a1e38eccf789cd6bd03fccf7bbad0.json → ...8c9cf86a1e38eccf789cd6bd03fccf7bbad0.json b/...8c9cf86a1e38eccf789cd6bd03fccf7bbad0.json → ...8c9cf86a1e38eccf789cd6bd03fccf7bbad0.json
diff --git a/...3f41626227b2ee4649272cb2a70f5082c108.json → ...3f41626227b2ee4649272cb2a70f5082c108.json b/...3f41626227b2ee4649272cb2a70f5082c108.json → ...3f41626227b2ee4649272cb2a70f5082c108.json
diff --git a/...eab4b2da982b480e1b73563a292651679c28.json → ...eab4b2da982b480e1b73563a292651679c28.json b/...eab4b2da982b480e1b73563a292651679c28.json → ...eab4b2da982b480e1b73563a292651679c28.json
diff --git a/...83fd64bbfcc1503bf5d42f4abfdbb3b5fd9f.json → ...83fd64bbfcc1503bf5d42f4abfdbb3b5fd9f.json b/...83fd64bbfcc1503bf5d42f4abfdbb3b5fd9f.json → ...83fd64bbfcc1503bf5d42f4abfdbb3b5fd9f.json
diff --git a/...7768bb3943359f3aab0109fbeb8aa9e29b34.json → ...7768bb3943359f3aab0109fbeb8aa9e29b34.json b/...7768bb3943359f3aab0109fbeb8aa9e29b34.json → ...7768bb3943359f3aab0109fbeb8aa9e29b34.json
diff --git a/...c4e4cd60d1f2c9510580cc469b08203f8f66.json → ...c4e4cd60d1f2c9510580cc469b08203f8f66.json b/...c4e4cd60d1f2c9510580cc469b08203f8f66.json → ...c4e4cd60d1f2c9510580cc469b08203f8f66.json
diff --git a/...0145c9059be1353eb6e4e09a6e67302acb32.json → ...0145c9059be1353eb6e4e09a6e67302acb32.json b/...0145c9059be1353eb6e4e09a6e67302acb32.json → ...0145c9059be1353eb6e4e09a6e67302acb32.json
diff --git a/...2cf82fc39080f22e85f7615c282456263bb4.json → ...2cf82fc39080f22e85f7615c282456263bb4.json b/...2cf82fc39080f22e85f7615c282456263bb4.json → ...2cf82fc39080f22e85f7615c282456263bb4.json
diff --git a/...04156bd555ead817e6e88b01673440fdedd5.json → ...04156bd555ead817e6e88b01673440fdedd5.json b/...04156bd555ead817e6e88b01673440fdedd5.json → ...04156bd555ead817e6e88b01673440fdedd5.json
diff --git a/...fe61324f9422615da16addcef849c3d94632.json → ...fe61324f9422615da16addcef849c3d94632.json b/...fe61324f9422615da16addcef849c3d94632.json → ...fe61324f9422615da16addcef849c3d94632.json
diff --git a/...ee2abe9e2b845b28e2b051edf6e2d9c5da81.json → ...ee2abe9e2b845b28e2b051edf6e2d9c5da81.json b/...ee2abe9e2b845b28e2b051edf6e2d9c5da81.json → ...ee2abe9e2b845b28e2b051edf6e2d9c5da81.json
diff --git a/...ef13b05842c5211894651a7ff72f7c6feb3e.json → ...ef13b05842c5211894651a7ff72f7c6feb3e.json b/...ef13b05842c5211894651a7ff72f7c6feb3e.json → ...ef13b05842c5211894651a7ff72f7c6feb3e.json
diff --git a/...493fffe12970836c2519862598a4eead22f4.json → ...493fffe12970836c2519862598a4eead22f4.json b/...493fffe12970836c2519862598a4eead22f4.json → ...493fffe12970836c2519862598a4eead22f4.json
diff --git a/...1131d5b63a404f1010ca8475afece2a5a908.json → ...1131d5b63a404f1010ca8475afece2a5a908.json b/...1131d5b63a404f1010ca8475afece2a5a908.json → ...1131d5b63a404f1010ca8475afece2a5a908.json
diff --git a/...fa9ed9471adaeb52ff2ab6912e12fe894c69.json → ...fa9ed9471adaeb52ff2ab6912e12fe894c69.json b/...fa9ed9471adaeb52ff2ab6912e12fe894c69.json → ...fa9ed9471adaeb52ff2ab6912e12fe894c69.json
diff --git a/...4954e44863ccf4456860c116b9fd48609249.json → ...4954e44863ccf4456860c116b9fd48609249.json b/...4954e44863ccf4456860c116b9fd48609249.json → ...4954e44863ccf4456860c116b9fd48609249.json
diff --git a/...4499a36294e471ee7fc075d279cb18bbe578.json → ...4499a36294e471ee7fc075d279cb18bbe578.json b/...4499a36294e471ee7fc075d279cb18bbe578.json → ...4499a36294e471ee7fc075d279cb18bbe578.json
diff --git a/...98bc9578b3f292df3cd8397f69e0f500d0a4.json → ...98bc9578b3f292df3cd8397f69e0f500d0a4.json b/...98bc9578b3f292df3cd8397f69e0f500d0a4.json → ...98bc9578b3f292df3cd8397f69e0f500d0a4.json
diff --git a/...4cfbdb483be17fb55da46d7f244e83ba5502.json → ...4cfbdb483be17fb55da46d7f244e83ba5502.json b/...4cfbdb483be17fb55da46d7f244e83ba5502.json → ...4cfbdb483be17fb55da46d7f244e83ba5502.json
diff --git a/...d190d2fa085fcb5c05833e0e04d5d7717036.json → ...d190d2fa085fcb5c05833e0e04d5d7717036.json b/...d190d2fa085fcb5c05833e0e04d5d7717036.json → ...d190d2fa085fcb5c05833e0e04d5d7717036.json
diff --git a/...d5bd86f1096f5211286d9e6e2e800f1833a8.json → ...d5bd86f1096f5211286d9e6e2e800f1833a8.json b/...d5bd86f1096f5211286d9e6e2e800f1833a8.json → ...d5bd86f1096f5211286d9e6e2e800f1833a8.json
diff --git a/...d86dc597914a81ef9b8bdd33d35c59911192.json → ...d86dc597914a81ef9b8bdd33d35c59911192.json b/...d86dc597914a81ef9b8bdd33d35c59911192.json → ...d86dc597914a81ef9b8bdd33d35c59911192.json
diff --git a/...e01784594db5ea8af40c18fd9b2592e1c779.json → ...e01784594db5ea8af40c18fd9b2592e1c779.json b/...e01784594db5ea8af40c18fd9b2592e1c779.json → ...e01784594db5ea8af40c18fd9b2592e1c779.json
diff --git a/proposer/succinct/Cargo.toml → validity/Cargo.toml b/proposer/succinct/Cargo.toml → validity/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "op-succinct-proposer"
+name = "op-succinct-validity"
 version = "0.1.0"
 edition.workspace = true
 license.workspace = true

diff --git a/proposer/succinct/Dockerfile → validity/Dockerfile b/proposer/succinct/Dockerfile → validity/Dockerfile
@@ -20,13 +20,7 @@ RUN curl -L https://sp1.succinct.xyz | bash && \
     ~/.sp1/bin/cargo-prove prove --version
 
 # Copy only what's needed for the build
-COPY Cargo.toml Cargo.lock ./
-COPY proposer/succinct ./proposer/succinct
-COPY fault_proof ./fault_proof
-COPY elf ./elf
-COPY utils ./utils
-COPY programs ./programs
-COPY scripts ./scripts
+COPY . .
 
 # Build the server
 RUN --mount=type=ssh \

diff --git a/proposer/succinct/bin/validity.rs → validity/bin/validity.rs b/proposer/succinct/bin/validity.rs → validity/bin/validity.rs
@@ -1,7 +1,7 @@
 use alloy_provider::{network::EthereumWallet, Provider, ProviderBuilder};
 use anyhow::Result;
 use op_succinct_host_utils::fetcher::OPSuccinctDataFetcher;
-use op_succinct_proposer::{
+use op_succinct_validity::{
     read_proposer_env, setup_proposer_logger, DriverDBClient, Proposer, RequesterConfig,
 };
 use std::sync::Arc;
@@ -82,7 +82,7 @@ async fn main() -> Result<()> {
 
     // Initialize metrics exporter.
     info!("Initializing metrics on port {}", env_config.metrics_port);
-    op_succinct_proposer::init_metrics(&env_config.metrics_port);
+    op_succinct_validity::init_metrics(&env_config.metrics_port);
 
     // Wait for all tasks to complete.
     let proposer_res = proposer_handle.await?;

diff --git a/proposer/succinct/build.rs → validity/build.rs b/proposer/succinct/build.rs → validity/build.rs
diff --git a/proposer/succinct/migrations/01_init.sql → validity/migrations/01_init.sql b/proposer/succinct/migrations/01_init.sql → validity/migrations/01_init.sql
diff --git a/proposer/succinct/src/contract.rs → validity/src/contract.rs b/proposer/succinct/src/contract.rs → validity/src/contract.rs
diff --git a/proposer/succinct/src/db/client.rs → validity/src/db/client.rs b/proposer/succinct/src/db/client.rs → validity/src/db/client.rs
diff --git a/proposer/succinct/src/db/mod.rs → validity/src/db/mod.rs b/proposer/succinct/src/db/mod.rs → validity/src/db/mod.rs
diff --git a/proposer/succinct/src/db/types.rs → validity/src/db/types.rs b/proposer/succinct/src/db/types.rs → validity/src/db/types.rs
diff --git a/proposer/succinct/src/env.rs → validity/src/env.rs b/proposer/succinct/src/env.rs → validity/src/env.rs
diff --git a/proposer/succinct/src/lib.rs → validity/src/lib.rs b/proposer/succinct/src/lib.rs → validity/src/lib.rs
diff --git a/proposer/succinct/src/logger.rs → validity/src/logger.rs b/proposer/succinct/src/logger.rs → validity/src/logger.rs
diff --git a/proposer/succinct/src/prom.rs → validity/src/prom.rs b/proposer/succinct/src/prom.rs → validity/src/prom.rs
diff --git a/proposer/succinct/src/proof_requester.rs → validity/src/proof_requester.rs b/proposer/succinct/src/proof_requester.rs → validity/src/proof_requester.rs
diff --git a/proposer/succinct/src/proposer.rs → validity/src/proposer.rs b/proposer/succinct/src/proposer.rs → validity/src/proposer.rs
diff --git a/proposer/succinct/src/types.rs → validity/src/types.rs b/proposer/succinct/src/types.rs → validity/src/types.rs
diff --git a/proposer/succinct/src/utils.rs → validity/src/utils.rs b/proposer/succinct/src/utils.rs → validity/src/utils.rs