feat: grant

VWBL · May 1, 2024 · 6010c31 · 6010c31
1 parent a7c5d27
commit 6010c31
Show file tree

Hide file tree

Showing 11 changed files with 229 additions and 2 deletions.
diff --git a/contracts/access-condition/ERC1155/VWBLERC1155.sol b/contracts/access-condition/ERC1155/VWBLERC1155.sol
@@ -16,6 +16,11 @@ contract VWBLERC1155 is Ownable, ERC1155Enumerable, ERC1155Burnable, AbstractVWB
     using SafeMath for uint256;
     using Strings for uint256;
 
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -119,4 +124,25 @@ contract VWBLERC1155 is Ownable, ERC1155Enumerable, ERC1155Burnable, AbstractVWB
             IVWBLGateway(getGatewayAddress()).payFee{value: fee}(tokenIdToTokenInfo[ids[i]].documentId, to);
         }
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(balanceOf(msg.sender, tokenId) > 0, "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC1155/VWBLERC1155ERC2981.sol b/contracts/access-condition/ERC1155/VWBLERC1155ERC2981.sol
@@ -17,6 +17,12 @@ contract VWBLERC1155ERC2981 is Ownable, ERC1155Enumerable, ERC1155Burnable, Abst
     using SafeMath for uint256;
     using Strings for uint256;
 
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -146,4 +152,25 @@ contract VWBLERC1155ERC2981 is Ownable, ERC1155Enumerable, ERC1155Burnable, Abst
     function supportsInterface(bytes4 interfaceId) public view virtual override(ERC1155, ERC2981) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(balanceOf(msg.sender, tokenId) > 0, "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC1155/extensions/VWBLERC1155ERC2981ForMetadata.sol b/contracts/access-condition/ERC1155/extensions/VWBLERC1155ERC2981ForMetadata.sol
@@ -19,6 +19,12 @@ contract VWBLERC1155ERC2981ForMetadata is Ownable, ERC1155Enumerable, ERC1155Bur
 
     mapping(uint256 => string) private _tokenURIs;
 
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
+
     constructor(
         address _gatewayProxy,
         address _accessCheckerContract,
@@ -154,4 +160,25 @@ contract VWBLERC1155ERC2981ForMetadata is Ownable, ERC1155Enumerable, ERC1155Bur
     function supportsInterface(bytes4 interfaceId) public view virtual override(ERC1155, ERC2981) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(balanceOf(msg.sender, tokenId) > 0, "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC6150/ERC6150ParentTransferable.sol b/contracts/access-condition/ERC6150/ERC6150ParentTransferable.sol
@@ -7,7 +7,7 @@ import "./interfaces/IERC6150ParentTransferable.sol";
 abstract contract ERC6150ParentTransferable is ERC6150, IERC6150ParentTransferable {
     function transferParent(uint256 newParentId, uint256 tokenId) public virtual override {
         require(
-            _isApprovedOrOwner(_msgSender(), tokenId),
+            _isApprovedOrOwner(msg.sender, tokenId),
             "ERC6150ParentTransferable: caller is not token owner nor approved"
         );
         if (newParentId != 0) {

diff --git a/contracts/access-condition/ERC6150/VWBLERC6150.sol b/contracts/access-condition/ERC6150/VWBLERC6150.sol
@@ -15,6 +15,11 @@ contract VWBLERC6150 is Ownable, ERC6150ParentTransferable, AbstractVWBLToken {
     using SafeMath for uint256;
     using Strings for uint256;
 
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -57,4 +62,25 @@ contract VWBLERC6150 is Ownable, ERC6150ParentTransferable, AbstractVWBLToken {
     function supportsInterface(bytes4 interfaceId) public view virtual override(IERC165, ERC6150) returns (bool) {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(msg.sender == ownerOf(tokenId), "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC6150/VWBLERC6150ERC2981.sol b/contracts/access-condition/ERC6150/VWBLERC6150ERC2981.sol
@@ -16,6 +16,11 @@ contract VWBLERC6150ERC2981 is Ownable, ERC6150ParentTransferable, AbstractVWBLT
     using SafeMath for uint256;
     using Strings for uint256;
 
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -70,4 +75,25 @@ contract VWBLERC6150ERC2981 is Ownable, ERC6150ParentTransferable, AbstractVWBLT
     {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(msg.sender == ownerOf(tokenId), "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC721/AccessControlCheckerByNFT.sol b/contracts/access-condition/ERC721/AccessControlCheckerByNFT.sol
@@ -71,7 +71,11 @@ contract AccessControlCheckerByNFT is AbstractControlChecker, Ownable {
      * @param documentId The Identifier of digital content and decryption key
      */
     function checkAccessControl(address user, bytes32 documentId) external view returns (bool) {
-        return false;
+        Token memory token = documentIdToToken[documentId];
+        try  IVWBL(token.contractAddress).checkViewPermission(token.tokenId, user) returns (bool result) {
+        } catch {
+            return false;
+        }
     }
 
     /**

diff --git a/contracts/access-condition/ERC721/VWBLERC721.sol b/contracts/access-condition/ERC721/VWBLERC721.sol
@@ -14,6 +14,11 @@ import "../AbstractVWBLToken.sol";
  * @dev NFT which is added Viewable features that only NFT Owner can view digital content
  */
 contract VWBLERC721 is Ownable, AbstractVWBLToken, ERC721Enumerable {
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -47,4 +52,25 @@ contract VWBLERC721 is Ownable, AbstractVWBLToken, ERC721Enumerable {
 
         return tokenId;
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(msg.sender == ownerOf(tokenId), "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC721/VWBLERC721ERC2981.sol b/contracts/access-condition/ERC721/VWBLERC721ERC2981.sol
@@ -13,6 +13,11 @@ import "../AbstractVWBLToken.sol";
  * @dev NFT which is added Viewable features that only NFT Owner can view digital content
  */
 contract VWBLERC721ERC2981 is Ownable, AbstractVWBLToken, ERC721Enumerable, ERC2981 {
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
+
     constructor(
         string memory _baseURI,
         address _gatewayProxy,
@@ -68,4 +73,25 @@ contract VWBLERC721ERC2981 is Ownable, AbstractVWBLToken, ERC721Enumerable, ERC2
     {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(msg.sender == ownerOf(tokenId), "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/ERC721/extensions/VWBLERC721ERC2981ForMetadata.sol b/contracts/access-condition/ERC721/extensions/VWBLERC721ERC2981ForMetadata.sol
@@ -14,6 +14,10 @@ import "../../AbstractVWBLToken.sol";
  */
 contract VWBLERC721ERC2981ForMetadata is Ownable, AbstractVWBLToken, ERC721Enumerable, ERC2981 {
     mapping(uint256 => string) private _tokenURIs;
+    // tokenId => grantee => bool
+    mapping (uint256 => mapping (address => bool)) public hasViewRight;
+
+    event ViewRightGranted(uint256 tokenId, address grantee);
 
     constructor(
         address _gatewayProxy,
@@ -71,4 +75,25 @@ contract VWBLERC721ERC2981ForMetadata is Ownable, AbstractVWBLToken, ERC721Enume
     {
         return super.supportsInterface(interfaceId);
     }
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) public returns (uint256) {
+        require(msg.sender == ownerOf(tokenId), "msg sender is not nft owner");
+        hasViewRight[tokenId][grantee] = true;
+        emit ViewRightGranted(tokenId, grantee);
+        return tokenId;
+    }
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) public view returns (bool) {
+        return hasViewRight[tokenId][user];
+    }
 }
diff --git a/contracts/access-condition/IVWBL.sol b/contracts/access-condition/IVWBL.sol
@@ -43,4 +43,18 @@ interface IVWBL {
      * @param minter The minter of NFT
      */
     function getTokenByMinter(address minter) external view returns (uint256[] memory);
+
+    /**
+     * @notice Grant view permission to grantee from nft owner
+     * @param tokenId The identifier of NFT
+     * @param grantee The Address who grantee of view permission right 
+     */
+    function grantViewPermission(uint256 tokenId, address grantee) external returns (uint256);
+
+    /**
+     * @notice Check view permission to user
+     * @param tokenId The Identifier of NFT
+     * @param user The address of verification target
+     */
+    function checkViewPermission(uint256 tokenId, address user) external view returns (bool);
 }