Follow _approve overrides in ERC721._update #4552
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ERC721._update
is currently usingdelete _tokenApprovals[tokenId]
, bypassing potential_approve
overrides. Originally reported in #4377 (comment), along with an example of an_approve
override that would have resulted in an issue.This PR fixes this in a similar way to how we've set up the
_approve
function forERC20
, by adding abool emitEvent
argument to the function that defaults totrue
. I've made the 3-argument variants in both contracts non-virtual because they are aliases of the 4-argument_approve
.No changeset because this is part of the ERC721 refactor.
Fixes #4547