poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove code dublication

This commit is contained in:
Roman Storm 2018-07-11 13:12:48 -07:00
parent 3e7560d08e
commit bb1611b468
No known key found for this signature in database
GPG Key ID: E3282F1F2CE28E55
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contracts/ERC677BridgeToken.sol
View File

@ -26,21 +26,23 @@ contract ERC677BridgeToken is
function transferAndCall(address _to, uint _value, bytes _data)
external validRecipient(_to) returns (bool)
{
require(_value <= balances[msg.sender]);
require(superTransfer(_to, _value));
emit Transfer(msg.sender, _to, _value, _data);
balances[msg.sender] = balances[msg.sender].sub(_value);
balances[_to] = balances[_to].add(_value);
if (isContract(_to)) {
require(contractFallback(_to, _value, _data));
}
emit Transfer(msg.sender, _to, _value);
emit Transfer(msg.sender, _to, _value, _data);
return true;
}
function superTransfer(address _to, uint256 _value) internal returns(bool)
{
return super.transfer(_to, _value);
}
function transfer(address _to, uint256 _value) public returns (bool)
{
require(super.transfer(_to, _value));
require(superTransfer(_to, _value));
if (isContract(_to)) {
contractFallback(_to, _value, new bytes(0));
}