Remove ERC827 token. (#1045)
Implementing this token is unsafe as per comments here: https://github.com/ethereum/EIPs/issues/827#issuecomment-397857455
This commit is contained in:
Maciej Górski
committed by
Francisco Giordano
Francisco Giordano
parent
dc1e352cc4
commit
6b37ba36a1
@ -1,15 +0,0 @@
|
||||
pragma solidity ^0.4.24;
|
||||
|
||||
|
||||
import "../token/ERC827/ERC827Token.sol";
|
||||
|
||||
|
||||
// mock class using ERC827 Token
|
||||
contract ERC827TokenMock is ERC827Token {
|
||||
|
||||
constructor(address initialAccount, uint256 initialBalance) public {
|
||||
balances[initialAccount] = initialBalance;
|
||||
totalSupply_ = initialBalance;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
pragma solidity ^0.4.24;
|
||||
|
||||
|
||||
import "../ERC20/ERC20.sol";
|
||||
|
||||
|
||||
/**
|
||||
* @title ERC827 interface, an extension of ERC20 token standard
|
||||
*
|
||||
* @dev Interface of a ERC827 token, following the ERC20 standard with extra
|
||||
* methods to transfer value and data and execute calls in transfers and
|
||||
* approvals.
|
||||
*/
|
||||
contract ERC827 is ERC20 {
|
||||
function approveAndCall(
|
||||
address _spender,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool);
|
||||
|
||||
function transferAndCall(
|
||||
address _to,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool);
|
||||
|
||||
function transferFromAndCall(
|
||||
address _from,
|
||||
address _to,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool);
|
||||
}
|
||||
@ -1,163 +0,0 @@
|
||||
/* solium-disable security/no-low-level-calls */
|
||||
|
||||
pragma solidity ^0.4.24;
|
||||
|
||||
import "./ERC827.sol";
|
||||
import "../ERC20/StandardToken.sol";
|
||||
|
||||
|
||||
/**
|
||||
* @title ERC827, an extension of ERC20 token standard
|
||||
*
|
||||
* @dev Implementation the ERC827, following the ERC20 standard with extra
|
||||
* methods to transfer value and data and execute calls in transfers and
|
||||
* approvals. Uses OpenZeppelin StandardToken.
|
||||
*/
|
||||
contract ERC827Token is ERC827, StandardToken {
|
||||
|
||||
/**
|
||||
* @dev Addition to ERC20 token methods. It allows to
|
||||
* approve the transfer of value and execute a call with the sent data.
|
||||
* Beware that changing an allowance with this method brings the risk that
|
||||
* someone may use both the old and the new allowance by unfortunate
|
||||
* transaction ordering. One possible solution to mitigate this race condition
|
||||
* is to first reduce the spender's allowance to 0 and set the desired value
|
||||
* afterwards:
|
||||
* https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729
|
||||
* @param _spender The address that will spend the funds.
|
||||
* @param _value The amount of tokens to be spent.
|
||||
* @param _data ABI-encoded contract call to call `_spender` address.
|
||||
* @return true if the call function was executed successfully
|
||||
*/
|
||||
function approveAndCall(
|
||||
address _spender,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool)
|
||||
{
|
||||
require(_spender != address(this));
|
||||
|
||||
super.approve(_spender, _value);
|
||||
|
||||
// solium-disable-next-line security/no-call-value
|
||||
require(_spender.call.value(msg.value)(_data));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Addition to ERC20 token methods. Transfer tokens to a specified
|
||||
* address and execute a call with the sent data on the same transaction
|
||||
* @param _to address The address which you want to transfer to
|
||||
* @param _value uint256 the amout of tokens to be transfered
|
||||
* @param _data ABI-encoded contract call to call `_to` address.
|
||||
* @return true if the call function was executed successfully
|
||||
*/
|
||||
function transferAndCall(
|
||||
address _to,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool)
|
||||
{
|
||||
require(_to != address(this));
|
||||
|
||||
super.transfer(_to, _value);
|
||||
|
||||
// solium-disable-next-line security/no-call-value
|
||||
require(_to.call.value(msg.value)(_data));
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Addition to ERC20 token methods. Transfer tokens from one address to
|
||||
* another and make a contract call on the same transaction
|
||||
* @param _from The address which you want to send tokens from
|
||||
* @param _to The address which you want to transfer to
|
||||
* @param _value The amout of tokens to be transferred
|
||||
* @param _data ABI-encoded contract call to call `_to` address.
|
||||
* @return true if the call function was executed successfully
|
||||
*/
|
||||
function transferFromAndCall(
|
||||
address _from,
|
||||
address _to,
|
||||
uint256 _value,
|
||||
bytes _data
|
||||
)
|
||||
public payable returns (bool)
|
||||
{
|
||||
require(_to != address(this));
|
||||
|
||||
super.transferFrom(_from, _to, _value);
|
||||
|
||||
// solium-disable-next-line security/no-call-value
|
||||
require(_to.call.value(msg.value)(_data));
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Addition to StandardToken methods. Increase the amount of tokens that
|
||||
* an owner allowed to a spender and execute a call with the sent data.
|
||||
* approve should be called when allowed[_spender] == 0. To increment
|
||||
* allowed value is better to use this function to avoid 2 calls (and wait until
|
||||
* the first transaction is mined)
|
||||
* From MonolithDAO Token.sol
|
||||
* @param _spender The address which will spend the funds.
|
||||
* @param _addedValue The amount of tokens to increase the allowance by.
|
||||
* @param _data ABI-encoded contract call to call `_spender` address.
|
||||
*/
|
||||
function increaseApprovalAndCall(
|
||||
address _spender,
|
||||
uint _addedValue,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool)
|
||||
{
|
||||
require(_spender != address(this));
|
||||
|
||||
super.increaseApproval(_spender, _addedValue);
|
||||
|
||||
// solium-disable-next-line security/no-call-value
|
||||
require(_spender.call.value(msg.value)(_data));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* @dev Addition to StandardToken methods. Decrease the amount of tokens that
|
||||
* an owner allowed to a spender and execute a call with the sent data.
|
||||
* approve should be called when allowed[_spender] == 0. To decrement
|
||||
* allowed value is better to use this function to avoid 2 calls (and wait until
|
||||
* the first transaction is mined)
|
||||
* From MonolithDAO Token.sol
|
||||
* @param _spender The address which will spend the funds.
|
||||
* @param _subtractedValue The amount of tokens to decrease the allowance by.
|
||||
* @param _data ABI-encoded contract call to call `_spender` address.
|
||||
*/
|
||||
function decreaseApprovalAndCall(
|
||||
address _spender,
|
||||
uint _subtractedValue,
|
||||
bytes _data
|
||||
)
|
||||
public
|
||||
payable
|
||||
returns (bool)
|
||||
{
|
||||
require(_spender != address(this));
|
||||
|
||||
super.decreaseApproval(_spender, _subtractedValue);
|
||||
|
||||
// solium-disable-next-line security/no-call-value
|
||||
require(_spender.call.value(msg.value)(_data));
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user