Skip to content
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

Jump to bottom

Add an internal _setApprovalForAll function (721 & 1155) #2834

Merged
merged 5 commits into from Oct 6, 2021
Merged

Add an internal _setApprovalForAll function (721 & 1155) #2834

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a1a8ae
Add an internal _setApprovalForAll function (721 & 1155)
Amxx Aug 23, 2021
a79e3dc
fix lint
Amxx Aug 24, 2021
36b65e7
move checks to internal functions
Amxx Oct 6, 2021
50ee070
add changelog entry
Amxx Oct 6, 2021
8f47039
Merge branch 'master' into feature/_setApprovalForAll
frangio Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 16 additions & 3 deletions contracts/token/ERC1155/ERC1155.sol
View file
Open in desktop
Expand Up @@ -101,9 +101,7 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
*/
function setApprovalForAll(address operator, bool approved) public virtual override {
require(_msgSender() != operator, "ERC1155: setting approval status for self");

_operatorApprovals[_msgSender()][operator] = approved;
emit ApprovalForAll(_msgSender(), operator, approved);
_setApprovalForAll(_msgSender(), operator, approved);
}

/**
Expand Down Expand Up @@ -369,6 +367,21 @@ contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI {
emit TransferBatch(operator, account, address(0), ids, amounts);
}

/**
* @dev Approve `operator` to operate on all of `owner` tokens
*
* Emits a {ApprovalForAll} event.
*/
function _setApprovalForAll(
address owner,
address operator,
bool approved
) internal virtual {
// TODO: add sanity checks?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What checks did you have in mind?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

possibly require(owner != operator) ... but I was not really sure

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree with adding that require statement. We should move the one in the external function into the internal function.

Note: This PR is also pending a changelog entry.

_operatorApprovals[owner][operator] = approved;
emit ApprovalForAll(owner, operator, approved);
}

/**
* @dev Hook that is called before any token transfer. This includes minting
* and burning, as well as batched variants.
Expand Down
19 changes: 16 additions & 3 deletions contracts/token/ERC721/ERC721.sol
View file
Open in desktop
Expand Up @@ -134,9 +134,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
*/
function setApprovalForAll(address operator, bool approved) public virtual override {
require(operator != _msgSender(), "ERC721: approve to caller");

_operatorApprovals[_msgSender()][operator] = approved;
emit ApprovalForAll(_msgSender(), operator, approved);
_setApprovalForAll(_msgSender(), operator, approved);
}

/**
Expand Down Expand Up @@ -356,6 +354,21 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
emit Approval(ERC721.ownerOf(tokenId), to, tokenId);
}

/**
* @dev Approve `operator` to operate on all of `owner` tokens
*
* Emits a {ApprovalForAll} event.
*/
function _setApprovalForAll(
address owner,
address operator,
bool approved
) internal virtual {
// TODO: add sanity checks?
_operatorApprovals[owner][operator] = approved;
emit ApprovalForAll(owner, operator, approved);
}

/**
* @dev Internal function to invoke {IERC721Receiver-onERC721Received} on a target address.
* The call is not executed if the target address is not a contract.
Expand Down