From f8c486ea1b729d979697c8490665f23ab25caddd Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Wed, 12 Oct 2016 20:07:15 -0300 Subject: [PATCH] style changes to base token --- contracts/BaseToken.sol | 80 +++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/contracts/BaseToken.sol b/contracts/BaseToken.sol index 4fbea044f..c3fdc8134 100644 --- a/contracts/BaseToken.sol +++ b/contracts/BaseToken.sol @@ -7,48 +7,50 @@ import './ERC20.sol'; * ERC 20 token * * https://github.com/ethereum/EIPs/issues/20 - * Based on original code by FirstBlood: + * Based on code by FirstBlood: * https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol */ contract BaseToken is ERC20 { - function transfer(address _to, uint256 _value) returns (bool success) { - if (balances[msg.sender] >= _value && balances[_to] + _value > balances[_to]) { - balances[msg.sender] -= _value; - balances[_to] += _value; - Transfer(msg.sender, _to, _value); - return true; - } else { return false; } - } - - function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { - if (balances[_from] >= _value && allowed[_from][msg.sender] >= _value && balances[_to] + _value > balances[_to]) { - balances[_to] += _value; - balances[_from] -= _value; - allowed[_from][msg.sender] -= _value; - Transfer(_from, _to, _value); - return true; - } else { return false; } - } - - function balanceOf(address _owner) constant returns (uint256 balance) { - return balances[_owner]; - } - - function approve(address _spender, uint256 _value) returns (bool success) { - allowed[msg.sender][_spender] = _value; - Approval(msg.sender, _spender, _value); - return true; - } - - function allowance(address _owner, address _spender) constant returns (uint256 remaining) { - return allowed[_owner][_spender]; - } - - mapping(address => uint256) balances; - - mapping (address => mapping (address => uint256)) allowed; - - uint256 public totalSupply; + mapping(address => uint256) balances; + mapping (address => mapping (address => uint256)) allowed; + uint256 public totalSupply; + + + function transfer(address _to, uint256 _value) returns (bool success) { + if (balances[msg.sender] >= _value && + balances[_to] + _value > balances[_to]) { + balances[msg.sender] -= _value; + balances[_to] += _value; + Transfer(msg.sender, _to, _value); + return true; + } else { return false; } + } + + function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { + if (balances[_from] >= _value && + allowed[_from][msg.sender] >= _value && + balances[_to] + _value > balances[_to]) { + balances[_to] += _value; + balances[_from] -= _value; + allowed[_from][msg.sender] -= _value; + Transfer(_from, _to, _value); + return true; + } else { return false; } + } + + function balanceOf(address _owner) constant returns (uint256 balance) { + return balances[_owner]; + } + + function approve(address _spender, uint256 _value) returns (bool success) { + allowed[msg.sender][_spender] = _value; + Approval(msg.sender, _spender, _value); + return true; + } + + function allowance(address _owner, address _spender) constant returns (uint256 remaining) { + return allowed[_owner][_spender]; + } }