Skip to content

Feature/safe get #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 24, 2018
Merged

Feature/safe get #3

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9729b4f
Add safe get
wanseob Nov 24, 2018
acb3c72
Add require statement to protect from returning an invalid value
wanseob Nov 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Add require statement to protect from returning an invalid value
  • Loading branch information
@wanseob
wanseob committed Nov 24, 2018
commit acb3c723b2c25b37c38568a2e02832d1639e364e
5 changes: 3 additions & 2 deletions contracts/tree.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,11 @@ library PartialMerkleTree {
return getValue(tree, _findNode(tree, key));
}

function safeGet(Tree storage tree, bytes key) internal view returns (bytes) {
function safeGet(Tree storage tree, bytes key) internal view returns (bytes value) {
bytes32 valueHash = _findNode(tree, key);
require(valueHash != bytes32(0));
return getValue(tree, valueHash);
value = getValue(tree, valueHash);
require(valueHash == keccak256(value));
}

function doesInclude(Tree storage tree, bytes key) internal view returns (bool) {
Expand Down