Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(trie): simplify hashed post state partitioning #14892

Merged
merged 8 commits into from
Mar 13, 2025
Merged

chore(trie): simplify hashed post state partitioning #14892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0ead25c
chore(trie): simplify hashed post state partitioning
shekhirin Mar 7, 2025
bf14433
fix test
shekhirin Mar 7, 2025
313cf79
Merge remote-tracking branch 'origin/main' into alexey/hashed-state-p…
shekhirin Mar 7, 2025
b7033ed
trace log when account isn't found in trie
shekhirin Mar 7, 2025
6dc8a94
Merge remote-tracking branch 'origin/main' into alexey/hashed-state-p…
shekhirin Mar 7, 2025
7ab5d37
revertme: log storages without accounts
shekhirin Mar 7, 2025
e32027f
add updated leaves to the list of revealed paths
shekhirin Mar 7, 2025
79c1d85
Revert "revertme: log storages without accounts"
shekhirin Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions crates/engine/tree/src/tree/payload_processor/multiproof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,8 +731,7 @@ where
);
}
MultiProofMessage::StateUpdate(source, update) => {
trace!(target: "engine::root", "processing
MultiProofMessage::StateUpdate");
trace!(target: "engine::root", "processing MultiProofMessage::StateUpdate");
if state_update_proofs_requested == 0 {
first_update_time = Some(Instant::now());
debug!(target: "engine::root", "Started state root calculation");
Expand Down
12 changes: 2 additions & 10 deletions crates/trie/common/src/hashed_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,6 @@ impl HashedPostState {

if let Some(storage_not_in_targets) = storage_not_in_targets {
state_updates_not_in_targets.storages.insert(address, storage_not_in_targets);

// Storage update should have an associated account, if it exists.
if let Some(account) = self.accounts.remove(&address) {
state_updates_not_in_targets.accounts.insert(address, account);
}
}

retain
Expand Down Expand Up @@ -948,7 +943,7 @@ mod tests {
assert_eq!(
with_targets,
HashedPostState {
accounts: B256Map::default(),
accounts: B256Map::from_iter([(addr1, Some(Default::default()))]),
storages: B256Map::from_iter([(
addr1,
HashedStorage {
Expand All @@ -961,10 +956,7 @@ mod tests {
assert_eq!(
without_targets,
HashedPostState {
accounts: B256Map::from_iter([
(addr1, Some(Default::default())),
(addr2, Some(Default::default()))
]),
accounts: B256Map::from_iter([(addr2, Some(Default::default()))]),
storages: B256Map::from_iter([(
addr1,
HashedStorage {
Expand Down
9 changes: 9 additions & 0 deletions crates/trie/sparse/src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,10 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> {
path: Nibbles,
value: Vec<u8>,
) -> SparseStateTrieResult<()> {
if !self.revealed_account_paths.contains(&path) {
self.revealed_account_paths.insert(path.clone());
}

self.state.update_leaf(path, value)?;
Ok(())
}
Expand All @@ -591,6 +595,10 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> {
slot: Nibbles,
value: Vec<u8>,
) -> SparseStateTrieResult<()> {
if !self.revealed_storage_paths.get(&address).is_some_and(|slots| slots.contains(&slot)) {
self.revealed_storage_paths.entry(address).or_default().insert(slot.clone());
}

let storage_trie = self.storages.get_mut(&address).ok_or(SparseTrieErrorKind::Blind)?;
storage_trie.update_leaf(slot, value)?;
Ok(())
Expand Down Expand Up @@ -648,6 +656,7 @@ impl<F: BlindedProviderFactory> SparseStateTrie<F> {
.map(|v| TrieAccount::decode(&mut &v[..]))
.transpose()?
else {
trace!(target: "trie::sparse", ?address, "Account not found in trie, skipping storage root update");
return Ok(())
};

Expand Down
Loading