From bf430709d531bdc066a13f1b638f7fb8c63caf67 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Tue, 16 Aug 2016 15:10:40 -0400 Subject: Add back standard contracts --- std/Coin | 9 +++++++++ std/CoinReg | 6 ++++++ std/Config | 6 ++++++ std/NameReg | 6 ++++++ std/coin | 9 +++++++++ std/configUser | 5 +++++ std/mortal | 8 ++++++++ std/named | 9 +++++++++ std/owned | 13 +++++++++++++ std/service | 8 ++++++++ std/std | 6 ++++++ 11 files changed, 85 insertions(+) create mode 100644 std/Coin create mode 100644 std/CoinReg create mode 100644 std/Config create mode 100644 std/NameReg create mode 100644 std/coin create mode 100644 std/configUser create mode 100644 std/mortal create mode 100644 std/named create mode 100644 std/owned create mode 100644 std/service create mode 100644 std/std (limited to 'std') diff --git a/std/Coin b/std/Coin new file mode 100644 index 00000000..aca30e6b --- /dev/null +++ b/std/Coin @@ -0,0 +1,9 @@ +contract Coin { + function isApprovedFor(address _target, address _proxy) constant returns (bool _r) {} + function isApproved(address _proxy) constant returns (bool _r) {} + function sendCoinFrom(address _from, uint256 _val, address _to) {} + function coinBalanceOf(address _a) constant returns (uint256 _r) {} + function sendCoin(uint256 _val, address _to) {} + function coinBalance() constant returns (uint256 _r) {} + function approve(address _a) {} +} diff --git a/std/CoinReg b/std/CoinReg new file mode 100644 index 00000000..58400a98 --- /dev/null +++ b/std/CoinReg @@ -0,0 +1,6 @@ +contract CoinReg{ + function count() constant returns (uint256 r) {} + function info(uint256 i) constant returns (address addr, bytes3 name, uint256 denom) {} + function register(bytes3 name, uint256 denom) {} + function unregister() {} +} diff --git a/std/Config b/std/Config new file mode 100644 index 00000000..868e07df --- /dev/null +++ b/std/Config @@ -0,0 +1,6 @@ +contract Config { + function lookup(uint256 service) constant returns (address a) {} + function kill() {} + function unregister(uint256 id) {} + function register(uint256 id, address service) {} +} diff --git a/std/NameReg b/std/NameReg new file mode 100644 index 00000000..48fd6c6e --- /dev/null +++ b/std/NameReg @@ -0,0 +1,6 @@ +contract NameReg { + function register(bytes32 name) {} + function addressOf(bytes32 name) constant returns (address addr) {} + function unregister() {} + function nameOf(address addr) constant returns (bytes32 name) {} +} diff --git a/std/coin b/std/coin new file mode 100644 index 00000000..691fdd66 --- /dev/null +++ b/std/coin @@ -0,0 +1,9 @@ +import "CoinReg"; +import "Config"; +import "configUser"; + +contract coin is configUser { + function coin(bytes3 name, uint denom) { + CoinReg(Config(configAddr()).lookup(3)).register(name, denom); + } +} diff --git a/std/configUser b/std/configUser new file mode 100644 index 00000000..15a91621 --- /dev/null +++ b/std/configUser @@ -0,0 +1,5 @@ +contract configUser { + function configAddr() constant returns (address a) { + return 0xc6d9d2cd449a754c494264e1809c50e34d64562b; + } +} diff --git a/std/mortal b/std/mortal new file mode 100644 index 00000000..f304f044 --- /dev/null +++ b/std/mortal @@ -0,0 +1,8 @@ +import "owned"; + +contract mortal is owned { + function kill() { + if (msg.sender == owner) + selfdestruct(owner); + } +} diff --git a/std/named b/std/named new file mode 100644 index 00000000..f077c62a --- /dev/null +++ b/std/named @@ -0,0 +1,9 @@ +import "Config"; +import "NameReg"; +import "configUser"; + +contract named is configUser { + function named(bytes32 name) { + NameReg(Config(configAddr()).lookup(1)).register(name); + } +} diff --git a/std/owned b/std/owned new file mode 100644 index 00000000..37f0ecb9 --- /dev/null +++ b/std/owned @@ -0,0 +1,13 @@ +contract owned { + address owner; + + modifier onlyowner() { + if (msg.sender == owner) { + _ + } + } + + function owned() { + owner = msg.sender; + } +} diff --git a/std/service b/std/service new file mode 100644 index 00000000..31ef8da7 --- /dev/null +++ b/std/service @@ -0,0 +1,8 @@ +import "Config"; +import "configUser"; + +contract service is configUser { + function service(uint _n) { + Config(configAddr()).register(_n, this); + } +} diff --git a/std/std b/std/std new file mode 100644 index 00000000..0340f578 --- /dev/null +++ b/std/std @@ -0,0 +1,6 @@ +import "owned"; +import "mortal"; +import "Config"; +import "configUser"; +import "NameReg"; +import "named"; -- cgit v1.2.3 From 0cd2fc310bc0940b0f64dd2302171dd6b50dd1ff Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Aug 2016 10:26:28 -0400 Subject: Change imports --- std/coin | 6 +++--- std/mortal | 2 +- std/named | 6 +++--- std/service | 4 ++-- std/std | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'std') diff --git a/std/coin b/std/coin index 691fdd66..b8ed5e4b 100644 --- a/std/coin +++ b/std/coin @@ -1,6 +1,6 @@ -import "CoinReg"; -import "Config"; -import "configUser"; +import "./CoinReg"; +import "./Config"; +import "./configUser"; contract coin is configUser { function coin(bytes3 name, uint denom) { diff --git a/std/mortal b/std/mortal index f304f044..b32e8a34 100644 --- a/std/mortal +++ b/std/mortal @@ -1,4 +1,4 @@ -import "owned"; +import "./owned"; contract mortal is owned { function kill() { diff --git a/std/named b/std/named index f077c62a..3907bf77 100644 --- a/std/named +++ b/std/named @@ -1,6 +1,6 @@ -import "Config"; -import "NameReg"; -import "configUser"; +import "./Config"; +import "./NameReg"; +import "./configUser"; contract named is configUser { function named(bytes32 name) { diff --git a/std/service b/std/service index 31ef8da7..48efae0e 100644 --- a/std/service +++ b/std/service @@ -1,5 +1,5 @@ -import "Config"; -import "configUser"; +import "./Config"; +import "./configUser"; contract service is configUser { function service(uint _n) { diff --git a/std/std b/std/std index 0340f578..7cf95c6a 100644 --- a/std/std +++ b/std/std @@ -1,6 +1,6 @@ -import "owned"; -import "mortal"; -import "Config"; -import "configUser"; -import "NameReg"; -import "named"; +import "./owned"; +import "./mortal"; +import "./Config"; +import "./configUser"; +import "./NameReg"; +import "./named"; -- cgit v1.2.3 From fd578f0ed55c4d08f0292915c3cf4595558d4f06 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Aug 2016 10:37:10 -0400 Subject: Add Token contract --- std/Token | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 std/Token (limited to 'std') diff --git a/std/Token b/std/Token new file mode 100644 index 00000000..50d9ab7a --- /dev/null +++ b/std/Token @@ -0,0 +1,11 @@ +contract Token { + event Transfer(address indexed _from, address indexed _to, uint256 _value); + event Approval(address indexed _owner, address indexed _spender, uint256 _value); + + function totalSupply() constant returns (uint256 supply) {} + function balanceOf(address _owner) constant returns (uint256 balance) {} + function transfer(address _to, uint256 _value) returns (bool success) {} + function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {} + function approve(address _spender, uint256 _value) returns (bool success) {} + function allowance(address _owner, address _spender) constant returns (uint256 remaining) {} +} -- cgit v1.2.3 From 04ffff3cac99690dff79755e9c746c009fab5706 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Aug 2016 10:53:21 -0400 Subject: Add ExampleToken --- std/ExampleToken | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 std/ExampleToken (limited to 'std') diff --git a/std/ExampleToken b/std/ExampleToken new file mode 100644 index 00000000..6d617199 --- /dev/null +++ b/std/ExampleToken @@ -0,0 +1,55 @@ +import "./Token"; + +contract ExampleToken is Token { + uint256 tokenSupply; + mapping (address => uint256) balances; + mapping (address => + mapping (address => uint256)) approvedTransfers; + + function ExampleToken(address _initialOwner, uint256 _supply) { + tokenSupply = _supply; + balances[_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) { + if (balances[msg.sender] >= _value) { + 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 (approvedTransfers[_from][msg.sender] >= _value) { + approvedTransfers[_from][msg.sender] -= _value; + balances[_to] += _value; + Transfer(_from, _to, _value); + return true; + } + else { + return false; + } + } + + function approve(address _spender, uint256 _value) returns (bool success) { + approvedTransfers[msg.sender][_spender] = _value; + Approval(msg.sender, _spender, _value); + return true; + } + + function allowance(address _owner, address _spender) constant returns (uint256 remaining) { + return approvedTransfers[_owner][_spender]; + } +} -- cgit v1.2.3 From 74545e70a4916437bab59d82637526c3087d1fa4 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 17 Aug 2016 10:59:21 -0400 Subject: Update std imports --- std/std | 2 ++ 1 file changed, 2 insertions(+) (limited to 'std') diff --git a/std/std b/std/std index 7cf95c6a..d4fed275 100644 --- a/std/std +++ b/std/std @@ -4,3 +4,5 @@ import "./Config"; import "./configUser"; import "./NameReg"; import "./named"; +import "./Coin"; +import "./ExampleCoin"; -- cgit v1.2.3 From e91e945933eb66d8556b4af1fef657a5f86a7167 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Fri, 19 Aug 2016 10:37:24 -0400 Subject: Remove unnecessary contracts --- std/Coin | 9 --------- std/CoinReg | 6 ------ std/Config | 6 ------ std/NameReg | 6 ------ std/coin | 9 --------- std/configUser | 5 ----- std/named | 9 --------- std/service | 8 -------- std/std | 8 ++------ 9 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 std/Coin delete mode 100644 std/CoinReg delete mode 100644 std/Config delete mode 100644 std/NameReg delete mode 100644 std/coin delete mode 100644 std/configUser delete mode 100644 std/named delete mode 100644 std/service (limited to 'std') diff --git a/std/Coin b/std/Coin deleted file mode 100644 index aca30e6b..00000000 --- a/std/Coin +++ /dev/null @@ -1,9 +0,0 @@ -contract Coin { - function isApprovedFor(address _target, address _proxy) constant returns (bool _r) {} - function isApproved(address _proxy) constant returns (bool _r) {} - function sendCoinFrom(address _from, uint256 _val, address _to) {} - function coinBalanceOf(address _a) constant returns (uint256 _r) {} - function sendCoin(uint256 _val, address _to) {} - function coinBalance() constant returns (uint256 _r) {} - function approve(address _a) {} -} diff --git a/std/CoinReg b/std/CoinReg deleted file mode 100644 index 58400a98..00000000 --- a/std/CoinReg +++ /dev/null @@ -1,6 +0,0 @@ -contract CoinReg{ - function count() constant returns (uint256 r) {} - function info(uint256 i) constant returns (address addr, bytes3 name, uint256 denom) {} - function register(bytes3 name, uint256 denom) {} - function unregister() {} -} diff --git a/std/Config b/std/Config deleted file mode 100644 index 868e07df..00000000 --- a/std/Config +++ /dev/null @@ -1,6 +0,0 @@ -contract Config { - function lookup(uint256 service) constant returns (address a) {} - function kill() {} - function unregister(uint256 id) {} - function register(uint256 id, address service) {} -} diff --git a/std/NameReg b/std/NameReg deleted file mode 100644 index 48fd6c6e..00000000 --- a/std/NameReg +++ /dev/null @@ -1,6 +0,0 @@ -contract NameReg { - function register(bytes32 name) {} - function addressOf(bytes32 name) constant returns (address addr) {} - function unregister() {} - function nameOf(address addr) constant returns (bytes32 name) {} -} diff --git a/std/coin b/std/coin deleted file mode 100644 index b8ed5e4b..00000000 --- a/std/coin +++ /dev/null @@ -1,9 +0,0 @@ -import "./CoinReg"; -import "./Config"; -import "./configUser"; - -contract coin is configUser { - function coin(bytes3 name, uint denom) { - CoinReg(Config(configAddr()).lookup(3)).register(name, denom); - } -} diff --git a/std/configUser b/std/configUser deleted file mode 100644 index 15a91621..00000000 --- a/std/configUser +++ /dev/null @@ -1,5 +0,0 @@ -contract configUser { - function configAddr() constant returns (address a) { - return 0xc6d9d2cd449a754c494264e1809c50e34d64562b; - } -} diff --git a/std/named b/std/named deleted file mode 100644 index 3907bf77..00000000 --- a/std/named +++ /dev/null @@ -1,9 +0,0 @@ -import "./Config"; -import "./NameReg"; -import "./configUser"; - -contract named is configUser { - function named(bytes32 name) { - NameReg(Config(configAddr()).lookup(1)).register(name); - } -} diff --git a/std/service b/std/service deleted file mode 100644 index 48efae0e..00000000 --- a/std/service +++ /dev/null @@ -1,8 +0,0 @@ -import "./Config"; -import "./configUser"; - -contract service is configUser { - function service(uint _n) { - Config(configAddr()).register(_n, this); - } -} diff --git a/std/std b/std/std index d4fed275..785dc1ce 100644 --- a/std/std +++ b/std/std @@ -1,8 +1,4 @@ import "./owned"; import "./mortal"; -import "./Config"; -import "./configUser"; -import "./NameReg"; -import "./named"; -import "./Coin"; -import "./ExampleCoin"; +import "./Token"; +import "./ExampleToken"; -- cgit v1.2.3 From e25fcecaf4de63774b29ccabc456b4cbf38f8425 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Fri, 19 Aug 2016 10:49:50 -0400 Subject: Rename to StandardToken --- std/ExampleToken | 55 ------------------------------------------------------- std/StandardToken | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ std/std | 2 +- 3 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 std/ExampleToken create mode 100644 std/StandardToken (limited to 'std') diff --git a/std/ExampleToken b/std/ExampleToken deleted file mode 100644 index 6d617199..00000000 --- a/std/ExampleToken +++ /dev/null @@ -1,55 +0,0 @@ -import "./Token"; - -contract ExampleToken is Token { - uint256 tokenSupply; - mapping (address => uint256) balances; - mapping (address => - mapping (address => uint256)) approvedTransfers; - - function ExampleToken(address _initialOwner, uint256 _supply) { - tokenSupply = _supply; - balances[_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) { - if (balances[msg.sender] >= _value) { - 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 (approvedTransfers[_from][msg.sender] >= _value) { - approvedTransfers[_from][msg.sender] -= _value; - balances[_to] += _value; - Transfer(_from, _to, _value); - return true; - } - else { - return false; - } - } - - function approve(address _spender, uint256 _value) returns (bool success) { - approvedTransfers[msg.sender][_spender] = _value; - Approval(msg.sender, _spender, _value); - return true; - } - - function allowance(address _owner, address _spender) constant returns (uint256 remaining) { - return approvedTransfers[_owner][_spender]; - } -} diff --git a/std/StandardToken b/std/StandardToken new file mode 100644 index 00000000..a83b599f --- /dev/null +++ b/std/StandardToken @@ -0,0 +1,55 @@ +import "./Token"; + +contract StandardToken is Token { + uint256 tokenSupply; + mapping (address => uint256) balances; + mapping (address => + mapping (address => uint256)) approvedTransfers; + + function StandardToken(address _initialOwner, uint256 _supply) { + tokenSupply = _supply; + balances[_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) { + if (balances[msg.sender] >= _value) { + 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 (approvedTransfers[_from][msg.sender] >= _value) { + approvedTransfers[_from][msg.sender] -= _value; + balances[_to] += _value; + Transfer(_from, _to, _value); + return true; + } + else { + return false; + } + } + + function approve(address _spender, uint256 _value) returns (bool success) { + approvedTransfers[msg.sender][_spender] = _value; + Approval(msg.sender, _spender, _value); + return true; + } + + function allowance(address _owner, address _spender) constant returns (uint256 remaining) { + return approvedTransfers[_owner][_spender]; + } +} diff --git a/std/std b/std/std index 785dc1ce..d5ce157e 100644 --- a/std/std +++ b/std/std @@ -1,4 +1,4 @@ import "./owned"; import "./mortal"; import "./Token"; -import "./ExampleToken"; +import "./StandardToken"; -- cgit v1.2.3 From 9ca4948d6aca230d524882bbcabd1d4230a3ad23 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Fri, 19 Aug 2016 10:51:40 -0400 Subject: CoinAdd .sol prefix to files --- std/StandardToken | 55 --------------------------------------------------- std/StandardToken.sol | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++ std/Token | 11 ----------- std/Token.sol | 11 +++++++++++ std/mortal | 8 -------- std/mortal.sol | 8 ++++++++ std/owned | 13 ------------ std/owned.sol | 13 ++++++++++++ std/std | 4 ---- std/std.sol | 4 ++++ 10 files changed, 91 insertions(+), 91 deletions(-) delete mode 100644 std/StandardToken create mode 100644 std/StandardToken.sol delete mode 100644 std/Token create mode 100644 std/Token.sol delete mode 100644 std/mortal create mode 100644 std/mortal.sol delete mode 100644 std/owned create mode 100644 std/owned.sol delete mode 100644 std/std create mode 100644 std/std.sol (limited to 'std') diff --git a/std/StandardToken b/std/StandardToken deleted file mode 100644 index a83b599f..00000000 --- a/std/StandardToken +++ /dev/null @@ -1,55 +0,0 @@ -import "./Token"; - -contract StandardToken is Token { - uint256 tokenSupply; - mapping (address => uint256) balances; - mapping (address => - mapping (address => uint256)) approvedTransfers; - - function StandardToken(address _initialOwner, uint256 _supply) { - tokenSupply = _supply; - balances[_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) { - if (balances[msg.sender] >= _value) { - 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 (approvedTransfers[_from][msg.sender] >= _value) { - approvedTransfers[_from][msg.sender] -= _value; - balances[_to] += _value; - Transfer(_from, _to, _value); - return true; - } - else { - return false; - } - } - - function approve(address _spender, uint256 _value) returns (bool success) { - approvedTransfers[msg.sender][_spender] = _value; - Approval(msg.sender, _spender, _value); - return true; - } - - function allowance(address _owner, address _spender) constant returns (uint256 remaining) { - return approvedTransfers[_owner][_spender]; - } -} diff --git a/std/StandardToken.sol b/std/StandardToken.sol new file mode 100644 index 00000000..25d0bd38 --- /dev/null +++ b/std/StandardToken.sol @@ -0,0 +1,55 @@ +import "./Token.sol"; + +contract StandardToken is Token { + uint256 tokenSupply; + mapping (address => uint256) balances; + mapping (address => + mapping (address => uint256)) approvedTransfers; + + function StandardToken(address _initialOwner, uint256 _supply) { + tokenSupply = _supply; + balances[_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) { + if (balances[msg.sender] >= _value) { + 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 (approvedTransfers[_from][msg.sender] >= _value) { + approvedTransfers[_from][msg.sender] -= _value; + balances[_to] += _value; + Transfer(_from, _to, _value); + return true; + } + else { + return false; + } + } + + function approve(address _spender, uint256 _value) returns (bool success) { + approvedTransfers[msg.sender][_spender] = _value; + Approval(msg.sender, _spender, _value); + return true; + } + + function allowance(address _owner, address _spender) constant returns (uint256 remaining) { + return approvedTransfers[_owner][_spender]; + } +} diff --git a/std/Token b/std/Token deleted file mode 100644 index 50d9ab7a..00000000 --- a/std/Token +++ /dev/null @@ -1,11 +0,0 @@ -contract Token { - event Transfer(address indexed _from, address indexed _to, uint256 _value); - event Approval(address indexed _owner, address indexed _spender, uint256 _value); - - function totalSupply() constant returns (uint256 supply) {} - function balanceOf(address _owner) constant returns (uint256 balance) {} - function transfer(address _to, uint256 _value) returns (bool success) {} - function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {} - function approve(address _spender, uint256 _value) returns (bool success) {} - function allowance(address _owner, address _spender) constant returns (uint256 remaining) {} -} diff --git a/std/Token.sol b/std/Token.sol new file mode 100644 index 00000000..50d9ab7a --- /dev/null +++ b/std/Token.sol @@ -0,0 +1,11 @@ +contract Token { + event Transfer(address indexed _from, address indexed _to, uint256 _value); + event Approval(address indexed _owner, address indexed _spender, uint256 _value); + + function totalSupply() constant returns (uint256 supply) {} + function balanceOf(address _owner) constant returns (uint256 balance) {} + function transfer(address _to, uint256 _value) returns (bool success) {} + function transferFrom(address _from, address _to, uint256 _value) returns (bool success) {} + function approve(address _spender, uint256 _value) returns (bool success) {} + function allowance(address _owner, address _spender) constant returns (uint256 remaining) {} +} diff --git a/std/mortal b/std/mortal deleted file mode 100644 index b32e8a34..00000000 --- a/std/mortal +++ /dev/null @@ -1,8 +0,0 @@ -import "./owned"; - -contract mortal is owned { - function kill() { - if (msg.sender == owner) - selfdestruct(owner); - } -} diff --git a/std/mortal.sol b/std/mortal.sol new file mode 100644 index 00000000..8de019ab --- /dev/null +++ b/std/mortal.sol @@ -0,0 +1,8 @@ +import "./owned.sol"; + +contract mortal is owned { + function kill() { + if (msg.sender == owner) + selfdestruct(owner); + } +} diff --git a/std/owned b/std/owned deleted file mode 100644 index 37f0ecb9..00000000 --- a/std/owned +++ /dev/null @@ -1,13 +0,0 @@ -contract owned { - address owner; - - modifier onlyowner() { - if (msg.sender == owner) { - _ - } - } - - function owned() { - owner = msg.sender; - } -} diff --git a/std/owned.sol b/std/owned.sol new file mode 100644 index 00000000..37f0ecb9 --- /dev/null +++ b/std/owned.sol @@ -0,0 +1,13 @@ +contract owned { + address owner; + + modifier onlyowner() { + if (msg.sender == owner) { + _ + } + } + + function owned() { + owner = msg.sender; + } +} diff --git a/std/std b/std/std deleted file mode 100644 index d5ce157e..00000000 --- a/std/std +++ /dev/null @@ -1,4 +0,0 @@ -import "./owned"; -import "./mortal"; -import "./Token"; -import "./StandardToken"; diff --git a/std/std.sol b/std/std.sol new file mode 100644 index 00000000..c3f66b1b --- /dev/null +++ b/std/std.sol @@ -0,0 +1,4 @@ +import "./owned.sol"; +import "./mortal.sol"; +import "./Token.sol"; +import "./StandardToken.sol"; -- cgit v1.2.3 From 876b39e8e55c41ffc848dbb0f0210bde62dd511d Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Fri, 19 Aug 2016 11:21:54 -0400 Subject: Fix StandardToken --- std/StandardToken.sol | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) (limited to 'std') diff --git a/std/StandardToken.sol b/std/StandardToken.sol index 25d0bd38..d2567fec 100644 --- a/std/StandardToken.sol +++ b/std/StandardToken.sol @@ -1,28 +1,20 @@ import "./Token.sol"; contract StandardToken is Token { - uint256 tokenSupply; - mapping (address => uint256) balances; + uint256 public totalSupply; + mapping (address => uint256) public balanceOf; mapping (address => - mapping (address => uint256)) approvedTransfers; + mapping (address => uint256)) public allowance; function StandardToken(address _initialOwner, uint256 _supply) { - tokenSupply = _supply; - balances[_initialOwner] = _supply; - } - - function totalSupply() constant returns (uint256 supply) { - return tokenSupply; - } - - function balanceOf(address _owner) constant returns (uint256 balance) { - return balances[_owner]; + totalSupply = _supply; + balanceOf[_initialOwner] = _supply; } function transfer(address _to, uint256 _value) returns (bool success) { - if (balances[msg.sender] >= _value) { - balances[msg.sender] -= _value; - balances[_to] += _value; + if (balanceOf[msg.sender] >= _value) { + balanceOf[msg.sender] -= _value; + balanceOf[_to] += _value; Transfer(msg.sender, _to, _value); return true; } @@ -32,9 +24,9 @@ contract StandardToken is Token { } function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { - if (approvedTransfers[_from][msg.sender] >= _value) { - approvedTransfers[_from][msg.sender] -= _value; - balances[_to] += _value; + if (allowance[_from][msg.sender] >= _value) { + allowance[_from][msg.sender] -= _value; + balanceOf[_to] += _value; Transfer(_from, _to, _value); return true; } @@ -44,12 +36,8 @@ contract StandardToken is Token { } function approve(address _spender, uint256 _value) returns (bool success) { - approvedTransfers[msg.sender][_spender] = _value; + allowance[msg.sender][_spender] = _value; Approval(msg.sender, _spender, _value); return true; } - - function allowance(address _owner, address _spender) constant returns (uint256 remaining) { - return approvedTransfers[_owner][_spender]; - } } -- cgit v1.2.3 From 56558c0db2ad1e64aa81aaa05820388c2ba65a45 Mon Sep 17 00:00:00 2001 From: Denton Liu Date: Wed, 24 Aug 2016 15:06:54 -0400 Subject: Check for overflow --- std/StandardToken.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'std') diff --git a/std/StandardToken.sol b/std/StandardToken.sol index d2567fec..db453492 100644 --- a/std/StandardToken.sol +++ b/std/StandardToken.sol @@ -12,7 +12,7 @@ contract StandardToken is Token { } function transfer(address _to, uint256 _value) returns (bool success) { - if (balanceOf[msg.sender] >= _value) { + if (balanceOf[msg.sender] >= _value && balanceOf[_to] + _value >= balanceOf[_to]) { balanceOf[msg.sender] -= _value; balanceOf[_to] += _value; Transfer(msg.sender, _to, _value); @@ -24,7 +24,7 @@ contract StandardToken is Token { } function transferFrom(address _from, address _to, uint256 _value) returns (bool success) { - if (allowance[_from][msg.sender] >= _value) { + if (allowance[_from][msg.sender] >= _value && balanceOf[_to] + _value >= balanceOf[_to]) { allowance[_from][msg.sender] -= _value; balanceOf[_to] += _value; Transfer(_from, _to, _value); -- cgit v1.2.3