NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor ERC721 _requireMinted and ownerOf (#4566)

Browse Source
This commit is contained in:
Francisco
2023-09-04 10:54:21 -03:00
committed by GitHub
parent a503ba1a0a
commit 9612083826
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/proud-spiders-attend.md Normal file
View File

@ -0,0 +1,5 @@
---
'openzeppelin-solidity': major
---
`ERC721`: Renamed `_requireMinted` to `_requireOwned` and added a return value with the current owner. Implemented `ownerOf` in terms of `_requireOwned`.

23
contracts/token/ERC721/ERC721.sol
View File

@ -65,11 +65,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* @dev See {IERC721-ownerOf}. * @dev See {IERC721-ownerOf}.
*/ */
function ownerOf(uint256 tokenId) public view virtual returns (address) { function ownerOf(uint256 tokenId) public view virtual returns (address) {
address owner = _ownerOf(tokenId); return _requireOwned(tokenId);
if (owner == address(0)) {
revert ERC721NonexistentToken(tokenId);
}
return owner;
} }
/** /**
@ -90,7 +86,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* @dev See {IERC721Metadata-tokenURI}. * @dev See {IERC721Metadata-tokenURI}.
*/ */
function tokenURI(uint256 tokenId) public view virtual returns (string memory) { function tokenURI(uint256 tokenId) public view virtual returns (string memory) {
_requireMinted(tokenId); _requireOwned(tokenId);
string memory baseURI = _baseURI(); string memory baseURI = _baseURI();
return bytes(baseURI).length > 0 ? string.concat(baseURI, tokenId.toString()) : ""; return bytes(baseURI).length > 0 ? string.concat(baseURI, tokenId.toString()) : "";
@ -116,7 +112,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* @dev See {IERC721-getApproved}. * @dev See {IERC721-getApproved}.
*/ */
function getApproved(uint256 tokenId) public view virtual returns (address) { function getApproved(uint256 tokenId) public view virtual returns (address) {
_requireMinted(tokenId); _requireOwned(tokenId);
return _getApproved(tokenId); return _getApproved(tokenId);
} }
@ -397,7 +393,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* Emits an {Approval} event. * Emits an {Approval} event.
*/ */
function _approve(address to, uint256 tokenId, address auth) internal virtual returns (address) { function _approve(address to, uint256 tokenId, address auth) internal virtual returns (address) {
address owner = ownerOf(tokenId); address owner = _requireOwned(tokenId);
// We do not use _isAuthorized because single-token approvals should not be able to call approve // We do not use _isAuthorized because single-token approvals should not be able to call approve
if (auth != address(0) && owner != auth && !isApprovedForAll(owner, auth)) { if (auth != address(0) && owner != auth && !isApprovedForAll(owner, auth)) {
@ -427,12 +423,17 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
} }
/** /**
* @dev Reverts if the `tokenId` has not been minted yet. * @dev Reverts if the `tokenId` doesn't have a current owner (it hasn't been minted, or it has been burned).
* Returns the owner.
*
* Overrides to ownership logic should be done to {_ownerOf}.
*/ */
function _requireMinted(uint256 tokenId) internal view virtual { function _requireOwned(uint256 tokenId) internal view returns (address) {
if (_ownerOf(tokenId) == address(0)) { address owner = _ownerOf(tokenId);
if (owner == address(0)) {
revert ERC721NonexistentToken(tokenId); revert ERC721NonexistentToken(tokenId);
} }
return owner;
} }
/** /**

2
contracts/token/ERC721/extensions/ERC721URIStorage.sol
View File

@ -32,7 +32,7 @@ abstract contract ERC721URIStorage is IERC4906, ERC721 {
* @dev See {IERC721Metadata-tokenURI}. * @dev See {IERC721Metadata-tokenURI}.
*/ */
function tokenURI(uint256 tokenId) public view virtual override returns (string memory) { function tokenURI(uint256 tokenId) public view virtual override returns (string memory) {
_requireMinted(tokenId); _requireOwned(tokenId);
string memory _tokenURI = _tokenURIs[tokenId]; string memory _tokenURI = _tokenURIs[tokenId];
string memory base = _baseURI(); string memory base = _baseURI();