@lukso/lsp8-contracts 0.16.7 → 0.17.3

package/contracts/LSP8IdentifiableDigitalAssetInitAbstract.sol

@@ -1,13 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.12;
+pragma solidity ^0.8.27;
 
 // interfaces
-import {
-    ILSP1UniversalReceiver as ILSP1
-} from "@lukso/lsp1-contracts/contracts/ILSP1UniversalReceiver.sol";
-import {
-    ILSP8IdentifiableDigitalAsset
-} from "./ILSP8IdentifiableDigitalAsset.sol";
+import {ILSP1UniversalReceiver as ILSP1} from "@lukso/lsp1-contracts/contracts/ILSP1UniversalReceiver.sol";
+import {ILSP8IdentifiableDigitalAsset} from "./ILSP8IdentifiableDigitalAsset.sol";
 
 // modules
 import {
@@ -15,27 +11,17 @@ import {
     ERC725YInitAbstract
 } from "@lukso/lsp4-contracts/contracts/LSP4DigitalAssetMetadataInitAbstract.sol";
 
-import {
-    LSP17ExtendableInitAbstract
-} from "@lukso/lsp17contractextension-contracts/contracts/LSP17ExtendableInitAbstract.sol";
+import {LSP17ExtendableInitAbstract} from "@lukso/lsp17contractextension-contracts/contracts/LSP17ExtendableInitAbstract.sol";
 
 // libraries
-import {
-    EnumerableSet
-} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
-import {
-    ERC165Checker
-} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
+import {EnumerableSet} from "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
+import {ERC165Checker} from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 import {LSP1Utils} from "@lukso/lsp1-contracts/contracts/LSP1Utils.sol";
 import {LSP2Utils} from "@lukso/lsp2-contracts/contracts/LSP2Utils.sol";
 
 // constants
-import {
-    _INTERFACEID_LSP1
-} from "@lukso/lsp1-contracts/contracts/LSP1Constants.sol";
-import {
-    _LSP17_EXTENSION_PREFIX
-} from "@lukso/lsp17contractextension-contracts/contracts/LSP17Constants.sol";
+import {_INTERFACEID_LSP1} from "@lukso/lsp1-contracts/contracts/LSP1Constants.sol";
+import {_LSP17_EXTENSION_PREFIX} from "@lukso/lsp17contractextension-contracts/contracts/LSP17Constants.sol";
 import {
     _INTERFACEID_LSP8,
     _LSP8_TOKENID_FORMAT_KEY,
@@ -45,11 +31,6 @@ import {
 } from "./LSP8Constants.sol";
 
 // errors
-import {
-    NoExtensionFoundForFunctionSelector,
-    InvalidFunctionSelector,
-    InvalidExtensionAddress
-} from "@lukso/lsp17contractextension-contracts/contracts/LSP17Errors.sol";
 import {
     LSP8TokenContractCannotHoldValue,
     LSP8TokenIdFormatNotEditable,
@@ -167,9 +148,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
     fallback(
         bytes calldata callData
     ) external payable virtual returns (bytes memory) {
-        if (msg.data.length < 4) {
-            revert InvalidFunctionSelector(callData);
-        }
+        require(msg.data.length >= 4, InvalidFunctionSelector(callData));
         return _fallbackLSP17Extendable(callData);
     }
 
@@ -210,8 +189,10 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         (address extension, ) = _getExtensionAndForwardValue(msg.sig);
 
         // if no extension was found, revert
-        if (extension == address(0))
-            revert NoExtensionFoundForFunctionSelector(msg.sig);
+        require(
+            extension != address(0),
+            NoExtensionFoundForFunctionSelector(msg.sig)
+        );
 
         (bool success, bytes memory result) = extension.call{value: msg.value}(
             abi.encodePacked(callData, msg.sender, msg.value)
@@ -247,8 +228,10 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
 
         // Check if there is an extension stored under the generated data key
         bytes memory extensionAddress = _getData(mappedExtensionDataKey);
-        if (extensionAddress.length != 20 && extensionAddress.length != 0)
-            revert InvalidExtensionAddress(extensionAddress);
+        require(
+            extensionAddress.length == 20 || extensionAddress.length == 0,
+            InvalidExtensionAddress(extensionAddress)
+        );
 
         return (address(bytes20(extensionAddress)), true);
     }
@@ -315,10 +298,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes32 tokenId
     ) public view virtual override returns (address) {
         address tokenOwner = _tokenOwners[tokenId];
-
-        if (tokenOwner == address(0)) {
-            revert LSP8NonExistentTokenId(tokenId);
-        }
+        require(tokenOwner != address(0), LSP8NonExistentTokenId(tokenId));
 
         return tokenOwner;
     }
@@ -351,9 +331,10 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes32[] memory tokenIds,
         bytes32[] memory dataKeys
     ) public view virtual override returns (bytes[] memory dataValues) {
-        if (tokenIds.length != dataKeys.length) {
-            revert LSP8TokenIdsDataLengthMismatch();
-        }
+        require(
+            tokenIds.length == dataKeys.length,
+            LSP8TokenIdsDataLengthMismatch()
+        );
 
         dataValues = new bytes[](tokenIds.length);
 
@@ -388,16 +369,13 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes32[] memory dataKeys,
         bytes[] memory dataValues
     ) public virtual override onlyOwner {
-        if (
-            tokenIds.length != dataKeys.length ||
-            dataKeys.length != dataValues.length
-        ) {
-            revert LSP8TokenIdsDataLengthMismatch();
-        }
+        require(
+            tokenIds.length == dataKeys.length &&
+                dataKeys.length == dataValues.length,
+            LSP8TokenIdsDataLengthMismatch()
+        );
 
-        if (tokenIds.length == 0) {
-            revert LSP8TokenIdsDataEmptyArray();
-        }
+        require(tokenIds.length != 0, LSP8TokenIdsDataEmptyArray());
 
         for (uint256 i; i < tokenIds.length; ) {
             _setDataForTokenId(tokenIds[i], dataKeys[i], dataValues[i]);
@@ -460,20 +438,15 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
     ) public virtual override {
         address tokenOwner = tokenOwnerOf(tokenId);
 
-        if (tokenOwner != msg.sender) {
-            revert LSP8NotTokenOwner(tokenOwner, tokenId, msg.sender);
-        }
-
-        if (operator == address(0)) {
-            revert LSP8CannotUseAddressZeroAsOperator();
-        }
-
-        if (tokenOwner == operator) {
-            revert LSP8TokenOwnerCannotBeOperator();
-        }
+        require(
+            msg.sender == tokenOwner,
+            LSP8NotTokenOwner(tokenOwner, tokenId, msg.sender)
+        );
+        require(operator != address(0), LSP8CannotUseAddressZeroAsOperator());
+        require(operator != tokenOwner, LSP8TokenOwnerCannotBeOperator());
 
         bool isAdded = _operators[tokenId].add(operator);
-        if (!isAdded) revert LSP8OperatorAlreadyAuthorized(operator, tokenId);
+        require(isAdded, LSP8OperatorAlreadyAuthorized(operator, tokenId));
 
         emit OperatorAuthorizationChanged(
             operator,
@@ -504,22 +477,14 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         address tokenOwner = tokenOwnerOf(tokenId);
 
         if (msg.sender != tokenOwner) {
-            if (operator != msg.sender) {
-                revert LSP8RevokeOperatorNotAuthorized(
-                    msg.sender,
-                    tokenOwner,
-                    tokenId
-                );
-            }
-        }
-
-        if (operator == address(0)) {
-            revert LSP8CannotUseAddressZeroAsOperator();
+            require(
+                msg.sender == operator,
+                LSP8RevokeOperatorNotAuthorized(msg.sender, tokenOwner, tokenId)
+            );
         }
 
-        if (tokenOwner == operator) {
-            revert LSP8TokenOwnerCannotBeOperator();
-        }
+        require(operator != address(0), LSP8CannotUseAddressZeroAsOperator());
+        require(operator != tokenOwner, LSP8TokenOwnerCannotBeOperator());
 
         _revokeOperator(
             operator,
@@ -586,9 +551,10 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bool force,
         bytes memory data
     ) public virtual override {
-        if (!_isOperatorOrOwner(msg.sender, tokenId)) {
-            revert LSP8NotTokenOperator(tokenId, msg.sender);
-        }
+        require(
+            _isOperatorOrOwner(msg.sender, tokenId),
+            LSP8NotTokenOperator(tokenId, msg.sender)
+        );
 
         _transfer(from, to, tokenId, force, data);
     }
@@ -604,14 +570,13 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes[] memory data
     ) public virtual override {
         uint256 fromLength = from.length;
-        if (
-            fromLength != to.length ||
-            fromLength != tokenId.length ||
-            fromLength != force.length ||
-            fromLength != data.length
-        ) {
-            revert LSP8InvalidTransferBatch();
-        }
+        require(
+            fromLength == to.length &&
+                fromLength == tokenId.length &&
+                fromLength == force.length &&
+                fromLength == data.length,
+            LSP8InvalidTransferBatch()
+        );
 
         for (uint256 i; i < fromLength; ) {
             transfer(from[i], to[i], tokenId[i], force[i], data[i]);
@@ -633,7 +598,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes memory operatorNotificationData
     ) internal virtual {
         bool isRemoved = _operators[tokenId].remove(operator);
-        if (!isRemoved) revert LSP8NonExistingOperator(operator, tokenId);
+        require(isRemoved, LSP8NonExistingOperator(operator, tokenId));
 
         emit OperatorRevoked(
             operator,
@@ -690,9 +655,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
      * @dev When `tokenId` does not exist then revert with an error.
      */
     function _existsOrError(bytes32 tokenId) internal view virtual {
-        if (!_exists(tokenId)) {
-            revert LSP8NonExistentTokenId(tokenId);
-        }
+        require(_exists(tokenId), LSP8NonExistentTokenId(tokenId));
     }
 
     /**
@@ -710,7 +673,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
      * @custom:requirements
      * - `tokenId` must not exist and not have been already minted.
      * - `to` cannot be the zero address.
-
+     *
      * @custom:events {Transfer} event with `address(0)` as `from` address.
      */
     function _mint(
@@ -719,21 +682,15 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bool force,
         bytes memory data
     ) internal virtual {
-        if (to == address(0)) {
-            revert LSP8CannotSendToAddressZero();
-        }
+        require(to != address(0), LSP8CannotSendToAddressZero());
 
         // Check that `tokenId` is not already minted
-        if (_exists(tokenId)) {
-            revert LSP8TokenIdAlreadyMinted(tokenId);
-        }
+        require(!_exists(tokenId), LSP8TokenIdAlreadyMinted(tokenId));
 
         _beforeTokenTransfer(address(0), to, tokenId, force, data);
 
         // Check that `tokenId` was not minted inside the `_beforeTokenTransfer` hook
-        if (_exists(tokenId)) {
-            revert LSP8TokenIdAlreadyMinted(tokenId);
-        }
+        require(!_exists(tokenId), LSP8TokenIdAlreadyMinted(tokenId));
 
         // token being minted
         ++_existingTokens;
@@ -844,25 +801,21 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
         bytes memory data
     ) internal virtual {
         address tokenOwner = tokenOwnerOf(tokenId);
-        if (tokenOwner != from) {
-            revert LSP8NotTokenOwner(tokenOwner, tokenId, from);
-        }
+        require(
+            from == tokenOwner,
+            LSP8NotTokenOwner(tokenOwner, tokenId, from)
+        );
 
-        if (to == address(0)) {
-            revert LSP8CannotSendToAddressZero();
-        }
+        require(to != address(0), LSP8CannotSendToAddressZero());
 
         _beforeTokenTransfer(from, to, tokenId, force, data);
 
         // Check that `tokenId`'s owner was not changed inside the `_beforeTokenTransfer` hook
         address currentTokenOwner = tokenOwnerOf(tokenId);
-        if (tokenOwner != currentTokenOwner) {
-            revert LSP8TokenOwnerChanged(
-                tokenId,
-                tokenOwner,
-                currentTokenOwner
-            );
-        }
+        require(
+            currentTokenOwner == tokenOwner,
+            LSP8TokenOwnerChanged(tokenId, tokenOwner, currentTokenOwner)
+        );
 
         _clearOperators(from, tokenId);
 
@@ -951,7 +904,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
      * @dev Attempt to notify the operator `operator` about the `tokenId` being authorized.
      * This is done by calling its {universalReceiver} function with the `_TYPEID_LSP8_TOKENOPERATOR` as typeId, if `operator` is a contract that supports the LSP1 interface.
      * If `operator` is an EOA or a contract that does not support the LSP1 interface, nothing will happen and no notification will be sent.
-
+     *
      * @param operator The address to call the {universalReceiver} function on.
      * @param lsp1Data the data to be sent to the `operator` address in the `universalReceiver` call.
      */
@@ -970,7 +923,7 @@ abstract contract LSP8IdentifiableDigitalAssetInitAbstract is
      * @dev Attempt to notify the token sender `from` about the `tokenId` being transferred.
      * This is done by calling its {universalReceiver} function with the `_TYPEID_LSP8_TOKENSSENDER` as typeId, if `from` is a contract that supports the LSP1 interface.
      * If `from` is an EOA or a contract that does not support the LSP1 interface, nothing will happen and no notification will be sent.
-
+     *
      * @param from The address to call the {universalReceiver} function on.
      * @param lsp1Data the data to be sent to the `from` address in the `universalReceiver` call.
      */