Made merkle proof memory & bumped version (#104)

dl-solarity · Jun 11, 2024 · 676a5c7 · 676a5c7
1 parent d5a01b8
commit 676a5c7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/contracts/access/MerkleWhitelisted.sol b/contracts/access/MerkleWhitelisted.sol
@@ -22,15 +22,15 @@ abstract contract MerkleWhitelisted {
 
     bytes32 private _merkleRoot;
 
-    modifier onlyWhitelisted(bytes memory data_, bytes32[] calldata merkleProof_) {
+    modifier onlyWhitelisted(bytes memory data_, bytes32[] memory merkleProof_) {
         require(
             isWhitelisted(keccak256(data_), merkleProof_),
             "MerkleWhitelisted: not whitelisted"
         );
         _;
     }
 
-    modifier onlyWhitelistedUser(address user_, bytes32[] calldata merkleProof_) {
+    modifier onlyWhitelistedUser(address user_, bytes32[] memory merkleProof_) {
         require(isWhitelistedUser(user_, merkleProof_), "MerkleWhitelisted: not whitelisted");
         _;
     }
@@ -43,9 +43,9 @@ abstract contract MerkleWhitelisted {
      */
     function isWhitelisted(
         bytes32 leaf_,
-        bytes32[] calldata merkleProof_
+        bytes32[] memory merkleProof_
     ) public view returns (bool) {
-        return merkleProof_.verifyCalldata(_merkleRoot, leaf_);
+        return merkleProof_.verify(_merkleRoot, leaf_);
     }
 
     /**
@@ -56,7 +56,7 @@ abstract contract MerkleWhitelisted {
      */
     function isWhitelistedUser(
         address user_,
-        bytes32[] calldata merkleProof_
+        bytes32[] memory merkleProof_
     ) public view returns (bool) {
         return isWhitelisted(keccak256(abi.encodePacked(user_)), merkleProof_);
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@solarity/solidity-lib",
-  "version": "2.7.7",
+  "version": "2.7.8",
   "license": "MIT",
   "author": "Distributed Lab",
   "readme": "README.md",