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

fix(trie): always create empty storage multiproofs (#12915)

Browse Source
This commit is contained in:
Roman Krasiuk
2024-11-28 14:01:57 +01:00
committed by GitHub
parent 1d5bd46594
commit eac02d9458
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/trie/common/src/proofs.rs
View File

@ -2,7 +2,11 @@
use crate::{Nibbles, TrieAccount};
use alloy_consensus::constants::KECCAK_EMPTY;
use alloy_primitives::{keccak256, Address, Bytes, B256, U256};
use alloy_primitives::{
keccak256,
map::{hash_map, HashMap},
Address, Bytes, B256, U256,
};
use alloy_rlp::{encode_fixed_size, Decodable, EMPTY_STRING_CODE};
use alloy_trie::{
nodes::TrieNode,
@ -11,7 +15,6 @@ use alloy_trie::{
};
use itertools::Itertools;
use reth_primitives_traits::Account;
use std::collections::{hash_map, HashMap};
/// The state multiproof of target accounts and multiproofs of their storage tries.
/// Multiproof is effectively a state subtrie that only contains the nodes

7
crates/trie/trie/src/proof.rs
View File

@ -103,7 +103,10 @@ where
let retainer = targets.keys().map(Nibbles::unpack).collect();
let mut hash_builder = HashBuilder::default().with_proof_retainer(retainer);
let mut storages = HashMap::default();
// Initialize all storage multiproofs as empty.
// Storage multiproofs for non empty tries will be overwritten if necessary.
let mut storages: HashMap<_, _> =
targets.keys().map(|key| (*key, StorageMultiProof::empty())).collect();
let mut account_rlp = Vec::with_capacity(TRIE_ACCOUNT_RLP_MAX_SIZE);
let mut account_node_iter = TrieNodeIter::new(walker, hashed_account_cursor);
while let Some(account_node) = account_node_iter.try_next()? {
@ -132,6 +135,8 @@ where
account.encode(&mut account_rlp as &mut dyn BufMut);
hash_builder.add_leaf(Nibbles::unpack(hashed_address), &account_rlp);
// Overwrite storage multiproof.
storages.insert(hashed_address, storage_multiproof);
}
}