incremental progress

paradigmxyz · Jul 8, 2024 · a163243 · a163243
1 parent 4f5dcc5
commit a163243
Show file tree

Hide file tree

Showing 11 changed files with 255 additions and 218 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/cli/cli/Cargo.toml b/crates/cli/cli/Cargo.toml
@@ -16,19 +16,9 @@ workspace = true
 reth-cli-runner.workspace = true
 reth-chainspec.workspace = true
 
-# eth
-alloy-genesis.workspace = true
-
-
 # misc
 clap.workspace = true
-shellexpand.workspace = true
-serde_json.workspace = true
 eyre.workspace = true
 
-[features]
-optimism = [
-    "reth-chainspec/optimism",
-]
 
 
diff --git a/crates/cli/cli/src/chainspec/mod.rs → crates/cli/cli/src/chainspec.rs b/crates/cli/cli/src/chainspec/mod.rs → crates/cli/cli/src/chainspec.rs
@@ -2,14 +2,6 @@ use clap::builder::TypedValueParser;
 use reth_chainspec::ChainSpec;
 use std::sync::Arc;
 
-/// Ethereum chain specification parser.
-#[cfg(not(feature = "optimism"))]
-pub mod eth;
-
-/// Optimism chain specification parser.
-#[cfg(feature = "optimism")]
-pub mod optimism;
-
 /// Trait for parsing chain specifications.
 ///
 /// This trait extends [`clap::builder::TypedValueParser`] to provide a parser for chain

diff --git a/crates/cli/cli/src/chainspec/eth.rs b/crates/cli/cli/src/chainspec/eth.rs
diff --git a/crates/cli/cli/src/chainspec/optimism.rs b/crates/cli/cli/src/chainspec/optimism.rs
diff --git a/crates/ethereum/cli/Cargo.toml b/crates/ethereum/cli/Cargo.toml
@@ -8,3 +8,16 @@ homepage.workspace = true
 repository.workspace = true
 
 [lints]
+workspace = true
+
+[dependencies]
+reth-cli.workspace = true
+reth-chainspec.workspace = true
+
+alloy-genesis.workspace = true
+
+eyre.workspace = true
+
+shellexpand.workspace = true
+serde_json.workspace = true
+clap = { workspace = true, features = ["derive", "env"] }