Move _setOwnersExplicit to separate extension #34
Conversation
This file contains 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
cygaar
commented
Jan 27, 2022
| @@ -46,7 +46,7 @@ contract ERC721A is Context, ERC165, IERC721, IERC721Metadata, IERC721Enumerable | |||
|
|
|||
| // Mapping from token ID to ownership details | |||
| // An empty struct value does not necessarily mean the token is unowned. See ownershipOf implementation for details. | |||
| mapping(uint256 => TokenOwnership) private _ownerships; | |||
| mapping(uint256 => TokenOwnership) internal _ownerships; | |||
There was a problem hiding this comment.
Had to convert this to internal in order for ERC721AOwnersExplicit to read the variable. We can also redeclare ownerships in that file, I have no strong preference here
There was a problem hiding this comment.
Same with currentIndex above
cygaar
commented
Jan 27, 2022
contracts/ERC721A.sol
Outdated
| endIndex = currentIndex - 1; | ||
| } | ||
| // We know if the last one in the group exists, all in the group exist, due to serial ordering. | ||
| require(_exists(endIndex), "not enough minted yet for this cleanup"); |
There was a problem hiding this comment.
This line will never evaluate to true due to line 408 so I removed this check in the refactored function
cygaar
commented
Jan 27, 2022
| function _setOwnersExplicit(uint256 quantity) internal { | ||
| require(quantity > 0, "quantity must be nonzero"); | ||
| require(currentIndex > 0, "no tokens minted yet"); | ||
| require(nextOwnerToExplicitlySet < currentIndex, "all ownerships have been set"); |
There was a problem hiding this comment.
Added this to prevent unnecessary calls to this function
chiru-labs
approved these changes
Jan 27, 2022
cygaar
force-pushed
the
explicit_ownerships
branch
from
35d8f9b to
8063078
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
_setOwnersExplicit doesn't need to be in the base level contract as most users won't need it. However, we want to provide it as an optional extension in case some users want to explicitly set ownerships after a mint is over.