github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-09 23:38:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Deduplicate hashed storage preparation in MemoryOverlayStateProvider (#19087)

Browse Source
This commit is contained in:
leopardracer
2025-10-17 18:48:22 +03:00
committed by GitHub
parent d1f6637a5a
commit 6a918f4cab
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/chain-state/src/memory_overlay.rs
View File

@@ -61,6 +61,13 @@ impl<'a, N: NodePrimitives> MemoryOverlayStateProviderRef<'a, N> {
)
})
}
fn merged_hashed_storage(&self, address: Address, storage: HashedStorage) -> HashedStorage {
let state = &self.trie_input().state;
let mut hashed = state.storages.get(&keccak256(address)).cloned().unwrap_or_default();
hashed.extend(&storage);
hashed
}
}
impl<N: NodePrimitives> BlockHashReader for MemoryOverlayStateProviderRef<'_, N> {
@@ -145,11 +152,8 @@ impl<N: NodePrimitives> StateRootProvider for MemoryOverlayStateProviderRef<'_,
impl<N: NodePrimitives> StorageRootProvider for MemoryOverlayStateProviderRef<'_, N> {
// TODO: Currently this does not reuse available in-memory trie nodes.
fn storage_root(&self, address: Address, storage: HashedStorage) -> ProviderResult<B256> {
let state = &self.trie_input().state;
let mut hashed_storage =
state.storages.get(&keccak256(address)).cloned().unwrap_or_default();
hashed_storage.extend(&storage);
self.historical.storage_root(address, hashed_storage)
let merged = self.merged_hashed_storage(address, storage);
self.historical.storage_root(address, merged)
}
// TODO: Currently this does not reuse available in-memory trie nodes.
@@ -159,11 +163,8 @@ impl<N: NodePrimitives> StorageRootProvider for MemoryOverlayStateProviderRef<'_
slot: B256,
storage: HashedStorage,
) -> ProviderResult<reth_trie::StorageProof> {
let state = &self.trie_input().state;
let mut hashed_storage =
state.storages.get(&keccak256(address)).cloned().unwrap_or_default();
hashed_storage.extend(&storage);
self.historical.storage_proof(address, slot, hashed_storage)
let merged = self.merged_hashed_storage(address, storage);
self.historical.storage_proof(address, slot, merged)
}
// TODO: Currently this does not reuse available in-memory trie nodes.
@@ -173,11 +174,8 @@ impl<N: NodePrimitives> StorageRootProvider for MemoryOverlayStateProviderRef<'_
slots: &[B256],
storage: HashedStorage,
) -> ProviderResult<StorageMultiProof> {
let state = &self.trie_input().state;
let mut hashed_storage =
state.storages.get(&keccak256(address)).cloned().unwrap_or_default();
hashed_storage.extend(&storage);
self.historical.storage_multiproof(address, slots, hashed_storage)
let merged = self.merged_hashed_storage(address, storage);
self.historical.storage_multiproof(address, slots, merged)
}
}