cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix StandardToken

Browse Source
This commit is contained in:
Denton Liu 2016-08-19 11:21:54 -04:00
parent 9ca4948d6a
commit 876b39e8e5
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
std/StandardToken.sol
View File

@ -1,28 +1,20 @@
import "./Token.sol"; import "./Token.sol";
contract StandardToken is Token { contract StandardToken is Token {
uint256 tokenSupply; uint256 public totalSupply;
mapping (address => uint256) balances; mapping (address => uint256) public balanceOf;
mapping (address => mapping (address =>
mapping (address => uint256)) approvedTransfers; mapping (address => uint256)) public allowance;
function StandardToken(address _initialOwner, uint256 _supply) { function StandardToken(address _initialOwner, uint256 _supply) {
tokenSupply = _supply; totalSupply = _supply;
balances[_initialOwner] = _supply; balanceOf[_initialOwner] = _supply;
}
function totalSupply() constant returns (uint256 supply) {
return tokenSupply;
}
function balanceOf(address _owner) constant returns (uint256 balance) {
return balances[_owner];
} }
function transfer(address _to, uint256 _value) returns (bool success) { function transfer(address _to, uint256 _value) returns (bool success) {
if (balances[msg.sender] >= _value) { if (balanceOf[msg.sender] >= _value) {
balances[msg.sender] -= _value; balanceOf[msg.sender] -= _value;
balances[_to] += _value; balanceOf[_to] += _value;
Transfer(msg.sender, _to, _value); Transfer(msg.sender, _to, _value);
return true; return true;
} }
@ -32,9 +24,9 @@ contract StandardToken is Token {
} }
function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {
if (approvedTransfers[_from][msg.sender] >= _value) { if (allowance[_from][msg.sender] >= _value) {
approvedTransfers[_from][msg.sender] -= _value; allowance[_from][msg.sender] -= _value;
balances[_to] += _value; balanceOf[_to] += _value;
Transfer(_from, _to, _value); Transfer(_from, _to, _value);
return true; return true;
} }
@ -44,12 +36,8 @@ contract StandardToken is Token {
} }
function approve(address _spender, uint256 _value) returns (bool success) { function approve(address _spender, uint256 _value) returns (bool success) {
approvedTransfers[msg.sender][_spender] = _value; allowance[msg.sender][_spender] = _value;
Approval(msg.sender, _spender, _value); Approval(msg.sender, _spender, _value);
return true; return true;
} }
function allowance(address _owner, address _spender) constant returns (uint256 remaining) {
return approvedTransfers[_owner][_spender];
}
} }