chore(op): unify crate name reth-optimism-* (#11223)

.github/assets/check_wasm.sh

@@ -35,7 +35,6 @@ exclude_crates=(
   reth-ethereum-payload-builder
   reth-etl
   reth-evm-ethereum
-  reth-evm-optimism
   reth-execution-errors
   reth-exex
   reth-exex-test-utils
@@ -49,8 +48,9 @@ exclude_crates=(
   reth-node-ethereum
   reth-node-events
   reth-node-metrics
-  reth-node-optimism
   reth-optimism-cli
+  reth-optimism-evm
+  reth-optimism-node
   reth-optimism-payload-builder
   reth-optimism-rpc
   reth-payload-builder

.github/workflows/integration.yml

@@ -47,7 +47,7 @@ jobs:
         name: Run tests
         run: |
           cargo nextest run \
-            --locked -p reth-node-optimism --features "optimism"
+            --locked -p reth-optimism-node --features "optimism"
 
   integration-success:
     name: integration success

Cargo.toml

@@ -333,7 +333,7 @@ reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }
 reth-evm-ethereum = { path = "crates/ethereum/evm" }
-reth-evm-optimism = { path = "crates/optimism/evm" }
+reth-optimism-evm = { path = "crates/optimism/evm" }
 reth-execution-errors = { path = "crates/evm/execution-errors" }
 reth-execution-types = { path = "crates/evm/execution-types" }
 reth-exex = { path = "crates/exex/exex" }
@@ -360,7 +360,7 @@ reth-node-core = { path = "crates/node/core" }
 reth-node-ethereum = { path = "crates/ethereum/node" }
 reth-node-events = { path = "crates/node/events" }
 reth-node-metrics = { path = "crates/node/metrics" }
-reth-node-optimism = { path = "crates/optimism/node" }
+reth-optimism-node = { path = "crates/optimism/node" }
 reth-node-types = { path = "crates/node/types" }
 reth-optimism-chainspec = { path = "crates/optimism/chainspec" }
 reth-optimism-cli = { path = "crates/optimism/cli" }

crates/node/builder/src/builder/mod.rs

@@ -80,7 +80,7 @@ pub type RethFullAdapter<DB, Types> = FullNodeTypesAdapter<
 /// configured components and can interact with the node.
 ///
 /// There are convenience functions for networks that come with a preset of types and components via
-/// the [Node] trait, see `reth_node_ethereum::EthereumNode` or `reth_node_optimism::OptimismNode`.
+/// the [Node] trait, see `reth_node_ethereum::EthereumNode` or `reth_optimism_node::OptimismNode`.
 ///
 /// The [`NodeBuilder::node`] function configures the node's types and components in one step.
 ///

crates/optimism/bin/Cargo.toml

@@ -14,7 +14,7 @@ reth-cli-util.workspace = true
 reth-optimism-cli.workspace = true
 reth-provider.workspace = true
 reth-optimism-rpc.workspace = true
-reth-node-optimism.workspace = true
+reth-optimism-node.workspace = true
 
 clap = { workspace = true, features = ["derive", "env"] }
 
@@ -28,9 +28,9 @@ jemalloc = ["reth-cli-util/jemalloc"]
 jemalloc-prof = ["reth-cli-util/jemalloc-prof"]
 tracy-allocator = ["reth-cli-util/tracy-allocator"]
 
-asm-keccak = ["reth-optimism-cli/asm-keccak", "reth-node-optimism/asm-keccak"]
+asm-keccak = ["reth-optimism-cli/asm-keccak", "reth-optimism-node/asm-keccak"]
 
-optimism = ["reth-optimism-cli/optimism", "reth-node-optimism/optimism"]
+optimism = ["reth-optimism-cli/optimism", "reth-optimism-node/optimism"]
 
 [[bin]]
 name = "op-reth"

crates/optimism/bin/src/main.rs

@@ -5,8 +5,8 @@
 
 use clap::Parser;
 use reth_node_builder::{engine_tree_config::TreeConfig, EngineNodeLauncher};
-use reth_node_optimism::{args::RollupArgs, node::OptimismAddOns, OptimismNode};
 use reth_optimism_cli::{chainspec::OpChainSpecParser, Cli};
+use reth_optimism_node::{args::RollupArgs, node::OptimismAddOns, OptimismNode};
 use reth_optimism_rpc::SequencerClient;
 use reth_provider::providers::BlockchainProvider2;
 

crates/optimism/cli/Cargo.toml

@@ -24,7 +24,7 @@ reth-stages.workspace = true
 reth-static-file.workspace = true
 reth-execution-types.workspace = true
 reth-node-core.workspace = true
-reth-node-optimism.workspace = true
+reth-optimism-node.workspace = true
 reth-primitives.workspace = true
 
 ## optimism
@@ -37,7 +37,7 @@ reth-node-events.workspace = true
 reth-network-p2p.workspace = true
 reth-errors.workspace = true
 reth-config.workspace = true
-reth-evm-optimism.workspace = true
+reth-optimism-evm.workspace = true
 reth-cli.workspace = true
 reth-cli-runner.workspace = true
 reth-node-builder.workspace = true
@@ -71,14 +71,14 @@ reth-cli-commands.workspace = true
 [features]
 optimism = [
     "reth-primitives/optimism",
-    "reth-evm-optimism/optimism",
+    "reth-optimism-evm/optimism",
     "reth-provider/optimism",
     "reth-node-core/optimism",
-    "reth-node-optimism/optimism",
+    "reth-optimism-node/optimism",
 ]
 asm-keccak = [
     "alloy-primitives/asm-keccak",
     "reth-node-core/asm-keccak",
-    "reth-node-optimism/asm-keccak",
+    "reth-optimism-node/asm-keccak",
     "reth-primitives/asm-keccak",
 ]

crates/optimism/cli/src/commands/build_pipeline.rs

@@ -8,13 +8,13 @@ use reth_downloaders::{
     headers::reverse_headers::ReverseHeadersDownloaderBuilder,
 };
 use reth_errors::ProviderError;
-use reth_evm_optimism::OpExecutorProvider;
 use reth_network_p2p::{
     bodies::downloader::BodyDownloader,
     headers::downloader::{HeaderDownloader, SyncTarget},
 };
 use reth_node_builder::NodeTypesWithDB;
 use reth_node_events::node::NodeEvent;
+use reth_optimism_evm::OpExecutorProvider;
 use reth_provider::{BlockNumReader, ChainSpecProvider, HeaderProvider, ProviderFactory};
 use reth_prune::PruneModes;
 use reth_stages::{sets::DefaultStages, Pipeline, StageSet};

crates/optimism/cli/src/lib.rs

@@ -40,13 +40,13 @@ use reth_cli::chainspec::ChainSpecParser;
 use reth_cli_commands::node::NoArgs;
 use reth_cli_runner::CliRunner;
 use reth_db::DatabaseEnv;
-use reth_evm_optimism::OpExecutorProvider;
 use reth_node_builder::{NodeBuilder, WithLaunchContext};
 use reth_node_core::{
     args::LogArgs,
     version::{LONG_VERSION, SHORT_VERSION},
 };
-use reth_node_optimism::OptimismNode;
+use reth_optimism_evm::OpExecutorProvider;
+use reth_optimism_node::OptimismNode;
 use reth_tracing::FileWorkerGuard;
 use tracing::info;
 

crates/optimism/evm/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "reth-evm-optimism"
+name = "reth-optimism-evm"
 version.workspace = true
 edition.workspace = true
 rust-version.workspace = true