NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix indentation in MerkleProof.sol and remove mock contract

Browse Source
This commit is contained in:
Yondon Fu
2017-06-15 11:10:37 -04:00
parent 2e0bd06da2
commit 30e202313d
2 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
contracts/MerkleProof.sol
View File

@ -6,33 +6,33 @@ pragma solidity ^0.4.11;
* @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol
*/ */
library MerkleProof { library MerkleProof {
/* /*
* @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
* and each pair of pre-images is sorted. * and each pair of pre-images is sorted.
* @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
* @param _root Merkle root * @param _root Merkle root
* @param _leaf Leaf of Merkle tree * @param _leaf Leaf of Merkle tree
*/ */
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) constant returns (bool) { function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) constant returns (bool) {
bytes32 proofElement; bytes32 proofElement;
bytes32 computedHash = _leaf; bytes32 computedHash = _leaf;
for (uint256 i = 32; i <= _proof.length; i += 32) { for (uint256 i = 32; i <= _proof.length; i += 32) {
assembly { assembly {
// Load the current element of the proof // Load the current element of the proof
proofElement := mload(add(_proof, i)) proofElement := mload(add(_proof, i))
} }
if (computedHash < proofElement) { if (computedHash < proofElement) {
// Hash(current computed hash + current element of the proof) // Hash(current computed hash + current element of the proof)
computedHash = sha3(computedHash, proofElement); computedHash = sha3(computedHash, proofElement);
} else { } else {
// Hash(current element of the proof + current computed hash) // Hash(current element of the proof + current computed hash)
computedHash = sha3(proofElement, computedHash); computedHash = sha3(proofElement, computedHash);
} }
}
// Check if the computed hash (root) is equal to the provided root
return computedHash == _root;
} }
// Check if the computed hash (root) is equal to the provided root
return computedHash == _root;
}
} }

12
test/helpers/MerkleProofMock.sol
View File

@ -1,12 +0,0 @@
pragma solidity ^0.4.11;
import '../../contracts/MerkleProof.sol';
contract MerkleProofMock {
bool public result;
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) {
result = MerkleProof.verifyProof(_proof, _root, _leaf);
}
}