377431bc4c
* 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
23 lines
638 B
Solidity
23 lines
638 B
Solidity
pragma solidity ^0.5.0;
|
|
|
|
import "./ERC721.sol";
|
|
import "../../lifecycle/Pausable.sol";
|
|
|
|
/**
|
|
* @title ERC721 Non-Fungible Pausable token
|
|
* @dev ERC721 modified with pausable transfers.
|
|
*/
|
|
contract ERC721Pausable is ERC721, Pausable {
|
|
function approve(address to, uint256 tokenId) public whenNotPaused {
|
|
super.approve(to, tokenId);
|
|
}
|
|
|
|
function setApprovalForAll(address to, bool approved) public whenNotPaused {
|
|
super.setApprovalForAll(to, approved);
|
|
}
|
|
|
|
function _transferFrom(address from, address to, uint256 tokenId) internal whenNotPaused {
|
|
super._transferFrom(from, to, tokenId);
|
|
}
|
|
}
|