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
91516b23
Unverified
Commit
91516b23
authored
Jun 02, 2020
by
Nicolás Venturo
Committed by
GitHub
Jun 02, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow overriding of ERC1155 functions (#2263)
* Make receiver functions private * Make external functions public
parent
52f7b6e0
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
21 deletions
+11
-21
ERC1155Mock.sol
contracts/mocks/ERC1155Mock.sol
+0
-8
ERC1155.sol
contracts/token/ERC1155/ERC1155.sol
+11
-13
No files found.
contracts/mocks/ERC1155Mock.sol
View file @
91516b23
...
@@ -24,12 +24,4 @@ contract ERC1155Mock is ERC1155 {
...
@@ -24,12 +24,4 @@ contract ERC1155Mock is ERC1155 {
function burnBatch(address owner, uint256[] memory ids, uint256[] memory values) public {
function burnBatch(address owner, uint256[] memory ids, uint256[] memory values) public {
_burnBatch(owner, ids, values);
_burnBatch(owner, ids, values);
}
}
function doSafeTransferAcceptanceCheck(address operator, address from, address to, uint256 id, uint256 value, bytes memory data) public {
_doSafeTransferAcceptanceCheck(operator, from, to, id, value, data);
}
function doSafeBatchTransferAcceptanceCheck(address operator, address from, address to, uint256[] memory ids, uint256[] memory values, bytes memory data) public {
_doSafeBatchTransferAcceptanceCheck(operator, from, to, ids, values, data);
}
}
}
contracts/token/ERC1155/ERC1155.sol
View file @
91516b23
...
@@ -99,7 +99,7 @@ contract ERC1155 is ERC165, IERC1155
...
@@ -99,7 +99,7 @@ contract ERC1155 is ERC165, IERC1155
* @param operator address to set the approval
* @param operator address to set the approval
* @param approved representing the status of the approval to be set
* @param approved representing the status of the approval to be set
*/
*/
function setApprovalForAll(address operator, bool approved)
external override virtual
{
function setApprovalForAll(address operator, bool approved)
public virtual override
{
require(msg.sender != operator, "ERC1155: cannot set approval status for self");
require(msg.sender != operator, "ERC1155: cannot set approval status for self");
_operatorApprovals[msg.sender][operator] = approved;
_operatorApprovals[msg.sender][operator] = approved;
emit ApprovalForAll(msg.sender, operator, approved);
emit ApprovalForAll(msg.sender, operator, approved);
...
@@ -130,11 +130,11 @@ contract ERC1155 is ERC165, IERC1155
...
@@ -130,11 +130,11 @@ contract ERC1155 is ERC165, IERC1155
address to,
address to,
uint256 id,
uint256 id,
uint256 value,
uint256 value,
bytes
calldata
data
bytes
memory
data
)
)
external
public
override
virtual
virtual
override
{
{
require(to != address(0), "ERC1155: target address must be non-zero");
require(to != address(0), "ERC1155: target address must be non-zero");
require(
require(
...
@@ -164,13 +164,13 @@ contract ERC1155 is ERC165, IERC1155
...
@@ -164,13 +164,13 @@ contract ERC1155 is ERC165, IERC1155
function safeBatchTransferFrom(
function safeBatchTransferFrom(
address from,
address from,
address to,
address to,
uint256[]
calldata
ids,
uint256[]
memory
ids,
uint256[]
calldata
values,
uint256[]
memory
values,
bytes
calldata
data
bytes
memory
data
)
)
external
public
override
virtual
virtual
override
{
{
require(ids.length == values.length, "ERC1155: IDs and values must have same lengths");
require(ids.length == values.length, "ERC1155: IDs and values must have same lengths");
require(to != address(0), "ERC1155: target address must be non-zero");
require(to != address(0), "ERC1155: target address must be non-zero");
...
@@ -275,8 +275,7 @@ contract ERC1155 is ERC165, IERC1155
...
@@ -275,8 +275,7 @@ contract ERC1155 is ERC165, IERC1155
uint256 value,
uint256 value,
bytes memory data
bytes memory data
)
)
internal
private
virtual
{
{
if(to.isContract()) {
if(to.isContract()) {
require(
require(
...
@@ -295,8 +294,7 @@ contract ERC1155 is ERC165, IERC1155
...
@@ -295,8 +294,7 @@ contract ERC1155 is ERC165, IERC1155
uint256[] memory values,
uint256[] memory values,
bytes memory data
bytes memory data
)
)
internal
private
virtual
{
{
if(to.isContract()) {
if(to.isContract()) {
require(
require(
...
...
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