From f14181602b92a3b2f9fa90765d6365f9eb71daa0 Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Thu, 13 Nov 2025 11:15:43 -0800
Subject: [PATCH 1/7] feat: add `initialize-op-proofs` command

---
 Cargo.lock                                    |  1 +
 crates/optimism/cli/Cargo.toml                | 27 +++---
 crates/optimism/cli/src/app.rs                |  3 +
 .../cli/src/commands/initialize_proofs.rs     | 96 +++++++++++++++++++
 crates/optimism/cli/src/commands/mod.rs       |  5 +
 crates/optimism/exex/Cargo.toml               |  8 +-
 crates/optimism/exex/src/lib.rs               | 14 ++-
 7 files changed, 132 insertions(+), 22 deletions(-)
 create mode 100644 crates/optimism/cli/src/commands/initialize_proofs.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0f7d0711255..ffdec4a29e9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9483,6 +9483,7 @@ dependencies = [
  "reth-optimism-evm",
  "reth-optimism-node",
  "reth-optimism-primitives",
+ "reth-optimism-trie",
  "reth-primitives-traits",
  "reth-provider",
  "reth-prune",
diff --git a/crates/optimism/cli/Cargo.toml b/crates/optimism/cli/Cargo.toml
index bdb680b2062..21159a76908 100644
--- a/crates/optimism/cli/Cargo.toml
+++ b/crates/optimism/cli/Cargo.toml
@@ -35,8 +35,11 @@ reth-node-metrics.workspace = true
 
 ## optimism
 reth-optimism-primitives.workspace = true
-reth-optimism-chainspec = { workspace = true, features = ["superchain-configs"] }
+reth-optimism-chainspec = { workspace = true, features = [
+    "superchain-configs",
+] }
 reth-optimism-consensus.workspace = true
+reth-optimism-trie.workspace = true
 
 reth-chainspec.workspace = true
 reth-node-events.workspace = true
@@ -57,7 +60,12 @@ derive_more.workspace = true
 serde.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 
-tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
+tokio = { workspace = true, features = [
+    "sync",
+    "macros",
+    "time",
+    "rt-multi-thread",
+] }
 tokio-util = { workspace = true, features = ["codec"] }
 tracing.workspace = true
 eyre.workspace = true
@@ -71,7 +79,10 @@ tempfile.workspace = true
 reth-stages = { workspace = true, features = ["test-utils"] }
 
 [build-dependencies]
-reth-optimism-chainspec = { workspace = true, features = ["std", "superchain-configs"] }
+reth-optimism-chainspec = { workspace = true, features = [
+    "std",
+    "superchain-configs",
+] }
 
 [features]
 default = []
@@ -86,15 +97,9 @@ asm-keccak = [
 ]
 
 # Jemalloc feature for vergen to generate correct env vars
-jemalloc = [
-    "reth-node-core/jemalloc",
-    "reth-node-metrics/jemalloc",
-]
+jemalloc = ["reth-node-core/jemalloc", "reth-node-metrics/jemalloc"]
 
-dev = [
-    "dep:proptest",
-    "reth-cli-commands/arbitrary",
-]
+dev = ["dep:proptest", "reth-cli-commands/arbitrary"]
 
 serde = [
     "alloy-consensus/serde",
diff --git a/crates/optimism/cli/src/app.rs b/crates/optimism/cli/src/app.rs
index 34048b3d943..e0c31995955 100644
--- a/crates/optimism/cli/src/app.rs
+++ b/crates/optimism/cli/src/app.rs
@@ -110,6 +110,9 @@ where
             Commands::ReExecute(command) => {
                 runner.run_until_ctrl_c(command.execute::<OpNode>(components))
             }
+            Commands::InitializeOpProofs(command) => {
+                runner.run_blocking_until_ctrl_c(command.execute::<OpNode>())
+            }
         }
     }
 
diff --git a/crates/optimism/cli/src/commands/initialize_proofs.rs b/crates/optimism/cli/src/commands/initialize_proofs.rs
new file mode 100644
index 00000000000..a00a03747da
--- /dev/null
+++ b/crates/optimism/cli/src/commands/initialize_proofs.rs
@@ -0,0 +1,96 @@
+//! Command that initializes the OP proofs storage with the current state of the chain.
+
+use clap::Parser;
+use reth_chainspec::ChainInfo;
+use reth_cli::chainspec::ChainSpecParser;
+use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
+use reth_node_core::version::version_metadata;
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_primitives::OpPrimitives;
+use reth_optimism_trie::{db::MdbxProofsStorage, BackfillJob, OpProofsStorage, OpProofsStore};
+use reth_provider::{BlockNumReader, DBProvider, DatabaseProviderFactory};
+use std::{path::PathBuf, sync::Arc};
+use tracing::info;
+
+/// Initializes the proofs storage with the current state of the chain.
+///
+/// This command must be run before starting the node with proofs history enabled.
+/// It backfills the proofs storage with trie nodes from the current chain state.
+#[derive(Debug, Parser)]
+pub struct InitializeOpProofsCommand<C: ChainSpecParser> {
+    #[command(flatten)]
+    env: EnvironmentArgs<C>,
+
+    /// The path to the storage DB for proofs history.
+    ///
+    /// This should match the path used when starting the node with
+    /// `--proofs-history.storage-path`.
+    #[arg(long = "storage-path", value_name = "PROOFS_HISTORY_STORAGE_PATH", required = true)]
+    pub storage_path: PathBuf,
+}
+
+impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> InitializeOpProofsCommand<C> {
+    /// Execute `initialize-op-proofs` command
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec, Primitives = OpPrimitives>>(
+        self,
+    ) -> eyre::Result<()> {
+        info!(target: "reth::cli", "reth {} starting", version_metadata().short_version);
+        info!(target: "reth::cli", "Initializing OP proofs storage at: {:?}", self.storage_path);
+
+        // Initialize the environment with read-only access
+        let Environment { provider_factory, .. } = self.env.init::<N>(AccessRights::RO)?;
+
+        // Create the proofs storage
+        let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = Arc::new(
+            MdbxProofsStorage::new(&self.storage_path)
+                .map_err(|e| eyre::eyre!("Failed to create MdbxProofsStorage: {e}"))?,
+        )
+        .into();
+
+        // Check if already initialized
+        if let Some((block_number, block_hash)) = storage.get_earliest_block_number().await? {
+            info!(
+                target: "reth::cli",
+                block_number = block_number,
+                block_hash = ?block_hash,
+                "Proofs storage already initialized"
+            );
+            return Ok(());
+        }
+
+        // Get the current chain state
+        let ChainInfo { best_number, best_hash, .. } = provider_factory.chain_info()?;
+
+        info!(
+            target: "reth::cli",
+            best_number = best_number,
+            best_hash = ?best_hash,
+            "Starting backfill job for current chain state"
+        );
+
+        // Run the backfill job
+        {
+            let db_provider =
+                provider_factory.database_provider_ro()?.disable_long_read_transaction_safety();
+            let db_tx = db_provider.into_tx();
+
+            BackfillJob::new(storage.clone(), &db_tx).run(best_number, best_hash).await?;
+        }
+
+        info!(
+            target: "reth::cli",
+            best_number = best_number,
+            best_hash = ?best_hash,
+            "Proofs storage initialized successfully"
+        );
+
+        Ok(())
+    }
+}
+
+impl<C: ChainSpecParser> InitializeOpProofsCommand<C> {
+    /// Returns the underlying chain being used to run this command
+    pub const fn chain_spec(&self) -> Option<&Arc<C::ChainSpec>> {
+        Some(&self.env.chain)
+    }
+}
diff --git a/crates/optimism/cli/src/commands/mod.rs b/crates/optimism/cli/src/commands/mod.rs
index 5edd55b0ccb..c3958a18b19 100644
--- a/crates/optimism/cli/src/commands/mod.rs
+++ b/crates/optimism/cli/src/commands/mod.rs
@@ -14,6 +14,7 @@ use std::{fmt, sync::Arc};
 pub mod import;
 pub mod import_receipts;
 pub mod init_state;
+pub mod initialize_proofs;
 
 #[cfg(feature = "dev")]
 pub mod test_vectors;
@@ -61,6 +62,9 @@ pub enum Commands<Spec: ChainSpecParser = OpChainSpecParser, Ext: clap::Args + f
     /// Re-execute blocks in parallel to verify historical sync correctness.
     #[command(name = "re-execute")]
     ReExecute(re_execute::Command<Spec>),
+    /// Initializes the proofs storage with the current state of the chain.
+    #[command(name = "initialize-op-proofs")]
+    InitializeOpProofs(initialize_proofs::InitializeOpProofsCommand<Spec>),
 }
 
 impl<
@@ -85,6 +89,7 @@ impl<
             #[cfg(feature = "dev")]
             Self::TestVectors(_) => None,
             Self::ReExecute(cmd) => cmd.chain_spec(),
+            Self::InitializeOpProofs(cmd) => cmd.chain_spec(),
         }
     }
 }
diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml
index deaaeb2f5a1..fae15eddeac 100644
--- a/crates/optimism/exex/Cargo.toml
+++ b/crates/optimism/exex/Cargo.toml
@@ -16,8 +16,6 @@ workspace = true
 reth-exex.workspace = true
 reth-node-types.workspace = true
 reth-node-api.workspace = true
-reth-provider.workspace = true
-reth-chainspec.workspace = true
 reth-primitives-traits.workspace = true
 
 # op-reth
@@ -34,7 +32,11 @@ derive_more.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["test-util", "rt-multi-thread", "macros"] }
+tokio = { workspace = true, features = [
+    "test-util",
+    "rt-multi-thread",
+    "macros",
+] }
 futures.workspace = true
 reth-db = { workspace = true, features = ["op", "test-utils"] }
 reth-node-builder.workspace = true
diff --git a/crates/optimism/exex/src/lib.rs b/crates/optimism/exex/src/lib.rs
index 123b5726d9c..9e00b954dbb 100644
--- a/crates/optimism/exex/src/lib.rs
+++ b/crates/optimism/exex/src/lib.rs
@@ -11,11 +11,10 @@
 use alloy_consensus::BlockHeader;
 use derive_more::Constructor;
 use futures_util::TryStreamExt;
-use reth_chainspec::ChainInfo;
 use reth_exex::{ExExContext, ExExEvent, ExExNotification};
 use reth_node_api::{FullNodeComponents, NodePrimitives};
 use reth_node_types::NodeTypes;
-use reth_optimism_trie::{live::LiveTrieCollector, BackfillJob, OpProofsStorage, OpProofsStore};
+use reth_optimism_trie::{live::LiveTrieCollector, OpProofsStorage, OpProofsStore};
 use reth_primitives_traits::{BlockTy, RecoveredBlock};
 use reth_provider::{
     BlockNumReader, BlockReader, DBProvider, DatabaseProviderFactory, TransactionVariant,
@@ -101,12 +100,11 @@ where
 {
     /// Main execution loop for the ExEx
     pub async fn run(mut self) -> eyre::Result<()> {
-        {
-            let db_provider =
-                self.ctx.provider().database_provider_ro()?.disable_long_read_transaction_safety();
-            let db_tx = db_provider.into_tx();
-            let ChainInfo { best_number, best_hash } = self.ctx.provider().chain_info()?;
-            BackfillJob::new(self.storage.clone(), &db_tx).run(best_number, best_hash).await?;
+        // Check if proofs storage is initialized
+        if self.storage.get_earliest_block_number().await?.is_none() {
+            return Err(eyre::eyre!(
+                "Proofs storage not initialized. Please run 'op-reth initialize-op-proofs --storage-path <PATH>' first."
+            ));
         }
 
         let collector = LiveTrieCollector::new(

From e80e3e2a9a6d10ea8274043035c80eb61aab4e8b Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Thu, 13 Nov 2025 11:18:35 -0800
Subject: [PATCH 2/7] fix cargo toml format

---
 crates/optimism/cli/Cargo.toml  | 16 +++-------------
 crates/optimism/exex/Cargo.toml |  6 +-----
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/crates/optimism/cli/Cargo.toml b/crates/optimism/cli/Cargo.toml
index 21159a76908..bfc5a81c813 100644
--- a/crates/optimism/cli/Cargo.toml
+++ b/crates/optimism/cli/Cargo.toml
@@ -35,9 +35,7 @@ reth-node-metrics.workspace = true
 
 ## optimism
 reth-optimism-primitives.workspace = true
-reth-optimism-chainspec = { workspace = true, features = [
-    "superchain-configs",
-] }
+reth-optimism-chainspec = { workspace = true, features = ["superchain-configs"] }
 reth-optimism-consensus.workspace = true
 reth-optimism-trie.workspace = true
 
@@ -60,12 +58,7 @@ derive_more.workspace = true
 serde.workspace = true
 clap = { workspace = true, features = ["derive", "env"] }
 
-tokio = { workspace = true, features = [
-    "sync",
-    "macros",
-    "time",
-    "rt-multi-thread",
-] }
+tokio = { workspace = true, features = ["sync", "macros", "time", "rt-multi-thread"] }
 tokio-util = { workspace = true, features = ["codec"] }
 tracing.workspace = true
 eyre.workspace = true
@@ -79,10 +72,7 @@ tempfile.workspace = true
 reth-stages = { workspace = true, features = ["test-utils"] }
 
 [build-dependencies]
-reth-optimism-chainspec = { workspace = true, features = [
-    "std",
-    "superchain-configs",
-] }
+reth-optimism-chainspec = { workspace = true, features = ["std", "superchain-configs"] }
 
 [features]
 default = []
diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml
index fae15eddeac..7927104bb0a 100644
--- a/crates/optimism/exex/Cargo.toml
+++ b/crates/optimism/exex/Cargo.toml
@@ -32,11 +32,7 @@ derive_more.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
-tokio = { workspace = true, features = [
-    "test-util",
-    "rt-multi-thread",
-    "macros",
-] }
+tokio = { workspace = true, features = ["test-util", "rt-multi-thread", "macros"] }
 futures.workspace = true
 reth-db = { workspace = true, features = ["op", "test-utils"] }
 reth-node-builder.workspace = true

From 53ac8d8a2ddd0ff6417b0db01de529259b9b5e46 Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Thu, 13 Nov 2025 11:19:30 -0800
Subject: [PATCH 3/7] fix dep err

---
 Cargo.lock                      | 2 --
 crates/optimism/exex/Cargo.toml | 2 --
 2 files changed, 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ffdec4a29e9..f2eaa2ebc51 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9568,7 +9568,6 @@ dependencies = [
  "eyre",
  "futures",
  "futures-util",
- "reth-chainspec",
  "reth-db",
  "reth-exex",
  "reth-node-api",
@@ -9578,7 +9577,6 @@ dependencies = [
  "reth-optimism-node",
  "reth-optimism-trie",
  "reth-primitives-traits",
- "reth-provider",
  "tempfile",
  "tokio",
  "tracing",
diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml
index 7927104bb0a..26e8082102f 100644
--- a/crates/optimism/exex/Cargo.toml
+++ b/crates/optimism/exex/Cargo.toml
@@ -42,9 +42,7 @@ tempfile.workspace = true
 
 [features]
 test-utils = [
-    "reth-provider/test-utils",
     "reth-db/test-utils",
-    "reth-chainspec/test-utils",
     "reth-node-builder/test-utils",
     "reth-optimism-node/test-utils",
     "reth-primitives-traits/test-utils",

From 3decfb4325d332d18678c438126ec4ffb2c402df Mon Sep 17 00:00:00 2001
From: Julian Meyer <julian.meyer@coinbase.com>
Date: Thu, 13 Nov 2025 19:32:46 +0000
Subject: [PATCH 4/7] update CLI name

---
 crates/optimism/cli/src/commands/initialize_proofs.rs | 6 +++++-
 crates/optimism/exex/src/lib.rs                       | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/crates/optimism/cli/src/commands/initialize_proofs.rs b/crates/optimism/cli/src/commands/initialize_proofs.rs
index a00a03747da..e81e84f9dcc 100644
--- a/crates/optimism/cli/src/commands/initialize_proofs.rs
+++ b/crates/optimism/cli/src/commands/initialize_proofs.rs
@@ -25,7 +25,11 @@ pub struct InitializeOpProofsCommand<C: ChainSpecParser> {
     ///
     /// This should match the path used when starting the node with
     /// `--proofs-history.storage-path`.
-    #[arg(long = "storage-path", value_name = "PROOFS_HISTORY_STORAGE_PATH", required = true)]
+    #[arg(
+        long = "proofs-history.storage-path",
+        value_name = "PROOFS_HISTORY_STORAGE_PATH",
+        required = true
+    )]
     pub storage_path: PathBuf,
 }
 
diff --git a/crates/optimism/exex/src/lib.rs b/crates/optimism/exex/src/lib.rs
index 9e00b954dbb..1de70a41383 100644
--- a/crates/optimism/exex/src/lib.rs
+++ b/crates/optimism/exex/src/lib.rs
@@ -103,7 +103,7 @@ where
         // Check if proofs storage is initialized
         if self.storage.get_earliest_block_number().await?.is_none() {
             return Err(eyre::eyre!(
-                "Proofs storage not initialized. Please run 'op-reth initialize-op-proofs --storage-path <PATH>' first."
+                "Proofs storage not initialized. Please run 'op-reth initialize-op-proofs --proofs-history.storage-path <PATH>' first."
             ));
         }
 

From 842a2ee54bed293193dba11d2db1b8f0c7c2c55c Mon Sep 17 00:00:00 2001
From: Emilia Hane <elsaemiliaevahane@gmail.com>
Date: Tue, 25 Nov 2025 12:38:13 +0100
Subject: [PATCH 5/7] Fix conflicts with upstream

---
 Cargo.lock                      | 1 +
 crates/optimism/exex/Cargo.toml | 1 +
 crates/optimism/exex/src/lib.rs | 4 +---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f2eaa2ebc51..5a213b0adf3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9577,6 +9577,7 @@ dependencies = [
  "reth-optimism-node",
  "reth-optimism-trie",
  "reth-primitives-traits",
+ "reth-provider",
  "tempfile",
  "tokio",
  "tracing",
diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml
index 26e8082102f..e1e899d1f47 100644
--- a/crates/optimism/exex/Cargo.toml
+++ b/crates/optimism/exex/Cargo.toml
@@ -17,6 +17,7 @@ reth-exex.workspace = true
 reth-node-types.workspace = true
 reth-node-api.workspace = true
 reth-primitives-traits.workspace = true
+reth-provider.workspace = true
 
 # op-reth
 # proofs exex handles `TrieUpdates` in notifications
diff --git a/crates/optimism/exex/src/lib.rs b/crates/optimism/exex/src/lib.rs
index 1de70a41383..164ac1a98e9 100644
--- a/crates/optimism/exex/src/lib.rs
+++ b/crates/optimism/exex/src/lib.rs
@@ -16,9 +16,7 @@ use reth_node_api::{FullNodeComponents, NodePrimitives};
 use reth_node_types::NodeTypes;
 use reth_optimism_trie::{live::LiveTrieCollector, OpProofsStorage, OpProofsStore};
 use reth_primitives_traits::{BlockTy, RecoveredBlock};
-use reth_provider::{
-    BlockNumReader, BlockReader, DBProvider, DatabaseProviderFactory, TransactionVariant,
-};
+use reth_provider::{BlockReader, TransactionVariant};
 use tracing::{debug, error, info};
 
 /// OP Proofs ExEx - processes blocks and tracks state changes within fault proof window.

From 11ae36ece0f199b3bf0f9bef414b230cdf50f557 Mon Sep 17 00:00:00 2001
From: Emilia Hane <elsaemiliaevahane@gmail.com>
Date: Tue, 25 Nov 2025 13:44:43 +0100
Subject: [PATCH 6/7] Fix feature prop

---
 crates/optimism/exex/Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/optimism/exex/Cargo.toml b/crates/optimism/exex/Cargo.toml
index e1e899d1f47..12a967f37a2 100644
--- a/crates/optimism/exex/Cargo.toml
+++ b/crates/optimism/exex/Cargo.toml
@@ -47,6 +47,7 @@ test-utils = [
     "reth-node-builder/test-utils",
     "reth-optimism-node/test-utils",
     "reth-primitives-traits/test-utils",
+    "reth-provider/test-utils",
 ]
 
 [package.metadata.cargo-udeps.ignore]

From 41950b21c881ad3392a0e6933a493b087681d96f Mon Sep 17 00:00:00 2001
From: Arun Dhyani <dhyaniarun7@gmail.com>
Date: Wed, 26 Nov 2025 16:28:05 +0530
Subject: [PATCH 7/7] feat: integrate `initialize-op-proofs` to devnet

---
 DockerfileOpProof                             | 48 ++++++++++++
 crates/optimism/tests/Makefile                |  2 +-
 .../tests/scripts/op-reth-entrypoint.sh       | 74 +++++++++++++++++++
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 DockerfileOpProof
 create mode 100644 crates/optimism/tests/scripts/op-reth-entrypoint.sh

diff --git a/DockerfileOpProof b/DockerfileOpProof
new file mode 100644
index 00000000000..0fedaff5ab7
--- /dev/null
+++ b/DockerfileOpProof
@@ -0,0 +1,48 @@
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
+WORKDIR /app
+
+LABEL org.opencontainers.image.source=https://github.com/paradigmxyz/reth
+LABEL org.opencontainers.image.licenses="MIT OR Apache-2.0"
+
+RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config
+
+# Builds a cargo-chef plan
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+
+ARG BUILD_PROFILE=release
+ENV BUILD_PROFILE=$BUILD_PROFILE
+
+ARG RUSTFLAGS=""
+ENV RUSTFLAGS="$RUSTFLAGS"
+
+ARG FEATURES=""
+ENV FEATURES=$FEATURES
+
+RUN cargo chef cook --profile $BUILD_PROFILE --features "$FEATURES" --recipe-path recipe.json --manifest-path /app/crates/optimism/bin/Cargo.toml
+
+COPY . .
+RUN cargo build --profile $BUILD_PROFILE --features "$FEATURES" --bin op-reth --manifest-path /app/crates/optimism/bin/Cargo.toml
+
+RUN ls -la /app/target/$BUILD_PROFILE/op-reth
+RUN cp /app/target/$BUILD_PROFILE/op-reth /app/op-reth
+
+FROM ubuntu AS runtime
+
+RUN apt-get update && \
+    apt-get install -y ca-certificates libssl-dev pkg-config strace && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY --from=builder /app/op-reth /usr/local/bin/
+RUN chmod +x /usr/local/bin/op-reth
+COPY crates/optimism/tests/scripts/op-reth-entrypoint.sh /usr/local/bin/op-reth-entrypoint.sh
+RUN chmod +x /usr/local/bin/op-reth-entrypoint.sh
+COPY LICENSE-* ./
+
+EXPOSE 30303 30303/udp 9001 8545 8546 7545 8551
+ENTRYPOINT ["/usr/local/bin/op-reth-entrypoint.sh"]
diff --git a/crates/optimism/tests/Makefile b/crates/optimism/tests/Makefile
index 3122062be93..b6419f9cfb1 100644
--- a/crates/optimism/tests/Makefile
+++ b/crates/optimism/tests/Makefile
@@ -1,7 +1,7 @@
 # Variables
 DOCKER_IMAGE_NAME := op-reth
 DOCKER_TAG := local
-DOCKERFILE_PATH := ../../../DockerfileOp
+DOCKERFILE_PATH := ../../../DockerfileOpProof
 KURTOSIS_PACKAGE := github.com/ethpandaops/optimism-package@998796c0f3bb478d63d729e65f0b76e24112e00d
 DEVNET ?= opgeth-seq-opreth-val
 GO_PKG_NAME ?= proofs/core
diff --git a/crates/optimism/tests/scripts/op-reth-entrypoint.sh b/crates/optimism/tests/scripts/op-reth-entrypoint.sh
new file mode 100644
index 00000000000..b316244595d
--- /dev/null
+++ b/crates/optimism/tests/scripts/op-reth-entrypoint.sh
@@ -0,0 +1,74 @@
+#!/bin/sh
+set -e
+
+# Variables to extract
+DATADIR=""
+PROOFS_PATH=""
+CHAIN=""
+
+# Helper: require a value after flag
+require_value() {
+  if [ -z "$2" ] || printf "%s" "$2" | grep -q "^--"; then
+    echo "ERROR: Missing value for $1" >&2
+    exit 1
+  fi
+}
+
+# Parse arguments
+i=1
+while [ "$i" -le "$#" ]; do
+  eval arg="\${$i}"
+
+  case "$arg" in
+    --datadir=*)
+      DATADIR="${arg#*=}"
+      ;;
+
+    --datadir)
+      eval next="\${$((i+1))}"
+      require_value "$arg" "$next"
+      DATADIR="$next"
+      i=$((i+1))
+      ;;
+
+    --proofs-history.storage-path=*)
+      PROOFS_PATH="${arg#*=}"
+      ;;
+
+    --proofs-history.storage-path)
+      eval next="\${$((i+1))}"
+      require_value "$arg" "$next"
+      PROOFS_PATH="$next"
+      i=$((i+1))
+      ;;
+
+    --chain=*)
+      CHAIN="${arg#*=}"
+      ;;
+
+    --chain)
+      eval next="\${$((i+1))}"
+      require_value "$arg" "$next"
+      CHAIN="$next"
+      i=$((i+1))
+      ;;
+
+    *)
+      # ignore unknown args—OR log them
+      ;;
+  esac
+
+  i=$((i+1))
+done
+
+# Log extracted values
+echo "extracted --datadir: ${DATADIR:-<not-set>}"
+echo "extracted --proofs-history.storage-path: ${PROOFS_PATH:-<not-set>}"
+echo "extracted --chain: ${CHAIN:-<not-set>}"
+
+echo "Initializing op-reth"
+op-reth init --datadir="$DATADIR" --chain="$CHAIN"
+echo "Initializing op-reth proofs"
+op-reth initialize-op-proofs --datadir="$DATADIR" --proofs-history.storage-path="$PROOFS_PATH"
+echo "Starting op-reth with args: $*"
+op-reth "$@"