Clawback transferer is allowed for to, from and operator

0xsequence · May 23, 2024 · 534ecef · 534ecef
1 parent 578e97b
commit 534ecef
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 42 deletions.
diff --git a/src/tokens/wrappers/clawback/Clawback.sol b/src/tokens/wrappers/clawback/Clawback.sol
@@ -39,10 +39,14 @@ contract Clawback is ERC1155MintBurn, ERC1155Metadata, IClawback {
     }
 
     /// @inheritdoc IClawbackFunctions
-    function wrap(uint24 templateId, TokenType tokenType, address tokenAddr, uint256 tokenId, uint256 amount, address receiver)
-        public
-        returns (uint256 wrappedTokenId)
-    {
+    function wrap(
+        uint24 templateId,
+        TokenType tokenType,
+        address tokenAddr,
+        uint256 tokenId,
+        uint256 amount,
+        address receiver
+    ) public returns (uint256 wrappedTokenId) {
         if (_templates[templateId].admin == address(0)) {
             revert InvalidTemplate();
         }
@@ -181,10 +185,13 @@ contract Clawback is ERC1155MintBurn, ERC1155Metadata, IClawback {
     {
         TokenDetails memory details = _tokenDetails[wrappedTokenId];
         Template memory template = _templates[details.templateId];
-        bool isTransferer = templateTransferers[details.templateId][msg.sender];
-        if (!template.transferOpen && !isTransferer) {
-            // Transfer not allowed
-            revert Unauthorized();
+        if (!template.transferOpen) {
+            bool isTransferer = templateTransferers[details.templateId][msg.sender]
+                || templateTransferers[details.templateId][from] || templateTransferers[details.templateId][to];
+            if (!isTransferer) {
+                // Transfer not allowed
+                revert Unauthorized();
+            }
         }
         super.safeTransferFrom(from, to, wrappedTokenId, amount, data);
     }
@@ -208,10 +215,13 @@ contract Clawback is ERC1155MintBurn, ERC1155Metadata, IClawback {
             uint256 wrappedTokenId = wrappedTokenIds[i];
             TokenDetails memory details = _tokenDetails[wrappedTokenId];
             Template memory template = _templates[details.templateId];
-            bool isTransferer = templateTransferers[details.templateId][msg.sender];
-            if (!template.transferOpen && !isTransferer) {
-                // Transfer not allowed
-                revert Unauthorized();
+            if (!template.transferOpen) {
+                bool isTransferer = templateTransferers[details.templateId][msg.sender]
+                    || templateTransferers[details.templateId][from] || templateTransferers[details.templateId][to];
+                if (!isTransferer) {
+                    // Transfer not allowed
+                    revert Unauthorized();
+                }
             }
         }
         super.safeBatchTransferFrom(from, to, wrappedTokenIds, amounts, data);

diff --git a/src/tokens/wrappers/clawback/IClawback.sol b/src/tokens/wrappers/clawback/IClawback.sol
@@ -35,9 +35,14 @@ interface IClawbackFunctions {
      * @param receiver The receiver of the wrapped token.
      * @return wrappedTokenId The wrapped token ID.
      */
-    function wrap(uint24 templateId, TokenType tokenType, address tokenAddr, uint256 tokenId, uint256 amount, address receiver)
-        external
-        returns (uint256 wrappedTokenId);
+    function wrap(
+        uint24 templateId,
+        TokenType tokenType,
+        address tokenAddr,
+        uint256 tokenId,
+        uint256 amount,
+        address receiver
+    ) external returns (uint256 wrappedTokenId);
 
     /**
      * Unwraps a token.
@@ -103,6 +108,7 @@ interface IClawbackFunctions {
      * @param transferer The address of the transferer.
      * @notice Only the admin of the template can add a transferer.
      * @notice Transferers cannot be removed.
+     * @notice Transfers are allowed when the to, from or operator is a template operator, even when the template is not in transferOpen mode.
      */
     function addTemplateTransferer(uint24 templateId, address transferer) external;