Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
0e7965e0
Commit
0e7965e0
authored
Mar 17, 2021
by
github-actions
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Transpile
cf0ed194
parent
4bd1add2
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
ERC721Upgradeable.sol
contracts/token/ERC721/ERC721Upgradeable.sol
+2
-2
package-lock.json
package-lock.json
+0
-0
No files found.
contracts/token/ERC721/ERC721Upgradeable.sol
View file @
0e7965e0
...
@@ -120,7 +120,7 @@ contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeab
...
@@ -120,7 +120,7 @@ contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeab
address owner = ERC721Upgradeable.ownerOf(tokenId);
address owner = ERC721Upgradeable.ownerOf(tokenId);
require(to != owner, "ERC721: approval to current owner");
require(to != owner, "ERC721: approval to current owner");
require(_msgSender() == owner ||
ERC721Upgradeable.
isApprovedForAll(owner, _msgSender()),
require(_msgSender() == owner || isApprovedForAll(owner, _msgSender()),
"ERC721: approve caller is not owner nor approved for all"
"ERC721: approve caller is not owner nor approved for all"
);
);
...
@@ -223,7 +223,7 @@ contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeab
...
@@ -223,7 +223,7 @@ contract ERC721Upgradeable is Initializable, ContextUpgradeable, ERC165Upgradeab
function _isApprovedOrOwner(address spender, uint256 tokenId) internal view virtual returns (bool) {
function _isApprovedOrOwner(address spender, uint256 tokenId) internal view virtual returns (bool) {
require(_exists(tokenId), "ERC721: operator query for nonexistent token");
require(_exists(tokenId), "ERC721: operator query for nonexistent token");
address owner = ERC721Upgradeable.ownerOf(tokenId);
address owner = ERC721Upgradeable.ownerOf(tokenId);
return (spender == owner || getApproved(tokenId) == spender ||
ERC721Upgradeable.
isApprovedForAll(owner, spender));
return (spender == owner || getApproved(tokenId) == spender || isApprovedForAll(owner, spender));
}
}
/**
/**
...
...
package-lock.json
View file @
0e7965e0
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment