From 984a89dd91d886764283d8006a413a751cbc76ba Mon Sep 17 00:00:00 2001 From: Pana Date: Tue, 7 Jan 2025 12:58:34 +0800 Subject: [PATCH] rename crate reth-evm-ethereum to reth-ethereum-evm to keep consistent with reth-optimism-evm --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 2 +- crates/blockchain-tree/Cargo.toml | 2 +- crates/blockchain-tree/src/blockchain_tree.rs | 2 +- crates/consensus/beacon/Cargo.toml | 2 +- .../consensus/beacon/src/engine/test_utils.rs | 2 +- crates/engine/service/Cargo.toml | 2 +- crates/engine/service/src/service.rs | 2 +- crates/ethereum/evm/Cargo.toml | 2 +- crates/ethereum/node/Cargo.toml | 2 +- crates/ethereum/node/src/evm.rs | 6 +- crates/ethereum/node/src/node.rs | 2 +- crates/ethereum/node/src/payload.rs | 2 +- crates/ethereum/payload/Cargo.toml | 2 +- crates/ethereum/payload/src/lib.rs | 2 +- crates/exex/exex/Cargo.toml | 2 +- crates/exex/exex/src/backfill/job.rs | 2 +- crates/exex/exex/src/backfill/stream.rs | 2 +- crates/exex/exex/src/backfill/test_utils.rs | 2 +- crates/exex/exex/src/manager.rs | 2 +- crates/exex/exex/src/notifications.rs | 2 +- crates/rpc/rpc-builder/Cargo.toml | 2 +- crates/rpc/rpc-builder/src/lib.rs | 2 +- crates/rpc/rpc-builder/tests/it/utils.rs | 2 +- crates/rpc/rpc/Cargo.toml | 2 +- crates/rpc/rpc/src/eth/core.rs | 2 +- crates/rpc/rpc/src/eth/helpers/state.rs | 2 +- crates/rpc/rpc/src/eth/helpers/transaction.rs | 2 +- crates/stages/stages/Cargo.toml | 2 +- crates/stages/stages/src/lib.rs | 4 +- crates/stages/stages/src/sets.rs | 2 +- crates/stages/stages/src/stages/execution.rs | 2 +- crates/stages/stages/src/stages/mod.rs | 2 +- docs/repo/layout.md | 2 + examples/custom-beacon-withdrawals/Cargo.toml | 2 +- .../custom-beacon-withdrawals/src/main.rs | 2 +- examples/custom-evm/Cargo.toml | 2 +- examples/custom-evm/src/main.rs | 2 +- testing/ef-tests/Cargo.toml | 2 +- testing/ef-tests/src/cases/blockchain_test.rs | 2 +- 40 files changed, 79 insertions(+), 77 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3e8798fd46b2..936f38df72c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2669,7 +2669,7 @@ dependencies = [ "reth-chainspec", "reth-db", "reth-db-api", - "reth-evm-ethereum", + "reth-ethereum-evm", "reth-primitives", "reth-provider", "reth-revm", @@ -2899,8 +2899,8 @@ dependencies = [ "eyre", "reth", "reth-chainspec", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-node-ethereum", "reth-primitives", ] @@ -2955,8 +2955,8 @@ dependencies = [ "eyre", "reth", "reth-chainspec", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-node-api", "reth-node-core", "reth-node-ethereum", @@ -6509,8 +6509,8 @@ dependencies = [ "reth-errors", "reth-ethereum-consensus", "reth-ethereum-engine-primitives", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-exex-types", "reth-metrics", "reth-network-p2p", @@ -6593,8 +6593,8 @@ dependencies = [ "reth-consensus", "reth-db", "reth-db-api", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-execution-errors", "reth-execution-types", "reth-metrics", @@ -7260,8 +7260,8 @@ dependencies = [ "reth-engine-primitives", "reth-engine-tree", "reth-ethereum-engine-primitives", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-exex-types", "reth-network-p2p", "reth-node-types", @@ -7486,6 +7486,30 @@ dependencies = [ "sha2 0.10.8", ] +[[package]] +name = "reth-ethereum-evm" +version = "1.1.4" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-genesis", + "alloy-primitives", + "alloy-sol-types", + "reth-chainspec", + "reth-consensus", + "reth-ethereum-consensus", + "reth-ethereum-forks", + "reth-evm", + "reth-execution-types", + "reth-primitives", + "reth-primitives-traits", + "reth-revm", + "reth-testing-utils", + "revm-primitives", + "secp256k1", + "serde_json", +] + [[package]] name = "reth-ethereum-forks" version = "1.1.4" @@ -7512,8 +7536,8 @@ dependencies = [ "reth-chain-state", "reth-chainspec", "reth-errors", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-execution-types", "reth-payload-builder", "reth-payload-builder-primitives", @@ -7588,30 +7612,6 @@ dependencies = [ "revm-primitives", ] -[[package]] -name = "reth-evm-ethereum" -version = "1.1.4" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-genesis", - "alloy-primitives", - "alloy-sol-types", - "reth-chainspec", - "reth-consensus", - "reth-ethereum-consensus", - "reth-ethereum-forks", - "reth-evm", - "reth-execution-types", - "reth-primitives", - "reth-primitives-traits", - "reth-revm", - "reth-testing-utils", - "revm-primitives", - "secp256k1", - "serde_json", -] - [[package]] name = "reth-execution-errors" version = "1.1.4" @@ -7667,8 +7667,8 @@ dependencies = [ "reth-chainspec", "reth-config", "reth-db-common", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-exex-types", "reth-fs-util", "reth-metrics", @@ -8174,9 +8174,9 @@ dependencies = [ "reth-db", "reth-e2e-test-utils", "reth-ethereum-engine-primitives", + "reth-ethereum-evm", "reth-ethereum-payload-builder", "reth-evm", - "reth-evm-ethereum", "reth-exex", "reth-network", "reth-node-api", @@ -8876,8 +8876,8 @@ dependencies = [ "reth-consensus-common", "reth-engine-primitives", "reth-errors", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-network-api", "reth-network-peers", "reth-network-types", @@ -8969,8 +8969,8 @@ dependencies = [ "reth-consensus", "reth-engine-primitives", "reth-ethereum-engine-primitives", + "reth-ethereum-evm", "reth-evm", - "reth-evm-ethereum", "reth-ipc", "reth-metrics", "reth-network-api", @@ -9195,9 +9195,9 @@ dependencies = [ "reth-db", "reth-db-api", "reth-downloaders", + "reth-ethereum-evm", "reth-etl", "reth-evm", - "reth-evm-ethereum", "reth-execution-errors", "reth-execution-types", "reth-exex", diff --git a/Cargo.toml b/Cargo.toml index fc56fab045bf..00ac4d3506f2 100644 --- a/Cargo.toml +++ b/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" } diff --git a/crates/blockchain-tree/Cargo.toml b/crates/blockchain-tree/Cargo.toml index 1c42a292aea7..f77bd7f852a7 100644 --- a/crates/blockchain-tree/Cargo.toml +++ b/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 diff --git a/crates/blockchain-tree/src/blockchain_tree.rs b/crates/blockchain-tree/src/blockchain_tree.rs index 3964ea53b7e2..4846619d42cb 100644 --- a/crates/blockchain-tree/src/blockchain_tree.rs +++ b/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}, diff --git a/crates/consensus/beacon/Cargo.toml b/crates/consensus/beacon/Cargo.toml index b937eb2b4683..dd9c534a6b4c 100644 --- a/crates/consensus/beacon/Cargo.toml +++ b/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 diff --git a/crates/consensus/beacon/src/engine/test_utils.rs b/crates/consensus/beacon/src/engine/test_utils.rs index ae627cae6961..100d9ff0f40d 100644 --- a/crates/consensus/beacon/src/engine/test_utils.rs +++ b/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, diff --git a/crates/engine/service/Cargo.toml b/crates/engine/service/Cargo.toml index 326bc06b5e35..a1f0dbf299bf 100644 --- a/crates/engine/service/Cargo.toml +++ b/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 diff --git a/crates/engine/service/src/service.rs b/crates/engine/service/src/service.rs index aeaf364a8cdc..89d61e066bd4 100644 --- a/crates/engine/service/src/service.rs +++ b/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; diff --git a/crates/ethereum/evm/Cargo.toml b/crates/ethereum/evm/Cargo.toml index 7e6ed8052877..8261c720ef81 100644 --- a/crates/ethereum/evm/Cargo.toml +++ b/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 diff --git a/crates/ethereum/node/Cargo.toml b/crates/ethereum/node/Cargo.toml index e532b844a529..08b51a998f84 100644 --- a/crates/ethereum/node/Cargo.toml +++ b/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 diff --git a/crates/ethereum/node/src/evm.rs b/crates/ethereum/node/src/evm.rs index bcdcaac6bfa2..cd553a9a3d86 100644 --- a/crates/ethereum/node/src/evm.rs +++ b/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; diff --git a/crates/ethereum/node/src/node.rs b/crates/ethereum/node/src/node.rs index f1a1f56ec048..c7cec2eaee14 100644 --- a/crates/ethereum/node/src/node.rs +++ b/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::{ diff --git a/crates/ethereum/node/src/payload.rs b/crates/ethereum/node/src/payload.rs index 84df93c0bab4..d1f3a8fbb2bd 100644 --- a/crates/ethereum/node/src/payload.rs +++ b/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, diff --git a/crates/ethereum/payload/Cargo.toml b/crates/ethereum/payload/Cargo.toml index dd4a5f948cd0..9496aec5d205 100644 --- a/crates/ethereum/payload/Cargo.toml +++ b/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 diff --git a/crates/ethereum/payload/src/lib.rs b/crates/ethereum/payload/src/lib.rs index 66ca1662b97e..67046266aecc 100644 --- a/crates/ethereum/payload/src/lib.rs +++ b/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; diff --git a/crates/exex/exex/Cargo.toml b/crates/exex/exex/Cargo.toml index ce00c75e183b..18770c2c3a68 100644 --- a/crates/exex/exex/Cargo.toml +++ b/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"] } diff --git a/crates/exex/exex/src/backfill/job.rs b/crates/exex/exex/src/backfill/job.rs index 8ad8692ae6ad..ce5be39c20bf 100644 --- a/crates/exex/exex/src/backfill/job.rs +++ b/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, diff --git a/crates/exex/exex/src/backfill/stream.rs b/crates/exex/exex/src/backfill/stream.rs index 8e572422e4a7..44995b91fba4 100644 --- a/crates/exex/exex/src/backfill/stream.rs +++ b/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, diff --git a/crates/exex/exex/src/backfill/test_utils.rs b/crates/exex/exex/src/backfill/test_utils.rs index eb7598377f2c..a874de4834d9 100644 --- a/crates/exex/exex/src/backfill/test_utils.rs +++ b/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, diff --git a/crates/exex/exex/src/manager.rs b/crates/exex/exex/src/manager.rs index 16a930526141..fb296c9ba9a6 100644 --- a/crates/exex/exex/src/manager.rs +++ b/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, diff --git a/crates/exex/exex/src/notifications.rs b/crates/exex/exex/src/notifications.rs index 05892e2f90d5..6c4f485495db 100644 --- a/crates/exex/exex/src/notifications.rs +++ b/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, diff --git a/crates/rpc/rpc-builder/Cargo.toml b/crates/rpc/rpc-builder/Cargo.toml index 7dbbe7608a72..ebdfeb6127f5 100644 --- a/crates/rpc/rpc-builder/Cargo.toml +++ b/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"] } diff --git a/crates/rpc/rpc-builder/src/lib.rs b/crates/rpc/rpc-builder/src/lib.rs index 10dab2ab5b31..5e0111db68c3 100644 --- a/crates/rpc/rpc-builder/src/lib.rs +++ b/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}; diff --git a/crates/rpc/rpc-builder/tests/it/utils.rs b/crates/rpc/rpc-builder/tests/it/utils.rs index d9d8a9e45a77..79c1d8b42f48 100644 --- a/crates/rpc/rpc-builder/tests/it/utils.rs +++ b/crates/rpc/rpc-builder/tests/it/utils.rs @@ -8,8 +8,8 @@ use reth_beacon_consensus::BeaconConsensusEngineHandle; use reth_chainspec::MAINNET; use reth_consensus::noop::NoopConsensus; use reth_ethereum_engine_primitives::{EthEngineTypes, EthereumEngineValidator}; +use reth_ethereum_evm::{execute::EthExecutionStrategyFactory, EthEvmConfig}; use reth_evm::execute::BasicBlockExecutorProvider; -use reth_evm_ethereum::{execute::EthExecutionStrategyFactory, EthEvmConfig}; use reth_network_api::noop::NoopNetwork; use reth_payload_builder::test_utils::spawn_test_payload_service; use reth_provider::test_utils::{NoopProvider, TestCanonStateSubscriptions}; diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml index 43fe54f121bc..a2ae8cc2853c 100644 --- a/crates/rpc/rpc/Cargo.toml +++ b/crates/rpc/rpc/Cargo.toml @@ -89,7 +89,7 @@ thiserror.workspace = true derive_more.workspace = true [dev-dependencies] -reth-evm-ethereum.workspace = true +reth-ethereum-evm.workspace = true reth-testing-utils.workspace = true reth-transaction-pool = { workspace = true, features = ["test-utils"] } reth-provider = { workspace = true, features = ["test-utils"] } diff --git a/crates/rpc/rpc/src/eth/core.rs b/crates/rpc/rpc/src/eth/core.rs index cf5753a34c18..1ffaee31cf3b 100644 --- a/crates/rpc/rpc/src/eth/core.rs +++ b/crates/rpc/rpc/src/eth/core.rs @@ -459,7 +459,7 @@ mod tests { use alloy_rpc_types::FeeHistory; use jsonrpsee_types::error::INVALID_PARAMS_CODE; use reth_chainspec::{BaseFeeParams, ChainSpec}; - use reth_evm_ethereum::EthEvmConfig; + use reth_ethereum_evm::EthEvmConfig; use reth_network_api::noop::NoopNetwork; use reth_primitives::{Block, BlockBody, TransactionSigned}; use reth_provider::{ diff --git a/crates/rpc/rpc/src/eth/helpers/state.rs b/crates/rpc/rpc/src/eth/helpers/state.rs index 99d2856ad832..7d2f0aabd31c 100644 --- a/crates/rpc/rpc/src/eth/helpers/state.rs +++ b/crates/rpc/rpc/src/eth/helpers/state.rs @@ -39,7 +39,7 @@ mod tests { use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; use alloy_primitives::{Address, StorageKey, StorageValue, U256}; use reth_chainspec::MAINNET; - use reth_evm_ethereum::EthEvmConfig; + use reth_ethereum_evm::EthEvmConfig; use reth_network_api::noop::NoopNetwork; use reth_provider::test_utils::{ExtendedAccount, MockEthProvider, NoopProvider}; use reth_rpc_eth_api::helpers::EthState; diff --git a/crates/rpc/rpc/src/eth/helpers/transaction.rs b/crates/rpc/rpc/src/eth/helpers/transaction.rs index 33c8849be1b2..c9381d0e6f88 100644 --- a/crates/rpc/rpc/src/eth/helpers/transaction.rs +++ b/crates/rpc/rpc/src/eth/helpers/transaction.rs @@ -59,7 +59,7 @@ mod tests { use alloy_eips::eip1559::ETHEREUM_BLOCK_GAS_LIMIT; use alloy_primitives::{hex_literal::hex, Bytes}; use reth_chainspec::ChainSpecProvider; - use reth_evm_ethereum::EthEvmConfig; + use reth_ethereum_evm::EthEvmConfig; use reth_network_api::noop::NoopNetwork; use reth_provider::test_utils::NoopProvider; use reth_rpc_eth_api::helpers::EthTransactions; diff --git a/crates/stages/stages/Cargo.toml b/crates/stages/stages/Cargo.toml index e7114eeb16ac..b21eedc5f6c5 100644 --- a/crates/stages/stages/Cargo.toml +++ b/crates/stages/stages/Cargo.toml @@ -63,7 +63,7 @@ bincode.workspace = true reth-chainspec.workspace = true reth-primitives = { workspace = true, features = ["test-utils", "arbitrary"] } reth-db = { workspace = true, features = ["test-utils", "mdbx"] } -reth-evm-ethereum.workspace = true +reth-ethereum-evm.workspace = true reth-execution-errors.workspace = true reth-consensus = { workspace = true, features = ["test-utils"] } reth-network-p2p = { workspace = true, features = ["test-utils"] } diff --git a/crates/stages/stages/src/lib.rs b/crates/stages/stages/src/lib.rs index ce6a96cf3496..0ee5f800ed1e 100644 --- a/crates/stages/stages/src/lib.rs +++ b/crates/stages/stages/src/lib.rs @@ -16,7 +16,7 @@ //! # use reth_downloaders::bodies::bodies::BodiesDownloaderBuilder; //! # use reth_downloaders::headers::reverse_headers::ReverseHeadersDownloaderBuilder; //! # use reth_network_p2p::test_utils::{TestBodiesClient, TestHeadersClient}; -//! # use reth_evm_ethereum::execute::EthExecutorProvider; +//! # use reth_ethereum_evm::execute::EthExecutorProvider; //! # use alloy_primitives::B256; //! # use reth_chainspec::MAINNET; //! # use reth_prune_types::PruneModes; @@ -24,7 +24,7 @@ //! # use reth_stages::Pipeline; //! # use reth_stages::sets::DefaultStages; //! # use tokio::sync::watch; -//! # use reth_evm_ethereum::EthEvmConfig; +//! # use reth_ethereum_evm::EthEvmConfig; //! # use reth_provider::ProviderFactory; //! # use reth_provider::StaticFileProviderFactory; //! # use reth_provider::test_utils::{create_test_provider_factory, MockNodeTypesWithDB}; diff --git a/crates/stages/stages/src/sets.rs b/crates/stages/stages/src/sets.rs index 53eb23379646..0b52f2c5d304 100644 --- a/crates/stages/stages/src/sets.rs +++ b/crates/stages/stages/src/sets.rs @@ -14,7 +14,7 @@ //! # use reth_stages::sets::{OfflineStages}; //! # use reth_chainspec::MAINNET; //! # use reth_prune_types::PruneModes; -//! # use reth_evm_ethereum::EthEvmConfig; +//! # use reth_ethereum_evm::EthEvmConfig; //! # use reth_provider::StaticFileProviderFactory; //! # use reth_provider::test_utils::{create_test_provider_factory, MockNodeTypesWithDB}; //! # use reth_static_file::StaticFileProducer; diff --git a/crates/stages/stages/src/stages/execution.rs b/crates/stages/stages/src/stages/execution.rs index efafc904180d..71aff566481f 100644 --- a/crates/stages/stages/src/stages/execution.rs +++ b/crates/stages/stages/src/stages/execution.rs @@ -651,8 +651,8 @@ mod tests { use assert_matches::assert_matches; use reth_chainspec::ChainSpecBuilder; use reth_db_api::{models::AccountBeforeTx, transaction::DbTxMut}; + use reth_ethereum_evm::execute::EthExecutionStrategyFactory; use reth_evm::execute::BasicBlockExecutorProvider; - use reth_evm_ethereum::execute::EthExecutionStrategyFactory; use reth_execution_errors::BlockValidationError; use reth_primitives::{Account, Bytecode, SealedBlock, StorageEntry}; use reth_provider::{ diff --git a/crates/stages/stages/src/stages/mod.rs b/crates/stages/stages/src/stages/mod.rs index e5cf6d525c28..fad86848fa77 100644 --- a/crates/stages/stages/src/stages/mod.rs +++ b/crates/stages/stages/src/stages/mod.rs @@ -54,7 +54,7 @@ mod tests { table::Table, transaction::{DbTx, DbTxMut}, }; - use reth_evm_ethereum::execute::EthExecutorProvider; + use reth_ethereum_evm::execute::EthExecutorProvider; use reth_exex::ExExManagerHandle; use reth_primitives::{Account, Bytecode, SealedBlock, StaticFileSegment}; use reth_provider::{ diff --git a/docs/repo/layout.md b/docs/repo/layout.md index dcb475e020eb..f6244579034e 100644 --- a/docs/repo/layout.md +++ b/docs/repo/layout.md @@ -92,6 +92,8 @@ Crates related to transaction execution. - [`evm`](../../crates/evm): Traits for configuring an EVM specifics. - [`execution-types`](../../crates/evm/execution-types): Commonly used types for (EVM) block execution. - [`execution-errors`](../../crates/evm/execution-errors): Commonly used error types used when doing block execution. +- [`ethereum-evm`](../../crates/ethereum/evm): EVM implementation for Ethereum. +- [`optimism-evm`](../../crates/optimism/evm): EVM implementation for Optimism. ### Sync diff --git a/examples/custom-beacon-withdrawals/Cargo.toml b/examples/custom-beacon-withdrawals/Cargo.toml index c396ca11df8b..b516de9c1bc2 100644 --- a/examples/custom-beacon-withdrawals/Cargo.toml +++ b/examples/custom-beacon-withdrawals/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true [dependencies] reth.workspace = true reth-node-ethereum.workspace = true -reth-evm-ethereum.workspace = true +reth-ethereum-evm.workspace = true reth-chainspec.workspace = true reth-evm.workspace = true reth-primitives.workspace = true diff --git a/examples/custom-beacon-withdrawals/src/main.rs b/examples/custom-beacon-withdrawals/src/main.rs index f484b082be7a..9e35779303b1 100644 --- a/examples/custom-beacon-withdrawals/src/main.rs +++ b/examples/custom-beacon-withdrawals/src/main.rs @@ -20,6 +20,7 @@ use reth::{ }, }; use reth_chainspec::{ChainSpec, EthereumHardforks}; +use reth_ethereum_evm::EthEvmConfig; use reth_evm::{ env::EvmEnv, execute::{ @@ -27,7 +28,6 @@ use reth_evm::{ InternalBlockExecutionError, }, }; -use reth_evm_ethereum::EthEvmConfig; use reth_node_ethereum::{node::EthereumAddOns, BasicBlockExecutorProvider, EthereumNode}; use reth_primitives::{BlockWithSenders, EthPrimitives, Receipt}; use std::{fmt::Display, sync::Arc}; diff --git a/examples/custom-evm/Cargo.toml b/examples/custom-evm/Cargo.toml index c9ce0c4674e0..a4aaede1176e 100644 --- a/examples/custom-evm/Cargo.toml +++ b/examples/custom-evm/Cargo.toml @@ -8,7 +8,7 @@ license.workspace = true [dependencies] reth.workspace = true reth-chainspec.workspace = true -reth-evm-ethereum.workspace = true +reth-ethereum-evm.workspace = true reth-node-api.workspace = true reth-node-core.workspace = true reth-primitives.workspace = true diff --git a/examples/custom-evm/src/main.rs b/examples/custom-evm/src/main.rs index 4d2fea296e62..09feb9ac89c6 100644 --- a/examples/custom-evm/src/main.rs +++ b/examples/custom-evm/src/main.rs @@ -23,8 +23,8 @@ use reth::{ transaction_pool::{PoolTransaction, TransactionPool}, }; use reth_chainspec::{Chain, ChainSpec}; +use reth_ethereum_evm::EthEvmConfig; use reth_evm::env::EvmEnv; -use reth_evm_ethereum::EthEvmConfig; use reth_node_api::{ ConfigureEvm, ConfigureEvmEnv, FullNodeTypes, NextBlockEnvAttributes, NodeTypes, NodeTypesWithEngine, PayloadTypes, diff --git a/testing/ef-tests/Cargo.toml b/testing/ef-tests/Cargo.toml index 2fc0c7512441..5189c24af176 100644 --- a/testing/ef-tests/Cargo.toml +++ b/testing/ef-tests/Cargo.toml @@ -30,7 +30,7 @@ reth-db = { workspace = true, features = [ reth-db-api.workspace = true reth-provider = { workspace = true, features = ["test-utils"] } reth-stages.workspace = true -reth-evm-ethereum.workspace = true +reth-ethereum-evm.workspace = true reth-revm = { workspace = true, features = ["std"] } revm = { workspace = true, features = ["secp256k1", "blst", "c-kzg"] } diff --git a/testing/ef-tests/src/cases/blockchain_test.rs b/testing/ef-tests/src/cases/blockchain_test.rs index 7d80ec6c47fa..ebf2c0cce1e8 100644 --- a/testing/ef-tests/src/cases/blockchain_test.rs +++ b/testing/ef-tests/src/cases/blockchain_test.rs @@ -127,7 +127,7 @@ impl Case for BlockchainTestCase { // Execute the execution stage using the EVM processor factory for the test case // network. let _ = ExecutionStage::new_with_executor( - reth_evm_ethereum::execute::EthExecutorProvider::ethereum(chain_spec), + reth_ethereum_evm::execute::EthExecutorProvider::ethereum(chain_spec), ) .execute( &provider,