mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-03 00:31:50 +00:00
Fix light client merkle proofs (#7007)
Fix a regression introduced in this PR: - https://github.com/sigp/lighthouse/pull/6361 We were indexing into the `MerkleTree` with raw generalized indices, which was incorrect and triggering `debug_assert` failures, as described here: - https://github.com/sigp/lighthouse/issues/7005 - Convert `generalized_index` to the correct leaf index prior to proof generation. - Add sanity checks on indices used in `BeaconState::generate_proof`. - Remove debug asserts from `MerkleTree::generate_proof` in favour of actual errors. This would have caught the bug earlier. - Refactor the EF tests so that the merkle validity tests are actually run. They were misconfigured in a way that resulted in them running silently with 0 test cases, and the `check_all_files_accessed.py` script still had an ignore that covered the test files, so this omission wasn't detected.
This commit is contained in:
@@ -34,6 +34,8 @@ pub enum MerkleTree {
|
||||
pub enum MerkleTreeError {
|
||||
// Trying to push in a leaf
|
||||
LeafReached,
|
||||
// Trying to generate a proof for a non-leaf node
|
||||
NonLeafProof,
|
||||
// No more space in the MerkleTree
|
||||
MerkleTreeFull,
|
||||
// MerkleTree is invalid
|
||||
@@ -313,8 +315,17 @@ impl MerkleTree {
|
||||
current_depth -= 1;
|
||||
}
|
||||
|
||||
debug_assert_eq!(proof.len(), depth);
|
||||
debug_assert!(current_node.is_leaf());
|
||||
if proof.len() != depth {
|
||||
// This should be unreachable regardless of how the method is called, because we push
|
||||
// one proof element for each layer of `depth`.
|
||||
return Err(MerkleTreeError::PleaseNotifyTheDevs);
|
||||
}
|
||||
|
||||
// Generating a proof for a non-leaf node is invalid and indicates an error on the part of
|
||||
// the caller.
|
||||
if !current_node.is_leaf() {
|
||||
return Err(MerkleTreeError::NonLeafProof);
|
||||
}
|
||||
|
||||
// Put proof in bottom-up order.
|
||||
proof.reverse();
|
||||
|
||||
Reference in New Issue
Block a user