make the safe function without a data field non virtual

pull/4377/head
Hadrien Croubois 2 years ago
parent e4b0e725df
commit 4516803058
  1. 13
      contracts/token/ERC721/ERC721.sol

@ -164,7 +164,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
/** /**
* @dev See {IERC721-safeTransferFrom}. * @dev See {IERC721-safeTransferFrom}.
*/ */
function safeTransferFrom(address from, address to, uint256 tokenId) public virtual { function safeTransferFrom(address from, address to, uint256 tokenId) public {
safeTransferFrom(from, to, tokenId, ""); safeTransferFrom(from, to, tokenId, "");
} }
@ -300,7 +300,7 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* *
* Emits a {Transfer} event. * Emits a {Transfer} event.
*/ */
function _safeMint(address to, uint256 tokenId) internal virtual { function _safeMint(address to, uint256 tokenId) internal {
_safeMint(to, tokenId, ""); _safeMint(to, tokenId, "");
} }
@ -372,6 +372,15 @@ abstract contract ERC721 is Context, ERC165, IERC721, IERC721Metadata, IERC721Er
* *
* Emits a {Transfer} event. * Emits a {Transfer} event.
*/ */
function _safeTransfer(address from, address to, uint256 tokenId) internal {
_transfer(from, to, tokenId);
_checkOnERC721Received(from, to, tokenId, "");
}
/**
* @dev Same as {xref-ERC721-_safeTransfer-address-address-uint256-}[`_safeTransfer`], with an additional `data` parameter which is
* forwarded in {IERC721Receiver-onERC721Received} to contract recipients.
*/
function _safeTransfer(address from, address to, uint256 tokenId, bytes memory data) internal virtual { function _safeTransfer(address from, address to, uint256 tokenId, bytes memory data) internal virtual {
_transfer(from, to, tokenId); _transfer(from, to, tokenId);
_checkOnERC721Received(from, to, tokenId, data); _checkOnERC721Received(from, to, tokenId, data);

Loading…
Cancel
Save