From f06f41c14572c81e14b64b0ec279144acaf00bfd Mon Sep 17 00:00:00 2001 From: Adam Wolf Date: Wed, 18 Dec 2024 17:41:35 -0500 Subject: [PATCH] fmt Signed-off-by: Adam Wolf --- .../ERC721ACQueryableInitializable.sol | 16 ++++++++-------- .../nft/erc721m/ERC721CMInitializableV1_0_1.sol | 5 +---- .../nft/erc721m/ERC721MInitializableV1_0_1.sol | 16 +++++----------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/contracts/nft/creator-token-standards/ERC721ACQueryableInitializable.sol b/contracts/nft/creator-token-standards/ERC721ACQueryableInitializable.sol index af3b4d7..a7322e6 100644 --- a/contracts/nft/creator-token-standards/ERC721ACQueryableInitializable.sol +++ b/contracts/nft/creator-token-standards/ERC721ACQueryableInitializable.sol @@ -25,7 +25,13 @@ abstract contract ERC721ACQueryableInitializable is } /// @notice Overrides behavior of supportsInterface such that the contract implements the ICreatorToken interface. - function supportsInterface(bytes4 interfaceId) public view virtual override(ERC721ACloneable, IERC721A) returns (bool) { + function supportsInterface(bytes4 interfaceId) + public + view + virtual + override(ERC721ACloneable, IERC721A) + returns (bool) + { return interfaceId == type(ICreatorToken).interfaceId || interfaceId == type(ICreatorTokenLegacy).interfaceId || super.supportsInterface(interfaceId); } @@ -39,13 +45,7 @@ abstract contract ERC721ACQueryableInitializable is /// @notice Overrides behavior of isApprovedFor all such that if an operator is not explicitly approved /// @notice for all, the contract owner can optionally auto-approve the 721-C transfer validator for transfers. - function isApprovedForAll(address owner, address operator) - public - view - virtual - override - returns (bool isApproved) - { + function isApprovedForAll(address owner, address operator) public view virtual override returns (bool isApproved) { isApproved = super.isApprovedForAll(owner, operator); if (!isApproved) { diff --git a/contracts/nft/erc721m/ERC721CMInitializableV1_0_1.sol b/contracts/nft/erc721m/ERC721CMInitializableV1_0_1.sol index 0842973..f81e940 100644 --- a/contracts/nft/erc721m/ERC721CMInitializableV1_0_1.sol +++ b/contracts/nft/erc721m/ERC721CMInitializableV1_0_1.sol @@ -45,10 +45,7 @@ contract ERC721CMInitializableV1_0_1 is /// @param name The name of the token collection /// @param symbol The symbol of the token collection /// @param initialOwner The address of the initial owner - function initialize(string calldata name, string calldata symbol, address initialOwner) - external - initializer - { + function initialize(string calldata name, string calldata symbol, address initialOwner) external initializer { if (initialOwner == address(0)) { revert InitialOwnerCannotBeZero(); } diff --git a/contracts/nft/erc721m/ERC721MInitializableV1_0_1.sol b/contracts/nft/erc721m/ERC721MInitializableV1_0_1.sol index a02e01a..995b3ad 100644 --- a/contracts/nft/erc721m/ERC721MInitializableV1_0_1.sol +++ b/contracts/nft/erc721m/ERC721MInitializableV1_0_1.sol @@ -8,7 +8,9 @@ import {Ownable} from "solady/src/auth/Ownable.sol"; import {ReentrancyGuard} from "solady/src/utils/ReentrancyGuard.sol"; import {SafeTransferLib} from "solady/src/utils/SafeTransferLib.sol"; -import {IERC721A, ERC721A, ERC721AQueryable, IERC721AQueryable} from "erc721a/contracts/extensions/ERC721AQueryable.sol"; +import { + IERC721A, ERC721A, ERC721AQueryable, IERC721AQueryable +} from "erc721a/contracts/extensions/ERC721AQueryable.sol"; import {ERC721AConduitPreapprovedCloneable} from "contracts/nft/erc721m/clones/ERC721AConduitPreapprovedCloneable.sol"; import {ERC721ACloneable} from "contracts/nft/erc721m/clones/ERC721ACloneable.sol"; @@ -45,10 +47,7 @@ contract ERC721MInitializableV1_0_1 is /// @param name The name of the token collection /// @param symbol The symbol of the token collection /// @param initialOwner The address of the initial owner - function initialize(string calldata name, string calldata symbol, address initialOwner) - external - initializer - { + function initialize(string calldata name, string calldata symbol, address initialOwner) external initializer { if (initialOwner == address(0)) { revert InitialOwnerCannotBeZero(); } @@ -70,12 +69,7 @@ contract ERC721MInitializableV1_0_1 is /// @notice Gets the token URI for a specific token ID /// @param tokenId The ID of the token /// @return The token URI - function tokenURI(uint256 tokenId) - public - view - override(ERC721ACloneable, IERC721A) - returns (string memory) - { + function tokenURI(uint256 tokenId) public view override(ERC721ACloneable, IERC721A) returns (string memory) { if (!_exists(tokenId)) revert URIQueryForNonexistentToken(); string memory baseURI = _currentBaseURI;