Commit Graph

480 Commits

Author SHA1 Message Date
70b5ffd928 Change killable to destructible and kill to destroy 2017-04-07 11:34:35 -06:00
d9b9ed227b fix for short address attack
as suggested by /u/izqui9 here https://www.reddit.com/r/ethereum/comments/63s917/worrysome_bug_exploit_with_erc20_token/dfwmhc3/
Attack description: 
https://blog.golemproject.net/how-to-find-10m-by-just-reading-blockchain-6ae9d39fcd95
2017-04-07 11:30:18 +02:00
14274f8677 Merge pull request #169 from maraoz/audit
Follow security audit recommendations
2017-04-05 19:04:11 -03:00
af604379d3 rebase conflict fixes 2017-04-05 18:30:14 -03:00
7d83a08658 8.2.3 removed ownable 2017-04-05 18:27:34 -03:00
2ccbfea8c5 8.1.2 add comment clarifying Migrations 2017-04-05 18:27:34 -03:00
fad287007b 7.2 add preconditions to Shareable contructor 2017-04-05 18:27:34 -03:00
cd9f820b85 fix syntax error 2017-04-05 18:27:34 -03:00
582166d378 7.1 pull payment safe math 2017-04-05 18:27:34 -03:00
ab9eecb104 6.1 fix stuck Ether in Crowdsale contract 2017-04-05 18:27:34 -03:00
52120a8c42 5.3 always throw on error 2017-04-05 18:27:34 -03:00
a1aa74f96d 5.2 all contracts now solidity ^0.4.8 2017-04-05 18:25:14 -03:00
6ae7ac97f6 Merge pull request #181 from roderik/patch-1
Shareable is not used in this contract
2017-04-05 17:25:28 -03:00
ba6c036628 Merge pull request #183 from AragonOne/fix-vesting
Fix vesting calculation logic
2017-04-05 12:54:23 -03:00
7a2fda9076 Improve VestedToken tests 2017-04-05 13:20:18 +02:00
41d2fde952 Fix vesting calculation logic 2017-04-05 13:13:17 +02:00
f0e7396619 Shareable is not used in this contract 2017-04-05 08:33:30 +02:00
6139500e97 Merge pull request #180 from frangio/fix-179-rename-transferable
Rename `TransferableToken` to `LimitedTransferToken`
2017-04-03 23:28:09 -03:00
0b88944b38 fix a few typos 2017-04-03 22:06:41 -03:00
61e33197b2 rename TransferableToken to LimitedTransferToken
fixes #179
2017-04-03 22:04:07 -03:00
025e7db765 Merge pull request #178 from frangio/fix-solidity-renamed-methods
Change sha3 and suicide methods to keccak256 and selfdestruct respectively
2017-04-03 12:03:16 -03:00
6f311e72b3 change sha3 and suicide methods to keccak256 and selfdestruct
see ethereum/solidity#1476
2017-04-03 11:31:56 -03:00
a344d42a00 Merge pull request #170 from Recmo/feature/no-owner
Prevent contracts from owning Ether, Tokens and other contracts.
2017-03-31 16:51:18 -03:00
f2159be68d Merge pull request #176 from frangio/shareable-owners-type
Change type of `owners` from uint[] to address[]
2017-03-31 13:33:09 -03:00
7f7238378c change type of owners from uint[] to address[]
fixes #175
2017-03-31 13:14:59 -03:00
1d2b989e8e Fix typo in comment 2017-03-31 09:39:29 +01:00
bc0f9b0ea5 Merge pull request #174 from demibrener/readme
Add Wings to collaborating organizations
2017-03-29 18:15:13 -03:00
a885dabc81 added Wings 2017-03-29 18:04:13 -03:00
6673da46b1 Merge pull request #173 from demibrener/readme
Name consistency: OpenZeppelin
2017-03-29 18:01:23 -03:00
2e9587477c Merge pull request #171 from Recmo/feature/reentrancy-guard
Add ReentrancyGuard
2017-03-28 15:10:30 -03:00
967ee13565 OpenZeppelin 2017-03-27 17:21:29 -03:00
a2bd1bb7f6 Add ReentrancyGuard 2017-03-24 11:01:06 +00:00
ac3b3652c3 Add NoOwner 2017-03-23 15:48:22 +00:00
166a1070e5 Add HasNoContracts 2017-03-23 15:43:52 +00:00
94d3c447b7 Add HasNoTokens 2017-03-23 15:22:48 +00:00
9ff82aecef Remove non-compiling payable default 2017-03-23 12:54:42 +00:00
d1af3ef1b3 Add HasNoEther 2017-03-23 12:23:27 +00:00
ffce7e3b08 Merge pull request #166 from AragonOne/transaferable
Add comments for Transferable Token
2017-03-20 15:43:56 -03:00
f896790ca3 Merge pull request #167 from maraoz/fix-travis
Fix travis build
2017-03-20 15:25:59 -03:00
960500a078 try to fix travis 2 2017-03-20 15:19:14 -03:00
ce25e2db98 try to fix travis 1 2017-03-20 11:58:56 -03:00
463ae97117 Merge pull request #160 from Recmo/feature/token-killable
Add TokenKillable
2017-03-20 11:27:19 -03:00
350ab09855 Add comments for TransferableToken 2017-03-20 10:16:48 +01:00
312220fe63 Merge pull request #162 from AragonOne/transaferable
Decouple transferable logic from VestedToken
2017-03-15 16:09:13 -03:00
72029b6847 Decouple transferable logic from VestedToken 2017-03-14 20:22:18 +01:00
525a5522b0 Add TokenKillable 2017-03-14 14:09:59 +00:00
9c5975a706 Merge pull request #158 from maraoz/update-readme
update README on new code distribution strategy (ethpm)
2017-03-09 18:13:27 -03:00
9006f89f9f update README on new code distribution 2017-03-09 18:02:41 -03:00
15169b245b v1.0.4 v1.0.4 2017-03-09 15:04:14 -03:00
cc222c02a9 Merge pull request #156 from maraoz/ethpm
Add ethpm support
2017-03-09 15:00:09 -03:00