Commit Graph

91 Commits

Author SHA1 Message Date
b8884687df fix off by one error in VestedToken 2017-07-17 21:34:38 -03:00
18581f138f converted if() throw convention to require()/assert()/revert() 2017-07-17 15:35:09 -03:00
a56bcbf8fd Correctly call super.transferableTokens
Fix #307
2017-07-14 18:17:09 -03:00
6331dd125d fix ERC20 to conform to standard 2017-07-13 12:05:45 -03:00
5e423bc353 add release function, deprecate claim 2017-07-05 11:24:59 -03:00
d5a75362ec Merge pull request #288 from frangio/refactor/math
Move SafeMath and create Math library for assorted operations
2017-07-02 18:13:47 -03:00
e748c3ea36 Merge pull request #283 from OpenZeppelin/crowdsale
Add Crowdsale contracts
2017-07-02 17:59:19 -03:00
421ed4f8ab fix references to max and min functions 2017-07-02 17:56:34 -03:00
759f8de81f fix import directories 2017-07-02 17:52:44 -03:00
262b7dd7dd Merge pull request #285 from frangio/feature/token-timelock
Add a TokenTimelock contract
2017-06-30 23:14:24 -03:00
5d847ed4d9 tweak TokenTimelock documentation 2017-06-30 21:28:45 -03:00
b3ca0c73b3 add a TokenTimelock contract 2017-06-30 21:25:59 -03:00
59e9609926 remove CrowdsaleToken
it is superseded by the new crowdsale contracts
2017-06-30 15:50:47 -03:00
e31abffcb6 fix(token): typo in documentation
Implemantation -> Implementation
2017-06-30 14:40:15 -04:00
42c6392533 fix(token): typo in documentation 2017-06-30 00:41:12 -04:00
daf1784be4 change inheritance order for StandardToken and PausableToken 2017-06-28 22:15:51 -07:00
de92a02127 Add Crowdsale contracts 2017-06-27 18:34:04 -03:00
e33d9bb41b remove all checks for short address attack (fixes #261) 2017-06-26 15:11:54 -03:00
dd34d8df0f Fix typo in StandardToken allowance documentation 2017-06-22 15:33:34 +02:00
b1e504d6c6 change uint to uint256 2017-06-19 18:55:09 -07:00
403e7336a9 fixed typo 2017-06-14 16:31:12 -04:00
ffe464a43e Refactors the Mintable Token contract 2017-06-14 10:38:32 -06:00
6ede3d9001 Upgrade to Truffle version 3.2.2 and Solidity version 0.4.11 2017-06-06 21:41:54 -06:00
f214dccab9 removed redundant returns 2017-06-06 17:10:55 +08:00
c0cce27703 remove redundant return 2017-06-02 00:27:16 +08:00
7100e30bed Implement VestedToken bug mitigation #3 2017-05-29 17:52:19 -03:00
a62621eb59 merge @izqui PR with new docs changes 2017-05-29 16:19:03 -03:00
d08185fc3e Edit natspec documentation typos 2017-05-26 00:29:15 +03:00
c4796bb918 Fix comments again 2017-05-24 17:27:05 -04:00
d357cf3a2e Minor changes to doc comments for token and other contracts 2017-05-24 16:51:01 -04:00
d85be4a866 Add natspec to vestedToken.sol 2017-05-24 16:47:25 -04:00
f6f91298f0 Add natspec to all remaing contracts, except for vestedToken.sol 2017-05-24 16:47:21 -04:00
48a2e11dfe merge 2017-05-22 18:08:03 -04:00
22f60eace0 Use libraries syntax sugar for revoking grants logic 2017-05-22 18:06:57 -04:00
e032b86231 Merge with Zeppelin master 2017-05-21 16:14:06 -04:00
a6a2ee2bf1 Merge with master 2017-05-21 16:08:47 -04:00
929367f0ab Reorg code 2017-05-21 12:10:04 +02:00
5a6340395f Fix grant id parameter in NewTokenGrant event 2017-05-21 11:22:30 +02:00
f812433706 Small refactor and documentation 2017-05-21 11:18:24 +02:00
5b2f0aa93d Implement revokable and burnsOnRevoke options 2017-05-21 10:38:56 +02:00
964185dec3 Protect transferFrom against short hand attack. 2017-05-18 00:38:41 +03:00
e1cf602487 Fix variable naming. 2017-05-17 01:41:43 +03:00
a3446507ec Add fix for the approve() mitigation. 2017-05-17 01:33:13 +03:00
b4b6029f66 Create and test PausableToken Contract 2017-04-29 01:08:14 +01:00
7592122e4d fix indentation 2017-04-19 18:34:53 -03:00
609869f087 change safe* to * 2017-04-19 16:19:22 -03:00
4fad1505c7 Make SafeMath a library 2017-04-19 15:36:49 -03:00
37c6782f95 Add MintFinished event to MintableToken #191 2017-04-13 14:23:41 +08:00
22018fd374 Merge pull request #188 from jdetychey/patch-3
fix for short address attack
2017-04-11 17:02:24 -03:00
5d75264f0f Fix for bigger payloads
as suggested by izqui in case a function calls transfer under the hood
2017-04-11 17:25:03 +02:00