fix: improve leaf index validation #227
Open
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With the stronger fuzzer introduced in Foundry v1.5.0, a new failing fuzz case was detected in:
Merkle.getHashOfLeafAtIndex(bytes calldata data, uint256 leafIndex)The issue is caused by this line:
uint256 start = leafIndex << MerkleConstants.LOG2_LEAF_SIZE;For very large leafIndex values, this shift can silently wrap around modulo
2^256, making start small again. This may cause the condition start < data.length to incorrectly pass, leading to an invalid hash being returned instead of the pristine leaf.Although this does not affect deployed contracts (where leafIndex is safely bounded), it breaks fuzz tests on Foundry v1.5.0.
This PR adds a reversible shift check to prevent wrap-around:
if (start < data.length && (start >> MerkleConstants.LOG2_LEAF_SIZE) == leafIndex)This guarantees that the shift did not overflow and restores correct behavior under fuzzing.