[L-4] Wrong function selector returned for the transfer validation function (#150)

* [L-4] Wrong function selector returned for the transfer validation function

* [Q-3] Move interface identifier for ERC165 to Core

* [Q-5] Royalty modules should inherit ICreatorToken interface

* [Q-6] Nitpicks

Author: GWSzeto

src/Core.sol

@@ -150,6 +150,10 @@ abstract contract Core is ICore, OwnableRoles, ReentrancyGuard {
         if (interfaceId == 0xffffffff) {
             return false;
         }
+        if (interfaceId == 0x01ffc9a7) {
+            // ERC165 Interface ID for ERC165
+            return true;
+        }
         if (supportedInterfaceRefCounter[interfaceId] > 0) {
             return true;
         }

src/core/token/ERC1155Core.sol

@@ -109,8 +109,7 @@ contract ERC1155Core is ERC1155, Core, Multicallable {
      *  @param interfaceId The interface ID of the interface to check for
      */
     function supportsInterface(bytes4 interfaceId) public view override(ERC1155, Core) returns (bool) {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0xd9b67a26 // ERC165 Interface ID for ERC1155
+        return interfaceId == 0xd9b67a26 // ERC165 Interface ID for ERC1155
             || interfaceId == 0x0e89341c // ERC165 Interface ID for ERC1155MetadataURI
             || interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173

src/core/token/ERC1155CoreInitializable.sol

@@ -114,8 +114,7 @@ contract ERC1155CoreInitializable is ERC1155, Core, Multicallable, Initializable
      *  @param interfaceId The interface ID of the interface to check for
      */
     function supportsInterface(bytes4 interfaceId) public view override(ERC1155, Core) returns (bool) {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0xd9b67a26 // ERC165 Interface ID for ERC1155
+        return interfaceId == 0xd9b67a26 // ERC165 Interface ID for ERC1155
             || interfaceId == 0x0e89341c // ERC165 Interface ID for ERC1155MetadataURI
             || interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173

src/core/token/ERC20Core.sol

@@ -5,7 +5,6 @@ import {Core} from "../../Core.sol";
 
 import {ERC20} from "@solady/tokens/ERC20.sol";
 import {Multicallable} from "@solady/utils/Multicallable.sol";
-import {ReentrancyGuard} from "@solady/utils/ReentrancyGuard.sol";
 
 import {IERC20} from "../../interface/IERC20.sol";
 
@@ -111,8 +110,7 @@ contract ERC20Core is ERC20, Multicallable, Core {
 
     /// @notice Returns whether a given interface is implemented by the contract.
     function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0xe8a3d485 // ERC-7572
+        return interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173
             || interfaceId == type(IERC20).interfaceId || _supportsInterfaceViaModules(interfaceId);
     }

src/core/token/ERC20CoreInitializable.sol

@@ -116,8 +116,7 @@ contract ERC20CoreInitializable is ERC20, Core, Multicallable, Initializable {
 
     /// @notice Returns whether a given interface is implemented by the contract.
     function supportsInterface(bytes4 interfaceId) public view override returns (bool) {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0xe8a3d485 // ERC-7572
+        return interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173
             || interfaceId == type(IERC20).interfaceId || _supportsInterfaceViaModules(interfaceId);
     }

src/core/token/ERC721Core.sol

@@ -90,8 +90,7 @@ contract ERC721Core is ERC721AQueryable, Core, Multicallable {
      *  @param interfaceId The interface ID of the interface to check for
      */
     function supportsInterface(bytes4 interfaceId) public view override(ERC721A, IERC721A, Core) returns (bool) {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0x80ac58cd // ERC165 Interface ID for ERC721
+        return interfaceId == 0x80ac58cd // ERC165 Interface ID for ERC721
             || interfaceId == 0x5b5e139f // ERC165 Interface ID for ERC721Metadata
             || interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173

src/core/token/ERC721CoreInitializable.sol

@@ -110,8 +110,7 @@ contract ERC721CoreInitializable is ERC721AQueryableUpgradeable, Core, Multicall
         override(ERC721AUpgradeable, IERC721AUpgradeable, Core)
         returns (bool)
     {
-        return interfaceId == 0x01ffc9a7 // ERC165 Interface ID for ERC165
-            || interfaceId == 0x80ac58cd // ERC165 Interface ID for ERC721
+        return interfaceId == 0x80ac58cd // ERC165 Interface ID for ERC721
             || interfaceId == 0x5b5e139f // ERC165 Interface ID for ERC721Metadata
             || interfaceId == 0xe8a3d485 // ERC-7572
             || interfaceId == 0x7f5828d0 // ERC-173

src/module/token/royalty/RoyaltyERC1155.sol

@@ -44,7 +44,8 @@ contract RoyaltyERC1155 is
     Module,
     IInstallationCallback,
     BeforeTransferCallbackERC1155,
-    BeforeBatchTransferCallbackERC1155
+    BeforeBatchTransferCallbackERC1155,
+    ICreatorToken
 {
 
     /*//////////////////////////////////////////////////////////////
@@ -71,9 +72,6 @@ contract RoyaltyERC1155 is
     /// @notice Emitted when the royalty info for a specific NFT is updated.
     event TokenRoyaltyUpdated(uint256 indexed tokenId, address indexed recipient, uint16 bps);
 
-    /// @notice Emitted when the transfer validator is updated.
-    event TransferValidatorUpdated(address oldValidator, address newValidator);
-
     /*//////////////////////////////////////////////////////////////
                                ERRORS
     //////////////////////////////////////////////////////////////*/
@@ -118,6 +116,11 @@ contract RoyaltyERC1155 is
         config.supportedInterfaces = new bytes4[](1);
         config.supportedInterfaces[0] = 0x2a55205a; // IERC2981.
 
+        config.supportedInterfaces = new bytes4[](3);
+        config.supportedInterfaces[0] = 0x2a55205a; // IERC2981.
+        config.supportedInterfaces[1] = 0xad0d7f6c; // ICreatorToken
+        config.supportedInterfaces[2] = 0xa07d229a; // ICreatorTokenLegacy
+
         config.registerInstallationCallback = true;
     }
 
@@ -234,7 +237,7 @@ contract RoyaltyERC1155 is
 
     /// @notice Returns the transfer validator contract address for this token contract.
     function getTransferValidator() public view returns (address validator) {
-        return _royaltyStorage().transferValidator;
+        validator = _royaltyStorage().transferValidator;
     }
 
     /**

src/module/token/royalty/RoyaltyERC721.sol

@@ -39,7 +39,7 @@ library RoyaltyStorage {
 
 }
 
-contract RoyaltyERC721 is Module, IInstallationCallback, BeforeTransferCallbackERC721 {
+contract RoyaltyERC721 is Module, IInstallationCallback, BeforeTransferCallbackERC721, ICreatorToken {
 
     /*//////////////////////////////////////////////////////////////
                                 STRUCTS
@@ -65,9 +65,6 @@ contract RoyaltyERC721 is Module, IInstallationCallback, BeforeTransferCallbackE
     /// @notice Emitted when the royalty info for a specific NFT is updated.
     event TokenRoyaltyUpdated(uint256 indexed tokenId, address indexed recipient, uint16 bps);
 
-    /// @notice Emitted when the transfer validator is updated.
-    event TransferValidatorUpdated(address oldValidator, address newValidator);
-
     /*//////////////////////////////////////////////////////////////
                                ERRORS
     //////////////////////////////////////////////////////////////*/
@@ -108,8 +105,10 @@ contract RoyaltyERC721 is Module, IInstallationCallback, BeforeTransferCallbackE
         config.requiredInterfaces = new bytes4[](1);
         config.requiredInterfaces[0] = 0x80ac58cd; // ERC721.
 
-        config.supportedInterfaces = new bytes4[](1);
+        config.supportedInterfaces = new bytes4[](3);
         config.supportedInterfaces[0] = 0x2a55205a; // IERC2981.
+        config.supportedInterfaces[1] = 0xad0d7f6c; // ICreatorToken
+        config.supportedInterfaces[2] = 0xa07d229a; // ICreatorTokenLegacy
 
         config.registerInstallationCallback = true;
     }
@@ -212,7 +211,7 @@ contract RoyaltyERC721 is Module, IInstallationCallback, BeforeTransferCallbackE
 
     /// @notice Returns the transfer validator contract address for this token contract.
     function getTransferValidator() public view returns (address validator) {
-        return _royaltyStorage().transferValidator;
+        validator = _royaltyStorage().transferValidator;
     }
 
     /**

src/module/token/transferable/CreatorTokenERC20.sol

@@ -83,15 +83,15 @@ contract CreatorTokenERC20 is Module, BeforeTransferCallbackERC20, ICreatorToken
 
     /// @notice Returns the transfer validator contract address for this token contract.
     function getTransferValidator() public view returns (address validator) {
-        return _creatorTokenStorage().transferValidator;
+        validator = _creatorTokenStorage().transferValidator;
     }
 
     /**
      * @notice Returns the function selector for the transfer validator's validation function to be called
      * @notice for transaction simulation.
      */
     function getTransferValidationFunction() external pure returns (bytes4 functionSignature, bool isViewFunction) {
-        functionSignature = bytes4(keccak256("validateTransfer(address,address,address,uint256, uint256)"));
+        functionSignature = bytes4(keccak256("validateTransfer(address,address,address,uint256,uint256)"));
         isViewFunction = true;
     }