rename crate reth-evm-ethereum to reth-ethereum-evm to keep consisten…

…t with reth-optimism-evm

Cargo.toml

@@ -346,7 +346,7 @@ reth-ethereum-payload-builder = { path = "crates/ethereum/payload" }
 reth-ethereum-primitives = { path = "crates/ethereum/primitives", default-features = false }
 reth-etl = { path = "crates/etl" }
 reth-evm = { path = "crates/evm" }
-reth-evm-ethereum = { path = "crates/ethereum/evm" }
+reth-ethereum-evm = { path = "crates/ethereum/evm" }
 reth-optimism-evm = { path = "crates/optimism/evm" }
 reth-execution-errors = { path = "crates/evm/execution-errors" }
 reth-execution-types = { path = "crates/evm/execution-types" }

crates/blockchain-tree/Cargo.toml

@@ -57,7 +57,7 @@ reth-evm = { workspace = true, features = ["test-utils"] }
 reth-consensus = { workspace = true, features = ["test-utils"] }
 reth-testing-utils.workspace = true
 reth-revm.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-execution-types.workspace = true
 parking_lot.workspace = true
 assert_matches.workspace = true

crates/blockchain-tree/src/blockchain_tree.rs

@@ -1384,8 +1384,8 @@ mod tests {
     use reth_consensus::test_utils::TestConsensus;
     use reth_db::tables;
     use reth_db_api::transaction::DbTxMut;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_evm::test_utils::MockExecutorProvider;
-    use reth_evm_ethereum::execute::EthExecutorProvider;
     use reth_node_types::FullNodePrimitives;
     use reth_primitives::{
         proofs::{calculate_receipt_root, calculate_transaction_root},

crates/consensus/beacon/Cargo.toml

@@ -70,7 +70,7 @@ reth-network-p2p = { workspace = true, features = ["test-utils"] }
 reth-rpc-types-compat.workspace = true
 reth-tracing.workspace = true
 reth-downloaders.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-ethereum-engine-primitives.workspace = true
 reth-config.workspace = true
 reth-testing-utils.workspace = true

crates/consensus/beacon/src/engine/test_utils.rs

@@ -21,8 +21,8 @@ use reth_downloaders::{
 };
 use reth_engine_primitives::{BeaconOnNewPayloadError, EngineApiMessageVersion};
 use reth_ethereum_engine_primitives::EthEngineTypes;
+use reth_ethereum_evm::execute::EthExecutorProvider;
 use reth_evm::{either::Either, test_utils::MockExecutorProvider};
-use reth_evm_ethereum::execute::EthExecutorProvider;
 use reth_exex_types::FinishedExExHeight;
 use reth_network_p2p::{
     sync::NoopSyncStateUpdater, test_utils::NoopFullBlockClient, EthBlockClient,

crates/engine/service/Cargo.toml

@@ -37,7 +37,7 @@ thiserror.workspace = true
 [dev-dependencies]
 reth-engine-tree = { workspace = true, features = ["test-utils"] }
 reth-ethereum-engine-primitives.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-exex-types.workspace = true
 reth-primitives.workspace = true
 reth-chainspec.workspace = true

crates/engine/service/src/service.rs

@@ -155,7 +155,7 @@ mod tests {
     use reth_engine_primitives::BeaconEngineMessage;
     use reth_engine_tree::{test_utils::TestPipelineBuilder, tree::NoopInvalidBlockHook};
     use reth_ethereum_engine_primitives::{EthEngineTypes, EthereumEngineValidator};
-    use reth_evm_ethereum::execute::EthExecutorProvider;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_exex_types::FinishedExExHeight;
     use reth_network_p2p::test_utils::TestFullBlockClient;
     use reth_primitives::SealedHeader;

crates/ethereum/evm/Cargo.toml

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

crates/ethereum/node/Cargo.toml

@@ -22,7 +22,7 @@ reth-provider.workspace = true
 reth-transaction-pool.workspace = true
 reth-network.workspace = true
 reth-evm.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-consensus.workspace = true
 reth-beacon-consensus.workspace = true
 reth-rpc.workspace = true

crates/ethereum/node/src/evm.rs

@@ -1,8 +1,8 @@
 //! Ethereum EVM support
 
 #[doc(inline)]
-pub use reth_evm::execute::BasicBlockExecutorProvider;
+pub use reth_ethereum_evm::execute::{EthExecutionStrategyFactory, EthExecutorProvider};
 #[doc(inline)]
-pub use reth_evm_ethereum::execute::{EthExecutionStrategyFactory, EthExecutorProvider};
+pub use reth_ethereum_evm::EthEvmConfig;
 #[doc(inline)]
-pub use reth_evm_ethereum::EthEvmConfig;
+pub use reth_evm::execute::BasicBlockExecutorProvider;

crates/ethereum/node/src/node.rs

@@ -6,8 +6,8 @@ use reth_chainspec::ChainSpec;
 use reth_ethereum_engine_primitives::{
     EthBuiltPayload, EthPayloadAttributes, EthPayloadBuilderAttributes,
 };
+use reth_ethereum_evm::execute::EthExecutionStrategyFactory;
 use reth_evm::execute::BasicBlockExecutorProvider;
-use reth_evm_ethereum::execute::EthExecutionStrategyFactory;
 use reth_network::{EthNetworkPrimitives, NetworkHandle, PeersInfo};
 use reth_node_api::{AddOnsContext, FullNodeComponents, TxTy};
 use reth_node_builder::{

crates/ethereum/node/src/payload.rs

@@ -5,9 +5,9 @@ use reth_chainspec::ChainSpec;
 use reth_ethereum_engine_primitives::{
     EthBuiltPayload, EthPayloadAttributes, EthPayloadBuilderAttributes,
 };
+use reth_ethereum_evm::EthEvmConfig;
 use reth_ethereum_payload_builder::EthereumBuilderConfig;
 use reth_evm::ConfigureEvm;
-use reth_evm_ethereum::EthEvmConfig;
 use reth_node_api::{FullNodeTypes, HeaderTy, NodeTypesWithEngine, TxTy};
 use reth_node_builder::{
     components::PayloadServiceBuilder, BuilderContext, PayloadBuilderConfig, PayloadTypes,

crates/ethereum/payload/Cargo.toml

@@ -24,7 +24,7 @@ reth-payload-primitives.workspace = true
 reth-execution-types.workspace = true
 reth-basic-payload-builder.workspace = true
 reth-evm.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-errors.workspace = true
 reth-chain-state.workspace = true
 reth-chainspec.workspace = true

crates/ethereum/payload/src/lib.rs

@@ -22,8 +22,8 @@ use reth_basic_payload_builder::{
 use reth_chain_state::ExecutedBlock;
 use reth_chainspec::{ChainSpec, ChainSpecProvider};
 use reth_errors::RethError;
+use reth_ethereum_evm::{eip6110::parse_deposits_from_receipts, EthEvmConfig};
 use reth_evm::{env::EvmEnv, system_calls::SystemCaller, ConfigureEvm, NextBlockEnvAttributes};
-use reth_evm_ethereum::{eip6110::parse_deposits_from_receipts, EthEvmConfig};
 use reth_execution_types::ExecutionOutcome;
 use reth_payload_builder::{EthBuiltPayload, EthPayloadBuilderAttributes};
 use reth_payload_builder_primitives::PayloadBuilderError;

crates/exex/exex/Cargo.toml

@@ -55,7 +55,7 @@ tracing.workspace = true
 [dev-dependencies]
 reth-blockchain-tree.workspace = true
 reth-db-common.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-node-api.workspace = true
 reth-primitives-traits = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }

crates/exex/exex/src/backfill/job.rs

@@ -233,7 +233,7 @@ mod tests {
     };
     use reth_blockchain_tree::noop::NoopBlockchainTree;
     use reth_db_common::init::init_genesis;
-    use reth_evm_ethereum::execute::EthExecutorProvider;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_primitives_traits::crypto::secp256k1::public_key_to_address;
     use reth_provider::{
         providers::BlockchainProvider, test_utils::create_test_provider_factory_with_chain_spec,

crates/exex/exex/src/backfill/stream.rs

@@ -244,7 +244,7 @@ mod tests {
     use futures::StreamExt;
     use reth_blockchain_tree::noop::NoopBlockchainTree;
     use reth_db_common::init::init_genesis;
-    use reth_evm_ethereum::execute::EthExecutorProvider;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_primitives_traits::crypto::secp256k1::public_key_to_address;
     use reth_provider::{
         providers::BlockchainProvider, test_utils::create_test_provider_factory_with_chain_spec,

crates/exex/exex/src/backfill/test_utils.rs

@@ -5,8 +5,8 @@ use alloy_genesis::{Genesis, GenesisAccount};
 use alloy_primitives::{b256, Address, TxKind, U256};
 use eyre::OptionExt;
 use reth_chainspec::{ChainSpec, ChainSpecBuilder, EthereumHardfork, MAINNET, MIN_TRANSACTION_GAS};
+use reth_ethereum_evm::execute::EthExecutorProvider;
 use reth_evm::execute::{BatchExecutor, BlockExecutionOutput, BlockExecutorProvider, Executor};
-use reth_evm_ethereum::execute::EthExecutorProvider;
 use reth_node_api::FullNodePrimitives;
 use reth_primitives::{
     Block, BlockBody, BlockExt, BlockWithSenders, Receipt, SealedBlockWithSenders, Transaction,

crates/exex/exex/src/manager.rs

@@ -662,8 +662,8 @@ mod tests {
     use futures::{StreamExt, TryStreamExt};
     use rand::Rng;
     use reth_db_common::init::init_genesis;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_evm::test_utils::MockExecutorProvider;
-    use reth_evm_ethereum::execute::EthExecutorProvider;
     use reth_primitives::SealedBlockWithSenders;
     use reth_provider::{
         providers::BlockchainProvider2, test_utils::create_test_provider_factory, BlockReader,

crates/exex/exex/src/notifications.rs

@@ -443,7 +443,7 @@ mod tests {
     use eyre::OptionExt;
     use futures::StreamExt;
     use reth_db_common::init::init_genesis;
-    use reth_evm_ethereum::execute::EthExecutorProvider;
+    use reth_ethereum_evm::execute::EthExecutorProvider;
     use reth_primitives::{Block, BlockExt};
     use reth_provider::{
         providers::BlockchainProvider2, test_utils::create_test_provider_factory, BlockWriter,

crates/rpc/rpc-builder/Cargo.toml

@@ -54,7 +54,7 @@ reth-chainspec.workspace = true
 reth-beacon-consensus.workspace = true
 reth-network-api.workspace = true
 reth-network-peers.workspace = true
-reth-evm-ethereum.workspace = true
+reth-ethereum-evm.workspace = true
 reth-ethereum-engine-primitives.workspace = true
 reth-payload-builder = { workspace = true, features = ["test-utils"] }
 reth-provider = { workspace = true, features = ["test-utils"] }

crates/rpc/rpc-builder/src/lib.rs

@@ -759,8 +759,8 @@ where
     /// ```no_run
     /// use reth_consensus::noop::NoopConsensus;
     /// use reth_engine_primitives::PayloadValidator;
+    /// use reth_ethereum_evm::execute::EthExecutorProvider;
     /// use reth_evm::ConfigureEvm;
-    /// use reth_evm_ethereum::execute::EthExecutorProvider;
     /// use reth_network_api::noop::NoopNetwork;
     /// use reth_primitives::{Header, TransactionSigned};
     /// use reth_provider::test_utils::{NoopProvider, TestCanonStateSubscriptions};