refactor: move payload/builder/src/database.rs to revm/src/cached.rs

bin/reth/src/commands/debug_cmd/build_block.rs

@@ -26,7 +26,6 @@ use reth_node_api::{
     EngineApiMessageVersion, NodeTypesWithDB, NodeTypesWithEngine, PayloadBuilderAttributes,
 };
 use reth_node_ethereum::{EthEvmConfig, EthExecutorProvider};
-use reth_payload_builder::database::CachedReads;
 use reth_primitives::{
     revm_primitives::KzgSettings, BlobTransaction, BlobTransactionSidecar,
     PooledTransactionsElement, SealedBlock, SealedBlockWithSenders, SealedHeader, Transaction,
@@ -36,7 +35,7 @@ use reth_provider::{
     providers::BlockchainProvider, BlockHashReader, BlockReader, BlockWriter, ChainSpecProvider,
     ProviderFactory, StageCheckpointReader, StateProviderFactory,
 };
-use reth_revm::{database::StateProviderDatabase, primitives::EnvKzgSettings};
+use reth_revm::{cached::CachedReads, database::StateProviderDatabase, primitives::EnvKzgSettings};
 use reth_stages::StageId;
 use reth_transaction_pool::{
     blobstore::InMemoryBlobStore, BlobStore, EthPooledTransaction, PoolConfig, TransactionOrigin,

crates/payload/basic/Cargo.toml

@@ -21,6 +21,7 @@ reth-payload-builder.workspace = true
 reth-payload-primitives.workspace = true
 reth-tasks.workspace = true
 reth-evm.workspace = true
+reth-revm.workspace=true
 
 # ethereum
 alloy-rlp.workspace = true

crates/payload/basic/src/lib.rs

@@ -16,9 +16,7 @@ use futures_core::ready;
 use futures_util::FutureExt;
 use reth_chainspec::{ChainSpec, EthereumHardforks};
 use reth_evm::state_change::post_block_withdrawals_balance_increments;
-use reth_payload_builder::{
-    database::CachedReads, KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJobGenerator,
-};
+use reth_payload_builder::{KeepPayloadJobAlive, PayloadId, PayloadJob, PayloadJobGenerator};
 use reth_payload_primitives::{
     BuiltPayload, PayloadBuilderAttributes, PayloadBuilderError, PayloadKind,
 };
@@ -28,6 +26,7 @@ use reth_primitives::{
 use reth_provider::{
     BlockReaderIdExt, BlockSource, CanonStateNotification, ProviderError, StateProviderFactory,
 };
+use reth_revm::cached::CachedReads;
 use reth_tasks::TaskSpawner;
 use reth_transaction_pool::TransactionPool;
 use revm::{Database, State};

crates/payload/builder/Cargo.toml

@@ -20,8 +20,8 @@ reth-ethereum-engine-primitives.workspace = true
 reth-chain-state = { workspace = true, optional = true }
 
 # alloy
-alloy-rpc-types = { workspace = true, features = ["engine"] }
 alloy-primitives.workspace = true
+alloy-rpc-types = { workspace = true, features = ["engine"] }
 
 # async
 async-trait.workspace = true

crates/payload/builder/src/lib.rs

@@ -101,7 +101,6 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))]
 
-pub mod database;
 mod metrics;
 mod service;
 mod traits;
@@ -111,8 +110,10 @@ pub mod noop;
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;
 
+use alloy_primitives as _;
 pub use alloy_rpc_types::engine::PayloadId;
 pub use reth_payload_primitives::{PayloadBuilderError, PayloadKind};
+use reth_primitives as _;
 pub use service::{
     PayloadBuilderHandle, PayloadBuilderService, PayloadServiceCommand, PayloadStore,
 };

crates/payload/builder/src/database.rs → crates/revm/src/cached.rs

@@ -1,13 +1,13 @@
 //! Database adapters for payload building.
-use alloy_primitives::{Address, B256, U256};
+use alloy_primitives::{
+    map::{Entry, HashMap},
+    Address, B256, U256,
+};
+use core::cell::RefCell;
 use reth_primitives::revm_primitives::{
     db::{Database, DatabaseRef},
     AccountInfo, Bytecode,
 };
-use std::{
-    cell::RefCell,
-    collections::{hash_map::Entry, HashMap},
-};
 
 /// A container type that caches reads from an underlying [`DatabaseRef`].
 ///
@@ -17,7 +17,7 @@ use std::{
 /// # Example
 ///
 /// ```
-/// use reth_payload_builder::database::CachedReads;
+/// use reth_revm::cached::CachedReads;
 /// use revm::db::{DatabaseRef, State};
 ///
 /// fn build_payload<DB: DatabaseRef>(db: DB) {

crates/revm/src/lib.rs

@@ -11,11 +11,15 @@
 
 extern crate alloc;
 
+pub mod batch;
+
+/// Cache database that reads from an underlying [`DatabaseRef`].
+/// Database adapters for payload building.
+pub mod cached;
+
 /// Contains glue code for integrating reth database into revm's [Database].
 pub mod database;
 
-pub mod batch;
-
 /// Common test helpers
 #[cfg(any(test, feature = "test-utils"))]
 pub mod test_utils;