* added _safeTransferFrom function * added safeMint functions * added package-lock.json for consistency, don't know why it changes * added initial suggestions/modifications * change _safeTransferFrom to internal, reverted package-lock.json to original, and changed ERC721Pausable to override _transferFrom instead of transferFrom * included tests for safeMint functions * modified safeMint tests to be on ERC721Mock contract * added safeMint to ERC721Mintable & respective test to ERC721MintBurn.behavior.js
45 lines
1.4 KiB
Solidity
45 lines
1.4 KiB
Solidity
pragma solidity ^0.5.0;
|
|
|
|
import "./ERC721.sol";
|
|
import "../../access/roles/MinterRole.sol";
|
|
|
|
/**
|
|
* @title ERC721Mintable
|
|
* @dev ERC721 minting logic.
|
|
*/
|
|
contract ERC721Mintable is ERC721, MinterRole {
|
|
/**
|
|
* @dev Function to mint tokens.
|
|
* @param to The address that will receive the minted token.
|
|
* @param tokenId The token id to mint.
|
|
* @return A boolean that indicates if the operation was successful.
|
|
*/
|
|
function mint(address to, uint256 tokenId) public onlyMinter returns (bool) {
|
|
_mint(to, tokenId);
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* @dev Function to safely mint tokens.
|
|
* @param to The address that will receive the minted token.
|
|
* @param tokenId The token id to mint.
|
|
* @return A boolean that indicates if the operation was successful.
|
|
*/
|
|
function safeMint(address to, uint256 tokenId) public onlyMinter returns (bool) {
|
|
_safeMint(to, tokenId);
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* @dev Function to safely mint tokens.
|
|
* @param to The address that will receive the minted token.
|
|
* @param tokenId The token id to mint.
|
|
* @param _data bytes data to send along with a safe transfer check.
|
|
* @return A boolean that indicates if the operation was successful.
|
|
*/
|
|
function safeMint(address to, uint256 tokenId, bytes memory _data) public onlyMinter returns (bool) {
|
|
_safeMint(to, tokenId, _data);
|
|
return true;
|
|
}
|
|
}
|