Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
4daab31
AccessControl
RenanSouza2 Jun 5, 2023
ebf635c
AccessControlEnumerable
RenanSouza2 Jun 5, 2023
7a0466f
Governor
RenanSouza2 Jun 5, 2023
f377dd4
IGovernor
RenanSouza2 Jun 5, 2023
6b50b81
TimelockController
RenanSouza2 Jun 5, 2023
bec26fc
Votes
RenanSouza2 Jun 5, 2023
17401ed
ERC1271WalletMock
RenanSouza2 Jun 5, 2023
8db131c
ERC3156FlashBorrowerMock
RenanSouza2 Jun 5, 2023
5d29695
ERC20VotesLegacyMock
RenanSouza2 Jun 5, 2023
75cb14f
ERC721ReceiverMock
RenanSouza2 Jun 5, 2023
92dad67
ERC1155ReceiverMock
RenanSouza2 Jun 5, 2023
f20a8d1
UpgradeableBeacon
RenanSouza2 Jun 5, 2023
86519c3
UUPSUpgradeable
RenanSouza2 Jun 5, 2023
88e9853
ERC2981
RenanSouza2 Jun 5, 2023
cdf8b1d
ERC1155
RenanSouza2 Jun 5, 2023
4326964
ERC20
RenanSouza2 Jun 5, 2023
320a0c2
ERC20FlashMint
RenanSouza2 Jun 5, 2023
5da5221
ERC20Permit
RenanSouza2 Jun 5, 2023
9fb85db
ERC4626
RenanSouza2 Jun 5, 2023
8cc7431
ERC721
RenanSouza2 Jun 5, 2023
ff241a8
ERC721Enumerable
RenanSouza2 Jun 5, 2023
da12258
ERC721Wrapper
RenanSouza2 Jun 5, 2023
6ee337d
ERC721Holder
RenanSouza2 Jun 5, 2023
3cdda53
EIP712
RenanSouza2 Jun 5, 2023
307c154
EIP165
RenanSouza2 Jun 5, 2023
1372aeb
Recover comments
RenanSouza2 Jun 5, 2023
ac0a4b2
Add changeset
RenanSouza2 Jun 5, 2023
13b211b
Fix changeset
RenanSouza2 Jun 6, 2023
e6d8ee1
Update .changeset/violet-dancers-cough.md
ernestognw Jun 6, 2023
52229bf
Merge remote-tracking branch 'upstream/master' into remove-override-i…
RenanSouza2 Jun 6, 2023
6ab19df
Merge branch 'master' into remove-override-interface-implementations
RenanSouza2 Jun 6, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
ERC721
  • Loading branch information
RenanSouza2 committed Jun 5, 2023
commit 8cc7431b0966e3e749fcba3372e12b4689521658
30 changes: 15 additions & 15 deletions contracts/token/ERC721/ERC721.sol
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721-balanceOf}.
*/
function balanceOf(address owner) public view virtual override returns (uint256) {
function balanceOf(address owner) public view virtual returns (uint256) {
require(owner != address(0), "ERC721: address zero is not a valid owner");
return _balances[owner];
}

/**
* @dev See {IERC721-ownerOf}.
*/
function ownerOf(uint256 tokenId) public view virtual override returns (address) {
function ownerOf(uint256 tokenId) public view virtual returns (address) {
address owner = _ownerOf(tokenId);
require(owner != address(0), "ERC721: invalid token ID");
return owner;
Expand All @@ -74,21 +74,21 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721Metadata-name}.
*/
function name() public view virtual override returns (string memory) {
function name() public view virtual returns (string memory) {
return _name;
}

/**
* @dev See {IERC721Metadata-symbol}.
*/
function symbol() public view virtual override returns (string memory) {
function symbol() public view virtual returns (string memory) {
return _symbol;
}

/**
* @dev See {IERC721Metadata-tokenURI}.
*/
function tokenURI(uint256 tokenId) public view virtual override returns (string memory) {
function tokenURI(uint256 tokenId) public view virtual returns (string memory) {
_requireMinted(tokenId);

string memory baseURI = _baseURI();
Expand All @@ -107,7 +107,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721-approve}.
*/
function approve(address to, uint256 tokenId) public virtual override {
function approve(address to, uint256 tokenId) public virtual {
address owner = ownerOf(tokenId);
require(to != owner, "ERC721: approval to current owner");

Expand All @@ -122,7 +122,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721-getApproved}.
*/
function getApproved(uint256 tokenId) public view virtual override returns (address) {
function getApproved(uint256 tokenId) public view virtual returns (address) {
_requireMinted(tokenId);

return _tokenApprovals[tokenId];
Expand All @@ -131,21 +131,21 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721-setApprovalForAll}.
*/
function setApprovalForAll(address operator, bool approved) public virtual override {
function setApprovalForAll(address operator, bool approved) public virtual {
_setApprovalForAll(_msgSender(), operator, approved);
}

/**
* @dev See {IERC721-isApprovedForAll}.
*/
function isApprovedForAll(address owner, address operator) public view virtual override returns (bool) {
function isApprovedForAll(address owner, address operator) public view virtual returns (bool) {
return _operatorApprovals[owner][operator];
}

/**
* @dev See {IERC721-transferFrom}.
*/
function transferFrom(address from, address to, uint256 tokenId) public virtual override {
function transferFrom(address from, address to, uint256 tokenId) public virtual {
//solhint-disable-next-line max-line-length
require(_isApprovedOrOwner(_msgSender(), tokenId), "ERC721: caller is not token owner or approved");

Expand All @@ -155,14 +155,14 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
/**
* @dev See {IERC721-safeTransferFrom}.
*/
function safeTransferFrom(address from, address to, uint256 tokenId) public virtual override {
function safeTransferFrom(address from, address to, uint256 tokenId) public virtual {
safeTransferFrom(from, to, tokenId, "");
}

/**
* @dev See {IERC721-safeTransferFrom}.
*/
function safeTransferFrom(address from, address to, uint256 tokenId, bytes memory data) public virtual override {
function safeTransferFrom(address from, address to, uint256 tokenId, bytes memory data) public virtual {
require(_isApprovedOrOwner(_msgSender(), tokenId), "ERC721: caller is not token owner or approved");
_safeTransfer(from, to, tokenId, data);
}
Expand Down Expand Up @@ -305,7 +305,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
// Clear approvals
delete _tokenApprovals[tokenId];

// Decrease balance with checked arithmetic, because an `ownerOf` override may
// Decrease balance with checked arithmetic, because an `ownerOf` may
// invalidate the assumption that `_balances[from] >= 1`.
_balances[owner] -= 1;

Expand Down Expand Up @@ -339,7 +339,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
// Clear approvals from the previous owner
delete _tokenApprovals[tokenId];

// Decrease balance with checked arithmetic, because an `ownerOf` override may
// Decrease balance with checked arithmetic, because an `ownerOf` may
// invalidate the assumption that `_balances[from] >= 1`.
_balances[from] -= 1;

Expand Down Expand Up @@ -451,7 +451,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
function _afterTokenTransfer(address from, address to, uint256 firstTokenId, uint256 batchSize) internal virtual {}

/**
* @dev Unsafe write access to the balances, used by extensions that "mint" tokens using an {ownerOf} override.
* @dev Unsafe write access to the balances, used by extensions that "mint" tokens using an {ownerOf} .
*
* WARNING: Anyone calling this MUST ensure that the balances remain consistent with the ownership. The invariant
* being that for any address `a` the value returned by `balanceOf(a)` must be equal to the number of tokens such
Expand Down