Update Token transferFrom function name to prevent ERC20 override
transferFrom -> onlyDepositTransferFrom
@@ -20,7 +20,6 @@ contract TBTCToken is ERC20Detailed, ERC20, MinterAuthority {
/// @param _amount The amount of tokens that will be created.
function mint(address _account, uint256 _amount) public onlyDeposit returns (bool){
// NOTE: this is a public function with unchecked minting.
- // TODO: enforce calling authority.
_mint(_account, _amount);
return true;
}
@@ -33,19 +32,16 @@ contract TBTCToken is ERC20Detailed, ERC20, MinterAuthority {
function burnFrom(address _account, uint256 _amount) public onlyDeposit {
// NOTE: this uses internal function _burn instead of _burnFrom.
// This will bypass allowance check for now.
- // TODO: enforce calling authority.
_burn(_account, _amount);
}
- /// @dev Transfer tokens from one address to another
- /// Uses the internal _transfer function.
+ /// @notice Transfer tokens from one address to another
+ /// @dev Uses the internal _transfer function and
+ /// bypasses allowance check.
/// @param _from The address to send tokens from
/// @param _to The address to transfer tokens to
/// @param _value The amount of tokens to be transferred
- function transferFrom(address _from, address _to, uint256 _value) public onlyDeposit returns (bool) {
- // NOTE: this overrides transferFrom in openZeppelin ERC20.sol
- // in order to bypass allowance check for now.
- // TODO: enforce calling authority.
+ function onlyDepositTransferFrom(address _from, address _to, uint256 _value) public onlyDeposit returns (bool) {
_transfer(_from, _to, _value);
return true;
}
