-
Notifications
You must be signed in to change notification settings - Fork 12.4k
Use the _update mechanism in ERC721 #4377
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.
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
Merged
frangio
merged 53 commits into
OpenZeppelin:master
from
Amxx:refactor/erc721-update-fnPointer
Aug 9, 2023
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit
Hold shift + click to select a range
a3526ac
Rebase ERC721._update on top of next-v5
Amxx 1ed8f9e
use __unsafe_increaseBalance to react to batch minting
Amxx 7ec3435
Apply suggestions from code review
Amxx e2fdbac
fix lint
Amxx e9f03bd
Exclude address(0) in ERC721._isApprovedOrOwner
frangio 78c280b
Merge branch 'master' into refactor/erc721-update-fnPointer
Amxx 1cc7f54
Merge remote-tracking branch 'upstream' into refactor/erc721-update-f…
Amxx c7303ec
fix lint
Amxx 54cb3ca
Merge branch 'master' into refactor/erc721-update-fnPointer
Amxx 562ddf5
implement hybrid _update
Amxx 0bb98cb
Merge branch 'master' into feature/Governor-storage
Amxx 5ab254c
lint
Amxx bd0c52e
refactor constraint into an optionalChecks bitmap
Amxx 1a95520
replace constraints with a simple operator check
Amxx 7e9d024
Apply suggestions from code review
Amxx 16f2f15
remove _isApproedOrOwner in favor of _isApproved + refactor _checkOnE…
Amxx 2558c8f
change _increaseBalance type to uint128
Amxx de570d0
allow using approve/_approve to clean approval
Amxx 7121ff7
Merge branch 'erc721-approve-0' into refactor/erc721-update-fnPointer
Amxx b973d98
changesets
Amxx e4b0e72
use whenNotPaused in ERC721Pausable
Amxx 4516803
make the safe function without a data field non virtual
Amxx 7c3f161
Update .changeset/eighty-lemons-shake.md
frangio 9ba0120
Format _increaseBalance NatSpec
ernestognw 1081508
Lint
ernestognw fb4d951
Apply suggestions from code review
Amxx d7a6aaf
remove _exists
Amxx 4c25b48
Merge branch 'refactor/erc721-update-fnPointer' of https://github.com…
Amxx 20048ca
Changes suggested in the PR discussions
Amxx e996ba4
add ERC721 specific details in the 'How to upgrade from 4.x' section …
Amxx b29e573
rename from → previousOwner
Amxx 328b16b
Authorised → Authorized
Amxx 08da709
refactor _checkAuhtorized
Amxx 12f63b3
add test
Amxx 81aca96
Update CHANGELOG.md
frangio d037530
Apply suggestions from code review
frangio 5ce49a4
remove unnecessary solhint annotation
frangio a023cad
wrap long line
frangio caabbf3
improve warnings and notes
frangio ca32b45
fix _safeTransfer docs
frangio b982e2a
Update ERC721.behavior.js
Amxx f404802
Update ERC721.sol
Amxx 20bb47f
Update contracts/token/ERC721/ERC721.sol
Amxx a475ffa
Update ERC721.sol
Amxx e26d5c0
Update IERC721.sol
Amxx 2897abc
Update ERC721.sol
Amxx 52923d1
coverage for internal _transfer and _safeTransfer
Amxx 42e17ee
mint
Amxx c2e1a55
fix comments _isApproved -> _isAuthorized
frangio a036284
extend warning for _isAuthorized
frangio 1e4f353
add comment to _approve
frangio 7b26030
Update contracts/token/ERC721/ERC721.sol
frangio 7249414
Update contracts/token/ERC721/ERC721.sol
frangio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
use __unsafe_increaseBalance to react to batch minting
- Loading branch information
commit 1ed8f9ef2ced4ce5cc0476bb0953fe6c66fd9d6c
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
Uh oh!
There was an error while loading. Please reload this page.