Skip to content

Introduce _checkAuthorized in ERC1155 to perform operator checks #6133

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 5 commits into from
Dec 1, 2025
Merged

Introduce _checkAuthorized in ERC1155 to perform operator checks #6133

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f37c04
Update ERC1155.sol
letmehateu Nov 21, 2025
b1a9f5c
up
ernestognw Nov 24, 2025
84f8331
Add changeset
ernestognw Nov 24, 2025
a23089b
Merge branch 'master' into master
ernestognw Nov 24, 2025
920c3b4
Refactor _checkAuthorized to include operator parameter
Amxx Nov 25, 2025
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
14 changes: 7 additions & 7 deletions contracts/token/ERC1155/ERC1155.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,16 @@ abstract contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI, IER
return _operatorApprovals[account][operator];
}

/// @inheritdoc IERC1155
function safeTransferFrom(address from, address to, uint256 id, uint256 value, bytes memory data) public virtual {
function _checkAuthorized(address from) internal view {
address sender = _msgSender();
if (from != sender && !isApprovedForAll(from, sender)) {
revert ERC1155MissingApprovalForAll(sender, from);
}
}

/// @inheritdoc IERC1155
function safeTransferFrom(address from, address to, uint256 id, uint256 value, bytes memory data) public virtual {
_checkAuthorized(from);
_safeTransferFrom(from, to, id, value, data);
}

Expand All @@ -112,13 +116,9 @@ abstract contract ERC1155 is Context, ERC165, IERC1155, IERC1155MetadataURI, IER
uint256[] memory values,
bytes memory data
) public virtual {
address sender = _msgSender();
if (from != sender && !isApprovedForAll(from, sender)) {
revert ERC1155MissingApprovalForAll(sender, from);
}
_checkAuthorized(from);
_safeBatchTransferFrom(from, to, ids, values, data);
}

/**
* @dev Transfers a `value` amount of tokens of type `id` from `from` to `to`. Will mint (or burn) if `from`
* (or `to`) is the zero address.
Expand Down
Loading