SC-24 ERC1155TL (#48)

ERC1155TL revamped and tested
Transient-Labs · Jan 5, 2024 · 2c620a4 · 2c620a4
2 parents 992c0e9 + 2f903db
commit 2c620a4
Show file tree

Hide file tree

Showing 4 changed files with 1,433 additions and 1,165 deletions.
diff --git a/src/erc-1155/ERC1155TL.sol b/src/erc-1155/ERC1155TL.sol
@@ -190,7 +190,7 @@ contract ERC1155TL is
         onlyRoleOrOwner(ADMIN_ROLE)
     {
         if (newUris.length == 0) revert EmptyTokenURI();
-        if (newUris.length != addresses.length && addresses.length != amounts.length) revert ArrayLengthMismatch();
+        if (newUris.length != addresses.length || addresses.length != amounts.length) revert ArrayLengthMismatch();
         for (uint256 i = 0; i < newUris.length; i++) {
             _createToken(newUris[i], addresses[i], amounts[i]);
         }
@@ -206,8 +206,8 @@ contract ERC1155TL is
     ) external onlyRoleOrOwner(ADMIN_ROLE) {
         if (newUris.length == 0) revert EmptyTokenURI();
         if (
-            newUris.length != addresses.length && addresses.length != amounts.length
-                && amounts.length != royaltyAddresses.length && royaltyAddresses.length != royaltyPercents.length
+            newUris.length != addresses.length || addresses.length != amounts.length
+                || amounts.length != royaltyAddresses.length || royaltyAddresses.length != royaltyPercents.length
         ) revert ArrayLengthMismatch();
         for (uint256 i = 0; i < newUris.length; i++) {
             uint256 tokenId = _createToken(newUris[i], addresses[i], amounts[i]);
@@ -251,12 +251,12 @@ contract ERC1155TL is
     //////////////////////////////////////////////////////////////////////////*/
 
     /// @inheritdoc ICreatorBase
-    function setDefaultRoyalty(address newRecipient, uint256 newPercentage) external onlyOwner {
+    function setDefaultRoyalty(address newRecipient, uint256 newPercentage) external onlyRoleOrOwner(ADMIN_ROLE) {
         _setDefaultRoyaltyInfo(newRecipient, newPercentage);
     }
 
     /// @inheritdoc ICreatorBase
-    function setTokenRoyalty(uint256 tokenId, address newRecipient, uint256 newPercentage) external onlyOwner {
+    function setTokenRoyalty(uint256 tokenId, address newRecipient, uint256 newPercentage) external onlyRoleOrOwner(ADMIN_ROLE) {
         _overrideTokenRoyaltyInfo(tokenId, newRecipient, newPercentage);
     }
 

diff --git a/src/erc-1155/IERC1155TL.sol b/src/erc-1155/IERC1155TL.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.22;
 
 /// @title IERC1155TL.sol
 /// @notice Interface for ERC1155TL
-/// @dev Interface id =
+/// @dev Interface id = 0x452d5a4a
 /// @author transientlabs.xyz
 /// @custom:version 3.0.0
 interface IERC1155TL {