Commit Graph

426 Commits

Author SHA1 Message Date
d357cf3a2e Minor changes to doc comments for token and other contracts 2017-05-24 16:51:01 -04:00
83f2849446 Minor edits to doc commenst in lifecycle, ownership, payment contracts. 2017-05-24 16:49:43 -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
1547922b61 Added natspec to the remaining ownership contracts and payment contracts 2017-05-24 16:45:45 -04:00
602c18b394 Applied change regarding the styling 2017-05-24 16:45:41 -04:00
b5d4120adb Added natsec for all lifecycle contracts + bounty.sol, DayLimit.sol and LimitBalance.sol 2017-05-24 16:43:14 -04:00
e851938199 Add natspec comments to four ownership contracts 2017-05-24 16:35:09 -04:00
b788f33c6a Merge pull request #218 from cgewecke/coverage
Add coverage
2017-05-21 23:40:18 -03:00
592548715f Add solidity-coverage 2017-05-21 19:19:50 -07:00
0983f0065d Merge pull request #223 from aragon/safe-math-div
[SafeMath] Remove unnecessary checks from safeDiv
2017-05-21 23:06:42 -03:00
c4f78a5dd5 Remove unnecessary checks from safeDiv 2017-05-21 16:41:18 -04:00
ecbfcbb302 Merge pull request #221 from TokenMarketNet/feat/transfer-from-mitigation
Protect transferFrom() against short hand attack.
2017-05-18 12:43:51 -03:00
964185dec3 Protect transferFrom against short hand attack. 2017-05-18 00:38:41 +03:00
5c491987f3 Merge pull request #219 from TokenMarketNet/feat/approve-mitigation
approve() race condition mitigation
2017-05-17 13:26:19 -06: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
ff61c7d92d Merge pull request #212 from misteraverin/feature/destructible
Add destroy function, allowing send funds to recepient.
2017-05-15 07:19:45 -06:00
726593c0a2 Merge pull request #216 from maraoz/ethpm-npm
Revert to usig npm as preferred installation method
2017-05-12 09:12:24 -06:00
7826fddba7 revert to usig npm as preferred installation method 2017-05-12 12:10:28 -03:00
38a450460d Merge pull request #214 from maraoz/audit-report
Add external audit report
2017-05-11 13:17:53 -03:00
de7751aae2 Add external audit 2017-05-11 13:08:23 -03:00
cf7bc06856 Switch function name to destroyAndSend 2017-05-09 23:20:44 +03:00
7ac697be2c v1.0.5 v1.0.5 2017-05-09 15:13:45 -03:00
4de772f5ed add destroy function, allowing send funds to recepient 2017-05-08 22:50:43 +03:00
f7a7fc3b06 Merge pull request #206 from DavidKnott/create-pausable-token
Create and test PausableToken Contract
2017-05-03 15:32:33 -03:00
b4b6029f66 Create and test PausableToken Contract 2017-04-29 01:08:14 +01:00
071040f3eb Merge pull request #203 from ORBAT/fix/bounty-claim-fail-test
Await event handling result in Bounty test
2017-04-24 11:06:38 -03:00
cd78c20e0e await event handling result in Bounty test. Fixes #202 2017-04-21 20:08:17 +03:00
453a198250 Merge pull request #184 from maraoz/safemath
Make SafeMath a library
2017-04-20 12:40:15 -03: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
5881429952 Merge pull request #195 from OpenZeppelin/maraoz-patch-1
Update README with new slack url
2017-04-19 13:49:29 -03:00
526ed43d61 Update README with new slack url 2017-04-19 13:49:09 -03:00
ab9591ba80 Merge pull request #193 from AugustoL/master
Added totalPayments uint on PullPayments contract
2017-04-18 11:42:48 -03:00
a8bcb0fcfe Added totalPayments uint on PullPayments contract 2017-04-14 14:30:31 -03:00
b420316783 Merge pull request #192 from tatiesmars/patch-1
Add MintFinished event to MintableToken
2017-04-13 16:18:07 -03:00
37c6782f95 Add MintFinished event to MintableToken #191 2017-04-13 14:23:41 +08:00
70a4395a97 Merge pull request #190 from lastperson/patch-1
Remove excessive condition from SafeMath.safeAdd()
2017-04-12 19:11:55 -03:00
31c05c4c7d Remove excessive condition from SafeMath.safeAdd()
There is no situation when `c>=a` will be `true` while `c>=b` will be `false`.
2017-04-12 15:22:52 +08:00
22018fd374 Merge pull request #188 from jdetychey/patch-3
fix for short address attack
2017-04-11 17:02:24 -03:00
d1f63f5c7e Merge pull request #185 from DavidKnott/create-token-with-owner-contract
Create and test MintableToken contract
2017-04-11 13:01:01 -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
a605f66972 Create and test MintableToken contract 2017-04-07 14:51:33 -06:00
0328250554 Merge pull request #187 from DavidKnott/change-killable-contract-to-destructible
Change killable to destructible and kill to destroy
2017-04-07 15:16:06 -03:00
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