Skip to content

Moved 'to != owner' from ERC721.approval to ERC721._approval #4138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Saksham010 wants to merge 6 commits into from
Closed

Moved 'to != owner' from ERC721.approval to ERC721._approval #4138

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08d8404
Moved 'to != owner' from ERC721.approval to ERC721._approval
Saksham010 Mar 25, 2023
6ebf0e9
Merge branch 'OpenZeppelin:master' into master
Saksham010 Apr 4, 2023
868e147
Merge branch 'OpenZeppelin:master' into master
Saksham010 Apr 5, 2023
f8465a1
Merge branch 'OpenZeppelin:master' into master
Saksham010 Apr 6, 2023
2d88a2d
Added owner to resolve error
Saksham010 Apr 6, 2023
8948587
Fixed indentation to resolve linting issue
Saksham010 Apr 7, 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
Added owner to resolve error 
Also fixed lint check error
  • Loading branch information
@Saksham010
Saksham010 authored Apr 6, 2023
commit 2d88a2d4963e2dcf045d69f79797b334f309c64a
9 changes: 6 additions & 3 deletions contracts/token/ERC721/ERC721.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
* - `from` cannot be the zero address.
* - `to` cannot be the zero address.
* - `tokenId` token must exist and be owned by `from`.
* - If `to` refers to a smart contract, it must implement {IERC721Receiver-onERC721Received}, which is called upon a safe transfer.
* - If `to` refers to a smart contract, it must implement {IERC721Receiver-onERC721Received},
* which is called upon a safe transfer.
*
* Emits a {Transfer} event.
*/
Expand Down Expand Up @@ -228,7 +229,8 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
* Requirements:
*
* - `tokenId` must not exist.
* - If `to` refers to a smart contract, it must implement {IERC721Receiver-onERC721Received}, which is called upon a safe transfer.
* - If `to` refers to a smart contract, it must implement {IERC721Receiver-onERC721Received},
* which is called upon a safe transfer.
*
* Emits a {Transfer} event.
*/
Expand Down Expand Up @@ -363,9 +365,10 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
* Emits an {Approval} event.
*/
function _approve(address to, uint256 tokenId) internal virtual {
address owner = ERC721.ownerOf(tokenId);
require(to != owner, "ERC721: approval to current owner");
_tokenApprovals[tokenId] = to;
emit Approval(ERC721.ownerOf(tokenId), to, tokenId);
emit Approval(owner, to, tokenId);
}

/**
Expand Down