Skip to content

Commit 676a5c7

Browse files
authored
Made merkle proof memory & bumped version (#104)
1 parent d5a01b8 commit 676a5c7

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

contracts/access/MerkleWhitelisted.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ abstract contract MerkleWhitelisted {
2222

2323
bytes32 private _merkleRoot;
2424

25-
modifier onlyWhitelisted(bytes memory data_, bytes32[] calldata merkleProof_) {
25+
modifier onlyWhitelisted(bytes memory data_, bytes32[] memory merkleProof_) {
2626
require(
2727
isWhitelisted(keccak256(data_), merkleProof_),
2828
"MerkleWhitelisted: not whitelisted"
2929
);
3030
_;
3131
}
3232

33-
modifier onlyWhitelistedUser(address user_, bytes32[] calldata merkleProof_) {
33+
modifier onlyWhitelistedUser(address user_, bytes32[] memory merkleProof_) {
3434
require(isWhitelistedUser(user_, merkleProof_), "MerkleWhitelisted: not whitelisted");
3535
_;
3636
}
@@ -43,9 +43,9 @@ abstract contract MerkleWhitelisted {
4343
*/
4444
function isWhitelisted(
4545
bytes32 leaf_,
46-
bytes32[] calldata merkleProof_
46+
bytes32[] memory merkleProof_
4747
) public view returns (bool) {
48-
return merkleProof_.verifyCalldata(_merkleRoot, leaf_);
48+
return merkleProof_.verify(_merkleRoot, leaf_);
4949
}
5050

5151
/**
@@ -56,7 +56,7 @@ abstract contract MerkleWhitelisted {
5656
*/
5757
function isWhitelistedUser(
5858
address user_,
59-
bytes32[] calldata merkleProof_
59+
bytes32[] memory merkleProof_
6060
) public view returns (bool) {
6161
return isWhitelisted(keccak256(abi.encodePacked(user_)), merkleProof_);
6262
}

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@solarity/solidity-lib",
3-
"version": "2.7.7",
3+
"version": "2.7.8",
44
"license": "MIT",
55
"author": "Distributed Lab",
66
"readme": "README.md",

0 commit comments

Comments
 (0)