Skip to content

fix(trie): proof generation shouldnt encode private bit #303

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

Open
samlaf wants to merge 1 commit into
base: seismic
Choose a base branch
from
Open

fix(trie): proof generation shouldnt encode private bit #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion crates/trie/trie/src/proof/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ where
TrieElement::Leaf(hashed_slot, value) => {
hash_builder.add_leaf(
Nibbles::unpack(hashed_slot),
alloy_rlp::encode_fixed_size(&value).as_ref(),
alloy_rlp::encode_fixed_size(&value.value).as_ref(),
value.is_private,
);
}
Expand Down
2 changes: 1 addition & 1 deletion crates/trie/trie/src/test_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ pub fn storage_root_privacy_aware<
// Add each storage entry to the hash builder with privacy awareness
for (hashed_key, flagged_storage) in storage_entries {
let nibbles = Nibbles::unpack(hashed_key);
let encoded_value = encode_fixed_size(&flagged_storage);
let encoded_value = encode_fixed_size(&flagged_storage.value);
hash_builder.add_leaf(nibbles, &encoded_value, flagged_storage.is_private());
}

Expand Down
2 changes: 1 addition & 1 deletion crates/trie/trie/src/trie.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ where
hashed_entries_walked += 1;
hash_builder.add_leaf(
Nibbles::unpack(hashed_slot),
alloy_rlp::encode_fixed_size(&value).as_ref(),
alloy_rlp::encode_fixed_size(&value.value).as_ref(),
value.is_private,
);

Expand Down
2 changes: 1 addition & 1 deletion crates/trie/trie/src/witness.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ where
storage.and_then(|s| s.storage.get(&hashed_slot)).filter(|v| !v.is_zero());
if let Some(value) = maybe_leaf_value {
let is_private = value.is_private;
let value = alloy_rlp::encode_fixed_size(value).to_vec();
let value = alloy_rlp::encode_fixed_size(&value.value).to_vec();
storage_trie
.update_leaf(storage_nibbles, value, is_private, &provider)
.map_err(|err| {
Expand Down
Loading