a7e91856f3
* Update to ganache-cli v6.1.0 and truffle v4.1.0 * Update to stable version of ganache-cli * fix: update event emission warning - Fix event emission warnings for solidity 4.21 after truffle has been updated to use this version * fix pr review comments * update to truffle v4.1.5 * update package-lock * add additional emit keywords * update solidity-coverage to 0.4.15 * update to solium 1.1.6 * fix MerkleProof coverage analysis by testing through wrapper * change version pragma to ^0.4.21 * fix solium linting errors
33 lines
1.0 KiB
Solidity
33 lines
1.0 KiB
Solidity
pragma solidity ^0.4.21;
|
|
|
|
import "./StandardToken.sol";
|
|
import "../../lifecycle/Pausable.sol";
|
|
|
|
|
|
/**
|
|
* @title Pausable token
|
|
* @dev StandardToken modified with pausable transfers.
|
|
**/
|
|
contract PausableToken is StandardToken, Pausable {
|
|
|
|
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
|
|
return super.transfer(_to, _value);
|
|
}
|
|
|
|
function transferFrom(address _from, address _to, uint256 _value) public whenNotPaused returns (bool) {
|
|
return super.transferFrom(_from, _to, _value);
|
|
}
|
|
|
|
function approve(address _spender, uint256 _value) public whenNotPaused returns (bool) {
|
|
return super.approve(_spender, _value);
|
|
}
|
|
|
|
function increaseApproval(address _spender, uint _addedValue) public whenNotPaused returns (bool success) {
|
|
return super.increaseApproval(_spender, _addedValue);
|
|
}
|
|
|
|
function decreaseApproval(address _spender, uint _subtractedValue) public whenNotPaused returns (bool success) {
|
|
return super.decreaseApproval(_spender, _subtractedValue);
|
|
}
|
|
}
|