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

feat(trie): hashed state from cache (#10455)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-08-22 11:42:17 -07:00
committed by GitHub
parent ed6ee0c04b
commit ae0c7beb28
2 changed files with 47 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
crates/trie/trie/src/state.rs
View File

@ -5,7 +5,7 @@ use crate::{
use itertools::Itertools;
use rayon::prelude::{IntoParallelIterator, ParallelIterator};
use reth_primitives::{keccak256, Account, Address, B256, U256};
use revm::db::{states::StorageSlot, AccountStatus, BundleAccount};
use revm::db::{states::CacheAccount, AccountStatus, BundleAccount};
use std::collections::{hash_map, HashMap, HashSet};
/// Representation of in-memory hashed state.
@ -29,8 +29,37 @@ impl HashedPostState {
.map(|(address, account)| {
let hashed_address = keccak256(address);
let hashed_account = account.info.clone().map(Into::into);
let hashed_storage =
HashedStorage::from_bundle_state(account.status, &account.storage);
let hashed_storage = HashedStorage::from_plain_storage(
account.status,
account.storage.iter().map(|(slot, value)| (slot, &value.present_value)),
);
(hashed_address, (hashed_account, hashed_storage))
})
.collect::<Vec<(B256, (Option<Account>, HashedStorage))>>();
let mut accounts = HashMap::with_capacity(hashed.len());
let mut storages = HashMap::with_capacity(hashed.len());
for (address, (account, storage)) in hashed {
accounts.insert(address, account);
storages.insert(address, storage);
}
Self { accounts, storages }
}
/// Initialize [`HashedPostState`] from cached state.
/// Hashes all changed accounts and storage entries that are currently stored in cache.
pub fn from_cache_state<'a>(
state: impl IntoParallelIterator<Item = (&'a Address, &'a CacheAccount)>,
) -> Self {
let hashed = state
.into_par_iter()
.map(|(address, account)| {
let hashed_address = keccak256(address);
let hashed_account = account.account.as_ref().map(|a| a.info.clone().into());
let hashed_storage = HashedStorage::from_plain_storage(
account.status,
account.account.as_ref().map(|a| a.storage.iter()).into_iter().flatten(),
);
(hashed_address, (hashed_account, hashed_storage))
})
.collect::<Vec<(B256, (Option<Account>, HashedStorage))>>();
@ -155,13 +184,15 @@ impl HashedStorage {
Self { wiped, storage: HashMap::from_iter(iter) }
}
/// Create new hashed storage from bundle state account entry.
pub fn from_bundle_state(status: AccountStatus, storage: &HashMap<U256, StorageSlot>) -> Self {
let storage = storage
.iter()
.map(|(key, value)| (keccak256(B256::from(*key)), value.present_value))
.collect();
Self { wiped: status.was_destroyed(), storage }
/// Create new hashed storage from account status and plain storage.
pub fn from_plain_storage<'a>(
status: AccountStatus,
storage: impl IntoIterator<Item = (&'a U256, &'a U256)>,
) -> Self {
Self::from_iter(
status.was_destroyed(),
storage.into_iter().map(|(key, value)| (keccak256(B256::from(*key)), *value)),
)
}
/// Construct [`PrefixSetMut`] from hashed storage.