jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: simplify cached db usage (#12242)

Browse Source
This commit is contained in:
Matthias Seitz
2024-11-01 15:17:31 +01:00
committed by GitHub
parent d5a3a3a849
commit eaac2aa2cf
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ethereum/payload/src/lib.rs
View File

@ -161,7 +161,7 @@ where
let state_provider = client.state_by_block_hash(config.parent_header.hash())?;
let state = StateProviderDatabase::new(state_provider);
let mut db =
State::builder().with_database_ref(cached_reads.as_db(state)).with_bundle_update().build();
State::builder().with_database(cached_reads.as_db_mut(state)).with_bundle_update().build();
let PayloadConfig { parent_header, extra_data, attributes } = config;
debug!(target: "payload_builder", id=%attributes.id, parent_header = ?parent_header.hash(), parent_number = parent_header.number, "building new payload");
@ -372,8 +372,7 @@ where
// calculate the state root
let hashed_state = HashedPostState::from_bundle_state(&execution_outcome.state().state);
let (state_root, trie_output) = {
let state_provider = db.database.0.inner.borrow_mut();
state_provider.db.state_root_with_updates(hashed_state.clone()).inspect_err(|err| {
db.database.inner().state_root_with_updates(hashed_state.clone()).inspect_err(|err| {
warn!(target: "payload_builder",
parent_hash=%parent_header.hash(),
%err,

5
crates/optimism/payload/src/builder.rs
View File

@ -170,7 +170,7 @@ where
let state_provider = client.state_by_block_hash(config.parent_header.hash())?;
let state = StateProviderDatabase::new(state_provider);
let mut db =
State::builder().with_database_ref(cached_reads.as_db(state)).with_bundle_update().build();
State::builder().with_database(cached_reads.as_db_mut(state)).with_bundle_update().build();
let PayloadConfig { parent_header, attributes, mut extra_data } = config;
debug!(target: "payload_builder", id=%attributes.payload_attributes.payload_id(), parent_header = ?parent_header.hash(), parent_number = parent_header.number, "building new payload");
@ -445,8 +445,7 @@ where
// calculate the state root
let hashed_state = HashedPostState::from_bundle_state(&execution_outcome.state().state);
let (state_root, trie_output) = {
let state_provider = db.database.0.inner.borrow_mut();
state_provider.db.state_root_with_updates(hashed_state.clone()).inspect_err(|err| {
db.database.inner().state_root_with_updates(hashed_state.clone()).inspect_err(|err| {
warn!(target: "payload_builder",
parent_header=%parent_header.hash(),
%err,

24
crates/revm/src/cached.rs
View File

@ -22,10 +22,10 @@ use reth_primitives::revm_primitives::{
///
/// fn build_payload<DB: DatabaseRef>(db: DB) {
/// let mut cached_reads = CachedReads::default();
/// let db_ref = cached_reads.as_db(db);
/// // this is `Database` and can be used to build a payload, it never writes to `CachedReads` or the underlying database, but all reads from the underlying database are cached in `CachedReads`.
/// let db = cached_reads.as_db_mut(db);
/// // this is `Database` and can be used to build a payload, it never commits to `CachedReads` or the underlying database, but all reads from the underlying database are cached in `CachedReads`.
/// // Subsequent payload build attempts can use cached reads and avoid hitting the underlying database.
/// let db = State::builder().with_database_ref(db_ref).build();
/// let state = State::builder().with_database(db).build();
/// }
/// ```
#[derive(Debug, Clone, Default)]
@ -40,10 +40,11 @@ pub struct CachedReads {
impl CachedReads {
/// Gets a [`DatabaseRef`] that will cache reads from the given database.
pub fn as_db<DB>(&mut self, db: DB) -> CachedReadsDBRef<'_, DB> {
CachedReadsDBRef { inner: RefCell::new(self.as_db_mut(db)) }
self.as_db_mut(db).into_db()
}
fn as_db_mut<DB>(&mut self, db: DB) -> CachedReadsDbMut<'_, DB> {
/// Gets a mutable [`Database`] that will cache reads from the underlying database.
pub fn as_db_mut<DB>(&mut self, db: DB) -> CachedReadsDbMut<'_, DB> {
CachedReadsDbMut { cached: self, db }
}
@ -67,6 +68,19 @@ pub struct CachedReadsDbMut<'a, DB> {
pub db: DB,
}
impl<'a, DB> CachedReadsDbMut<'a, DB> {
/// Converts this [`Database`] implementation into a [`DatabaseRef`] that will still cache
/// reads.
pub const fn into_db(self) -> CachedReadsDBRef<'a, DB> {
CachedReadsDBRef { inner: RefCell::new(self) }
}
/// Returns access to wrapped [`DatabaseRef`].
pub const fn inner(&self) -> &DB {
&self.db
}
}
impl<DB: DatabaseRef> Database for CachedReadsDbMut<'_, DB> {
type Error = <DB as DatabaseRef>::Error;