diff --git a/crates/revm/src/eth_dao_fork.rs b/crates/ethereum/evm/src/dao_fork.rs similarity index 100% rename from crates/revm/src/eth_dao_fork.rs rename to crates/ethereum/evm/src/dao_fork.rs diff --git a/crates/ethereum/evm/src/execute.rs b/crates/ethereum/evm/src/execute.rs index b65e7be17..ff3a4e76d 100644 --- a/crates/ethereum/evm/src/execute.rs +++ b/crates/ethereum/evm/src/execute.rs @@ -1,6 +1,10 @@ //! Ethereum block executor. -use crate::{verify::verify_receipts, EthEvmConfig}; +use crate::{ + dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDKFORK_ACCOUNTS}, + verify::verify_receipts, + EthEvmConfig, +}; use reth_evm::{ execute::{ BatchBlockExecutionOutput, BatchExecutor, BlockExecutionInput, BlockExecutionOutput, @@ -19,7 +23,6 @@ use reth_primitives::{ use reth_revm::{ batch::{BlockBatchRecord, BlockExecutorStats}, db::states::bundle_state::BundleRetention, - eth_dao_fork::{DAO_HARDFORK_BENEFICIARY, DAO_HARDKFORK_ACCOUNTS}, state_change::{apply_beacon_root_contract_call, post_block_balance_increments}, Evm, State, }; diff --git a/crates/ethereum/evm/src/lib.rs b/crates/ethereum/evm/src/lib.rs index 88621a66a..0c8506ff7 100644 --- a/crates/ethereum/evm/src/lib.rs +++ b/crates/ethereum/evm/src/lib.rs @@ -18,6 +18,9 @@ use reth_revm::{Database, EvmBuilder}; pub mod execute; pub mod verify; +/// Ethereum DAO hardfork state change data. +pub mod dao_fork; + /// Ethereum-related EVM configuration. #[derive(Debug, Clone, Copy, Default)] #[non_exhaustive] diff --git a/crates/revm/src/lib.rs b/crates/revm/src/lib.rs index 375b230ab..7f950afb0 100644 --- a/crates/revm/src/lib.rs +++ b/crates/revm/src/lib.rs @@ -16,9 +16,6 @@ pub mod batch; /// State changes that are not related to transactions. pub mod state_change; -/// Ethereum DAO hardfork state change data. -pub mod eth_dao_fork; - /// Common test helpers #[cfg(any(test, feature = "test-utils"))] pub mod test_utils;