NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update ERC721 to latest 1.11.0 from OpenZeppelin-solidity (#11)

Browse Source 
* Update ERC721 to latest 1.11.0 from OpenZeppelin-solidity

* Hardcode supported interfaces instead of using lookup table. This avoids shifting storage when extending supports interface.

* Update build artifacts

* Fix linter errors
This commit is contained in:
Santiago Palladino
2018-08-27 18:42:21 -03:00
committed by GitHub
parent 8f4610e007
commit c46f0353d1
72 changed files with 39017 additions and 37207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
contracts/mocks/ERC721ReceiverMock.sol
View File

@ -7,15 +7,22 @@ contract ERC721ReceiverMock is ERC721Receiver {
bytes4 retval;
bool reverts;
event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas);
event Received(
address _operator,
address _from,
uint256 _tokenId,
bytes _data,
uint256 _gas
);
function ERC721ReceiverMock(bytes4 _retval, bool _reverts) public {
constructor(bytes4 _retval, bool _reverts) public {
retval = _retval;
reverts = _reverts;
}
function onERC721Received(
address _address,
address _operator,
address _from,
uint256 _tokenId,
bytes _data
)
@ -24,7 +31,8 @@ contract ERC721ReceiverMock is ERC721Receiver {
{
require(!reverts);
emit Received(
_address,
_operator,
_from,
_tokenId,
_data,
gasleft() // msg.gas was deprecated in solidityv0.4.21

2
contracts/mocks/ERC721TokenMock.sol
View File

@ -9,7 +9,7 @@ import "../token/ERC721/ERC721Token.sol";
* and a public setter for metadata URI
*/
contract ERC721TokenMock is ERC721Token {
function ERC721TokenMock(string name, string symbol) public {
constructor(string name, string symbol) public {
ERC721Token.initialize(name, symbol);
}