Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: validity, fault-proof #424

Merged
merged 4 commits into from
Mar 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/target
/data
/execution-reports
/execution-reports
/book
/audits
.github
2 changes: 1 addition & 1 deletion .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ on:
- "programs/**"
- "scripts/**"
- "utils/**"
- "proposer/succinct/**"
- "fault-proof/**"
- "validity/**"
- "Cargo.toml"
merge_group:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sqlx-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
56 changes: 28 additions & 28 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ members = [
"utils/*",
"programs/*",
"scripts/*",
"proposer/succinct",
"fault_proof",
"validity",
"fault-proof",
]
resolver = "2"

Expand Down Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ services:
op-succinct:
build:
context: .
dockerfile: ./proposer/succinct/Dockerfile
dockerfile: ./validity/Dockerfile
env_file:
- ${ENV_FILE:-.env}
restart: unless-stopped
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion proposer/succinct/Cargo.toml → validity/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "op-succinct-proposer"
name = "op-succinct-validity"
version = "0.1.0"
edition.workspace = true
license.workspace = true
Expand Down
8 changes: 1 addition & 7 deletions proposer/succinct/Dockerfile → validity/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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?;
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading