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

Rename to _msgSenderERC721A #281

Merged
merged 1 commit into from
May 14, 2022
Merged

Rename to _msgSenderERC721A #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions contracts/ERC721A.sol
View file
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ contract ERC721A is IERC721A {
address owner = ERC721A.ownerOf(tokenId);
if (to == owner) revert ApprovalToCurrentOwner();

if (_erc721aMsgSender() != owner) if(!isApprovedForAll(owner, _erc721aMsgSender())) {
if (_msgSenderERC721A() != owner) if(!isApprovedForAll(owner, _msgSenderERC721A())) {
revert ApprovalCallerNotOwnerNorApproved();
}

@@ -238,10 +238,10 @@ contract ERC721A is IERC721A {
* @dev See {IERC721-setApprovalForAll}.
*/
function setApprovalForAll(address operator, bool approved) public virtual override {
if (operator == _erc721aMsgSender()) revert ApproveToCaller();
if (operator == _msgSenderERC721A()) revert ApproveToCaller();

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

/**
@@ -418,9 +418,9 @@ contract ERC721A is IERC721A {

if (prevOwnership.addr != from) revert TransferFromIncorrectOwner();

bool isApprovedOrOwner = (_erc721aMsgSender() == from ||
isApprovedForAll(from, _erc721aMsgSender()) ||
getApproved(tokenId) == _erc721aMsgSender());
bool isApprovedOrOwner = (_msgSenderERC721A() == from ||
isApprovedForAll(from, _msgSenderERC721A()) ||
getApproved(tokenId) == _msgSenderERC721A());

if (!isApprovedOrOwner) revert TransferCallerNotOwnerNorApproved();
if (to == address(0)) revert TransferToZeroAddress();
@@ -482,9 +482,9 @@ contract ERC721A is IERC721A {
address from = prevOwnership.addr;

if (approvalCheck) {
bool isApprovedOrOwner = (_erc721aMsgSender() == from ||
isApprovedForAll(from, _erc721aMsgSender()) ||
getApproved(tokenId) == _erc721aMsgSender());
bool isApprovedOrOwner = (_msgSenderERC721A() == from ||
isApprovedForAll(from, _msgSenderERC721A()) ||
getApproved(tokenId) == _msgSenderERC721A());

if (!isApprovedOrOwner) revert TransferCallerNotOwnerNorApproved();
}
@@ -546,7 +546,7 @@ contract ERC721A is IERC721A {
uint256 tokenId,
bytes memory _data
) private returns (bool) {
try ERC721A__IERC721Receiver(to).onERC721Received(_erc721aMsgSender(), from, tokenId, _data)
try ERC721A__IERC721Receiver(to).onERC721Received(_msgSenderERC721A(), from, tokenId, _data)
returns (bytes4 retval) {
return retval == ERC721A__IERC721Receiver(to).onERC721Received.selector;
} catch (bytes memory reason) {
@@ -610,7 +610,7 @@ contract ERC721A is IERC721A {
*
* If you are writing GSN compatible contracts, you need to override this function.
*/
function _erc721aMsgSender() internal view virtual returns (address) {
function _msgSenderERC721A() internal view virtual returns (address) {
return msg.sender;
}