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

Implement tokensByIndex extension

Browse Source 
- Remove restrictions from mock mint and burn calls
This commit is contained in:
Santiago Palladino
2018-03-09 12:58:16 -03:00
parent d726c79e5f
commit 54a1d2eacc
8 changed files with 184 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contracts/token/ERC721/ERC721BasicToken.sol
View File

@ -19,9 +19,6 @@ contract ERC721BasicToken is ERC721Basic {
// Equals to bytes4(keccak256("onERC721Received(address,uint256,bytes)"))
bytes4 ERC721_RECEIVED = 0xf0b9e5ba;
// Total amount of tokens
uint256 internal totalTokens;
// Mapping from token ID to owner
mapping (uint256 => address) internal tokenOwner;
@ -194,7 +191,6 @@ contract ERC721BasicToken is ERC721Basic {
function doMint(address _to, uint256 _tokenId) internal {
require(_to != address(0));
addToken(_to, _tokenId);
totalTokens = totalTokens.add(1);
Transfer(0x0, _to, _tokenId);
}
@ -203,11 +199,10 @@ contract ERC721BasicToken is ERC721Basic {
* @dev Reverts if the token does not exist
* @param _tokenId uint256 ID of the token being burned by the msg.sender
*/
function doBurn(uint256 _tokenId) onlyOwnerOf(_tokenId) internal {
clearApproval(msg.sender, _tokenId);
removeToken(msg.sender, _tokenId);
totalTokens = totalTokens.sub(1);
Transfer(msg.sender, 0x0, _tokenId);
function doBurn(address _owner, uint256 _tokenId) internal {
clearApproval(_owner, _tokenId);
removeToken(_owner, _tokenId);
Transfer(_owner, 0x0, _tokenId);
}
/**