Skip to content

Move ERC721 and ERC1155 receiver checks to dedicate libraries #4845

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

Merged
ernestognw merged 11 commits into from
Jan 30, 2024
Merged

Move ERC721 and ERC1155 receiver checks to dedicate libraries #4845

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a193bd9
Move ERC721 and ERC1155 receiver checks to dedicate libraries
Amxx Jan 18, 2024
4eecf9f
doc
Amxx Jan 18, 2024
f372e76
doc
Amxx Jan 18, 2024
0e853c0
doc
Amxx Jan 18, 2024
9c5e827
up
Amxx Jan 18, 2024
dc2f8f4
fix lint
Amxx Jan 18, 2024
29f3b16
Apply suggestions from code review
Amxx Jan 30, 2024
d292276
Nits
ernestognw Jan 30, 2024
aaf7cda
Add tests
ernestognw Jan 30, 2024
d551d5c
Fix tests
ernestognw Jan 30, 2024
ed00c2a
Remove unnecessary .only
ernestognw Jan 30, 2024
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
Apply suggestions from code review 
Co-authored-by: Ernesto García <[email protected]>
  • Loading branch information
@Amxx @ernestognw
Amxx and ernestognw authored Jan 30, 2024
commit 29f3b16f438a55233ae45665601acbfe1a66ff93
2 changes: 1 addition & 1 deletion .changeset/poor-chefs-cheat.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'openzeppelin-solidity': minor
---

`ERC721Utils` and `ERC1155Utils`: reusable libraries for performing the acceptance checks (safeTransfer)
`ERC721Utils` and `ERC1155Utils`: reusable libraries with functions to perform acceptance checks on `IERC721Receiver` and `IERC1155Receiver` implementers.
4 changes: 4 additions & 0 deletions contracts/token/ERC1155/utils/ERC1155Utils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,12 @@ library ERC1155Utils {
if (to.code.length > 0) {
try IERC1155Receiver(to).onERC1155Received(operator, from, id, value, data) returns (bytes4 response) {
if (response != IERC1155Receiver.onERC1155Received.selector) {
// Tokens rejected
revert IERC1155Errors.ERC1155InvalidReceiver(to);
}
} catch (bytes memory reason) {
if (reason.length == 0) {
// non-IERC1155Receiver implementer
revert IERC1155Errors.ERC1155InvalidReceiver(to);
} else {
/// @solidity memory-safe-assembly
Expand Down Expand Up @@ -59,10 +61,12 @@ library ERC1155Utils {
bytes4 response
) {
if (response != IERC1155Receiver.onERC1155BatchReceived.selector) {
// Tokens rejected
revert IERC1155Errors.ERC1155InvalidReceiver(to);
}
} catch (bytes memory reason) {
if (reason.length == 0) {
// non-IERC1155Receiver implementer
revert IERC1155Errors.ERC1155InvalidReceiver(to);
} else {
/// @solidity memory-safe-assembly
Expand Down
2 changes: 2 additions & 0 deletions contracts/token/ERC721/utils/ERC721Utils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,12 @@ library ERC721Utils {
if (to.code.length > 0) {
try IERC721Receiver(to).onERC721Received(operator, from, tokenId, data) returns (bytes4 retval) {
if (retval != IERC721Receiver.onERC721Received.selector) {
// Token rejected
revert IERC721Errors.ERC721InvalidReceiver(to);
}
} catch (bytes memory reason) {
if (reason.length == 0) {
// non-IERC721Receiver implementer
revert IERC721Errors.ERC721InvalidReceiver(to);
} else {
/// @solidity memory-safe-assembly
Expand Down