chore: migrate crates/node to use reth-op meta-crate (#169)

> The Cargo.toml file has a lot of reth dependencies, reth recently
added the reth-op crate which re-exports all of the crates behind
feature flags. Try to transition the dependencies of the crates in this
workspace to reth-op enabling the necessary features (node or full and
cli). Similar migrations have been made to the crates in the reth
repository's examples folder, which can be a helpful reference for this
task.
> 
> In addition to that remove unused dependencies from this workspace
dependencies
>
> try to reduce individual reth- crate dependencies in crates/node by
replacing them with a reth_op dependency with the full and cli feature
and update the use statements accordingly so they use the re-exported
types from reth-op.

## Summary

Migrates `crates/node` to use the `reth-op` meta-crate, reducing
individual reth dependencies from 24 to 11.

### Changes:
- Added `reth-op` dependency with `["full", "cli"]` features
- Updated import paths to use reth-op's re-exported modules:
  - `reth_network` → `reth_op::network`
  - `reth_transaction_pool` → `reth_op::pool`
  - `reth_chainspec` → `reth_op::chainspec`
  - `reth_primitives_traits` → `reth_op::primitives`
  - etc.
- Removed 13 individual reth dependencies now accessed through reth-op
- Retained 11 dependencies not fully re-exported by reth-op

All tests pass and the codebase builds successfully.

Author: mattsse

Cargo.lock

@@ -149,7 +149,6 @@ alloy = { version = "1.0.9", features = [
     "signers",
     "reqwest-rustls-tls",
 ], default-features = false }
-alloy-consensus = { version = "1.0.9", default-features = false }
 alloy-eips = { version = "1.0.9", default-features = false }
 alloy-network = { version = "1.0.9", default-features = false }
 alloy-provider = { version = "1.0.9", default-features = false }
@@ -159,30 +158,20 @@ alloy-json-rpc = { version = "1.0.9", default-features = false }
 alloy-rpc-types-eth = { version = "1.0.9", default-features = false }
 alloy-rpc-types-engine = { version = "1.0.9", default-features = false }
 alloy-signer-local = { version = "1.0.9", features = ["mnemonic"] }
-alloy-transport = { version = "1.0.9", default-features = false }
-alloy-transport-http = { version = "1.0.9", default-features = false, features = [
-    "reqwest",
-    "reqwest-rustls-tls",
-] }
 alloy-primitives = { version = "1.1.0", default-features = false }
 
-reqwest = { version = "0.12.9", default-features = false, features = [
-    "rustls-tls",
-] }
-
 # tokio
 tokio = { version = "1.21", default-features = false }
 
-# Updated to Reth 1.4.8
-reth = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
+reth-op = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
+
+# Individual reth crates still needed (not included in reth-op)
 reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-cli = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-errors = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-optimism-node = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
@@ -193,37 +182,18 @@ reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth.git
 reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-provider = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-network = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", version = "1.4.8" }
 
-# alloy-evm - updated to match Reth 1.4.8
-alloy-evm = { version = "0.10", default-features = false }
-alloy-op-evm = { version = "0.10", default-features = false }
-
-# revm-optimism - updated to match Reth 1.4.8
-op-revm = { version = "5.0.0", default-features = false }
-
 # op-alloy - updated to match Reth 1.4.8
 op-alloy-consensus = { version = "0.17.2", default-features = false }
-op-alloy-rpc-types = { version = "0.17.2", default-features = false }
-op-alloy-network = { version = "0.17.2", default-features = false }
-
-# Updated revm to match Reth 1.4.8
-revm = { version = "24.0.1", default-features = false }
-revm-primitives = { version = "19.0.0" }
-revm-interpreter = { version = "20.0.0", default-features = false }
-revm-precompile = { version = "22.0.0", default-features = false, features = ["secp256r1"] }
-revm-inspectors = { version = "0.23.0", default-features = false }
 
 # metrics
 metrics = "0.24.0"
@@ -246,8 +216,6 @@ futures = "0.3"
 url = "2.5"
 parking_lot = "0.12"
 
-# misc-testing
-rstest = "0.18.2"
 
 ## TODO(dan): remove this when reth removes
 #[patch.crates-io]

Cargo.toml

@@ -20,11 +20,12 @@ odyssey-wallet.workspace = true
 odyssey-walltime.workspace = true
 eyre.workspace = true
 tracing.workspace = true
+reth-op = { workspace = true, features = ["node", "cli"] }
 reth-cli-util.workspace = true
 reth-node-builder.workspace = true
+reth-provider.workspace = true
 reth-optimism-node = { workspace = true, features = ["js-tracer"] }
 reth-optimism-cli.workspace = true
-reth-provider.workspace = true
 
 [features]
 default = ["jemalloc"]

bin/odyssey/Cargo.toml

@@ -12,25 +12,20 @@ categories.workspace = true
 [dependencies]
 odyssey-common.workspace = true
 
-reth-primitives-traits.workspace = true
+# Use reth-op with full and cli features to reduce individual dependencies
+reth-op = { workspace = true, features = ["full", "cli"] }
+
+# These still need to be imported separately as they're not fully re-exported by reth-op
 reth-cli.workspace = true
 reth-errors.workspace = true
-reth-node-api.workspace = true
-reth-node-builder.workspace = true
-reth-optimism-node.workspace = true
-reth-optimism-forks.workspace = true
-reth-optimism-chainspec.workspace = true
-reth-optimism-primitives.workspace = true
-reth-optimism-payload-builder.workspace = true
-reth-optimism-rpc.workspace = true
-reth-chainspec.workspace = true
 reth-rpc-eth-api.workspace = true
 reth-rpc-eth-types.workspace = true
-reth-transaction-pool.workspace = true
 reth-trie-common.workspace = true
 reth-trie-db.workspace = true
-reth-network.workspace = true
+reth-optimism-forks.workspace = true
 reth-network-types.workspace = true
+reth-optimism-payload-builder.workspace = true
+reth-optimism-rpc.workspace = true
 reth-chain-state.workspace = true
 
 alloy-eips.workspace = true

crates/node/Cargo.toml

@@ -1,8 +1,10 @@
 //! Sponsor periodic broadcaster
 
 use alloy_primitives::Address;
-use reth_network::{transactions::TransactionsHandle, NetworkPrimitives};
-use reth_transaction_pool::TransactionPool;
+use reth_op::{
+    network::{transactions::TransactionsHandle, NetworkPrimitives},
+    pool::TransactionPool,
+};
 use std::time::Duration;
 
 /// Periodically broadcasts sponsored transactions from the transaction pool.

crates/node/src/broadcaster.rs

@@ -1,13 +1,15 @@
 //! Odyssey chainspec parsing logic.
 use alloy_primitives::U256;
-use reth_chainspec::{
-    BaseFeeParams, BaseFeeParamsKind, Chain, ChainHardforks, ChainSpec, EthereumHardfork,
-    ForkCondition, Hardfork, NamedChain,
+use reth_op::{
+    chainspec::{
+        make_op_genesis_header, BaseFeeParams, BaseFeeParamsKind, Chain, ChainHardforks, ChainSpec,
+        EthereumHardfork, ForkCondition, Hardfork, NamedChain, OpChainSpec,
+    },
+    primitives::SealedHeader,
 };
+// OpHardfork needs to be imported directly
 use reth_cli::chainspec::{parse_genesis, ChainSpecParser};
-use reth_optimism_chainspec::{make_op_genesis_header, OpChainSpec};
 use reth_optimism_forks::OpHardfork;
-use reth_primitives_traits::SealedHeader;
 use std::sync::{Arc, LazyLock};
 
 /// Odyssey forks.
@@ -111,8 +113,8 @@ mod tests {
     use std::path::PathBuf;
 
     use super::OdysseyChainSpecParser;
-    use reth_chainspec::EthereumHardforks;
     use reth_cli::chainspec::ChainSpecParser;
+    use reth_op::chainspec::EthereumHardforks;
     use reth_optimism_forks::OpHardforks;
 
     #[test]

crates/node/src/chainspec.rs

@@ -8,7 +8,7 @@ use jsonrpsee::{
 };
 use parking_lot::Mutex;
 use reth_chain_state::CanonStateNotification;
-use reth_optimism_primitives::OpPrimitives;
+use reth_op::OpPrimitives;
 use serde::de::Error;
 use serde_json::value::RawValue;
 use std::{

crates/node/src/delayed_resolve.rs

@@ -2,8 +2,10 @@
 
 use alloy_eips::eip2718::Decodable2718;
 use alloy_primitives::Bytes;
-use reth_network::{transactions::TransactionsHandle, NetworkPrimitives};
-use reth_primitives_traits::transaction::signed::SignedTransaction;
+use reth_op::{
+    network::{transactions::TransactionsHandle, NetworkPrimitives},
+    primitives::transaction::signed::SignedTransaction,
+};
 use tokio::sync::broadcast::Receiver;
 use tracing::trace;
 

crates/node/src/forwarder.rs

@@ -3,8 +3,8 @@
 //! This contains mainly the [`OdysseyNode`](node::OdysseyNode) type.
 //!
 //! The [`OdysseyNode`](node::OdysseyNode) type implements the
-//! [`NodeTypes`](reth_node_builder::NodeTypes) trait, and configures the engine types required for
-//! the optimism engine API.
+//! [`NodeTypes`](reth_op::node::builder::NodeTypes) trait, and configures the engine types required
+//! for the optimism engine API.
 
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 #![warn(unused_crate_dependencies)]

crates/node/src/lib.rs

@@ -4,36 +4,38 @@
 //! required for the optimism engine API.
 
 use op_alloy_consensus::OpPooledTransaction;
-use reth_network::{
-    transactions::{
-        config::TransactionPropagationKind, TransactionPropagationMode, TransactionsManagerConfig,
-    },
-    NetworkHandle, NetworkManager, PeersInfo,
-};
 use reth_network_types::ReputationChangeWeights;
-use reth_node_api::{FullNodeTypes, TxTy};
-use reth_node_builder::{
-    components::{
-        BasicPayloadServiceBuilder, ComponentsBuilder, NetworkBuilder, PoolBuilderConfigOverrides,
+use reth_op::{
+    chainspec::OpChainSpec,
+    network::{
+        transactions::{
+            config::TransactionPropagationKind, TransactionPropagationMode,
+            TransactionsManagerConfig,
+        },
+        NetworkHandle, NetworkManager, PeersInfo,
     },
-    BuilderContext, Node, NodeAdapter, NodeComponentsBuilder, NodeTypes,
-};
-use reth_optimism_chainspec::OpChainSpec;
-use reth_optimism_node::{
-    args::RollupArgs,
     node::{
-        OpAddOns, OpConsensusBuilder, OpExecutorBuilder, OpNetworkBuilder, OpPayloadBuilder,
-        OpPoolBuilder,
+        api::{FullNodeTypes, TxTy},
+        args::RollupArgs,
+        builder::{
+            components::{
+                BasicPayloadServiceBuilder, ComponentsBuilder, NetworkBuilder,
+                PoolBuilderConfigOverrides,
+            },
+            BuilderContext, Node, NodeAdapter, NodeComponentsBuilder, NodeTypes,
+        },
+        node::{
+            OpAddOns, OpConsensusBuilder, OpExecutorBuilder, OpNetworkBuilder, OpPayloadBuilder,
+            OpPoolBuilder,
+        },
+        rpc::OpEngineApiBuilder,
+        OpEngineTypes, OpEngineValidatorBuilder, OpNetworkPrimitives, OpStorage,
     },
-    rpc::OpEngineApiBuilder,
-    OpEngineTypes, OpEngineValidatorBuilder, OpNetworkPrimitives, OpStorage,
+    pool::{PoolTransaction, SubPoolLimit, TransactionPool, TXPOOL_MAX_ACCOUNT_SLOTS_PER_SENDER},
+    OpPrimitives,
 };
 use reth_optimism_payload_builder::config::OpDAConfig;
-use reth_optimism_primitives::OpPrimitives;
 use reth_optimism_rpc::eth::OpEthApiBuilder;
-use reth_transaction_pool::{
-    PoolTransaction, SubPoolLimit, TransactionPool, TXPOOL_MAX_ACCOUNT_SLOTS_PER_SENDER,
-};
 use reth_trie_db::MerklePatriciaTrie;
 use std::time::Duration;
 use tracing::info;