gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: remove allocations from merkle tree proof verification logic (#8614)

Browse Source 
This PR does two small things:

- Removes the allocations that were happening on each loop
- Makes it more explicit that the bit in the index is only being used to specify the order of the inputs for the hash function


  


Co-Authored-By: Kevaundray Wedderburn <kevtheappdev@gmail.com>
This commit is contained in:
kevaundray
2026-01-05 06:11:58 +00:00
committed by GitHub
parent 9b3d7e3a54
commit ea811d66c2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
consensus/merkle_proof/src/lib.rs
View File

@@ -1,4 +1,4 @@
use ethereum_hashing::{ZERO_HASHES, hash, hash32_concat}; use ethereum_hashing::{ZERO_HASHES, hash32_concat};
use safe_arith::ArithError; use safe_arith::ArithError;
use std::sync::LazyLock; use std::sync::LazyLock;
@@ -382,20 +382,19 @@ pub fn verify_merkle_proof(
pub fn merkle_root_from_branch(leaf: H256, branch: &[H256], depth: usize, index: usize) -> H256 { pub fn merkle_root_from_branch(leaf: H256, branch: &[H256], depth: usize, index: usize) -> H256 {
assert_eq!(branch.len(), depth, "proof length should equal depth"); assert_eq!(branch.len(), depth, "proof length should equal depth");
let mut merkle_root = leaf.as_slice().to_vec(); let mut merkle_root = leaf.0;
for (i, leaf) in branch.iter().enumerate().take(depth) { for (i, branch_node) in branch.iter().enumerate().take(depth) {
let ith_bit = (index >> i) & 0x01; let ith_bit = (index >> i) & 0x01;
if ith_bit == 1 { let (left, right) = if ith_bit == 1 {
merkle_root = hash32_concat(leaf.as_slice(), &merkle_root)[..].to_vec(); (branch_node.as_slice(), merkle_root.as_slice())
} else { } else {
let mut input = merkle_root; (merkle_root.as_slice(), branch_node.as_slice())
input.extend_from_slice(leaf.as_slice()); };
merkle_root = hash(&input); merkle_root = hash32_concat(left, right);
}
} }
H256::from_slice(&merkle_root) H256::from(merkle_root)
} }
impl From<ArithError> for MerkleTreeError { impl From<ArithError> for MerkleTreeError {