poanetwork
/
zeppelin-solidity
mirror of https://github.com/poanetwork/zeppelin-solidity.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
713 Commits 1 Branch 10 Tags 934 KiB
Commit Graph

713 Commits

Author SHA1 Message Date
viktor 8f27a512ce update zeppelin folder 2017-09-20 14:09:12 -07:00
viktor 4d6ac3abc1 workaround for truffle 3.4.9 compilation work; submodule name should be strictly zeppelin 2017-09-20 13:49:46 -07:00
Francisco Giordano 1df75a951f Merge pull request #446 from jakub-wojciechowski/master 
Make approve method compliant with ERC20
 2017-09-18 18:38:37 -03:00
jakub-wojciechowski adfd8fb6a9 Warning in approve method documentation. 2017-09-18 18:38:05 -03:00
jakub-wojciechowski 98f672b534 Make approve method compliant with ERC20 2017-09-18 18:38:05 -03:00
Francisco Giordano e9068859b6 Merge pull request #448 from SylTi/fix/small-fixes 
A bunch of small fixes
 2017-09-18 18:18:55 -03:00
SylTi 1203a2473d add whenNotPaused modifier to all of PausableToken functions that modify it's state. Fix #401 2017-09-18 22:49:22 +02:00
SylTi 4a1ff913ab replace var by uint256 in StandardToken. Fix #432 2017-09-18 22:46:52 +02:00
SylTi 83918cad4b change approve() to conform to ERC20. Fix #438 2017-09-18 22:46:52 +02:00
Francisco Giordano d3c5ce268f Merge pull request #260 from yondonfu/feature/merkleproof 
Merkle proof library with tests and docs
 2017-09-18 16:47:17 -03:00
Francisco Giordano f60c5ad88a Merge pull request #445 from frangio/fix-leftover-testrpc 
Properly kill background testrpc instance
 2017-09-18 15:54:42 -03:00
Yondon Fu bcda5bfe9b Merge branch 'master' into feature/merkleproof 2017-09-18 14:01:10 -04:00
Francisco Giordano 33eb8b1da5 Merge pull request #457 from sot528/fix-typo 
Just fix typo.
 2017-09-18 14:26:21 -03:00
sot528 b069827bad fix typo. 2017-09-19 01:57:50 +09:00
Francisco Giordano 74e416f04f Merge pull request #450 from dmx374/master 
Explicit public visibility on methods
 2017-09-18 12:58:34 -03:00
dmx374 b395b06b65 Explicit public visibility on methods 2017-09-18 12:57:46 -03:00
Francisco Giordano bd84db735d Merge pull request #450 from aupiff/master 
removing trailing whitespace
 2017-09-18 12:01:22 -03:00
Francisco Giordano bd99b207c9 Merge pull request #454 from economicnetwork/master 
comments on vesting
 2017-09-18 11:46:48 -03:00
benjyz 2438557255 explain cliff 2017-09-18 12:41:54 +07:00
benjyz 9f1826d83e vesting: more corrections on comments 2017-09-18 12:22:23 +07:00
benjyz 676f5f6931 comments on vesting 2017-09-18 12:18:10 +07:00
Roy Blankman 6d8bb497c8 removing trailing whitespace 2017-09-16 10:20:06 -04:00
Francisco Giordano 5fd8684a5a properly kill background testrpc instance 2017-09-14 15:40:14 -03:00
Francisco Giordano 1737555b0d Merge pull request #439 from frangio/fix-436 
Remove indexed declaration of value in Burn event
 2017-09-11 12:28:30 -03:00
Francisco Giordano eda63c75c4 Merge pull request #440 from spalladino/fix/simple_token_initial_supply 
Fix INITIAL_SUPPLY in SimpleToken example
 2017-09-11 12:27:35 -03:00
Santiago Palladino 61f62eb3c7 Fix INITIAL_SUPPLY in SimpleToken example 
Use token decimals
 2017-09-11 12:13:19 -03:00
Francisco Giordano f96ebfca31 cosmetic changes to BurnableToken 2017-09-11 12:11:00 -03:00
Francisco Giordano fac580d1a9 remove indexed declaration of uint event parameter 2017-09-11 12:08:23 -03:00
Francisco Giordano 07b688a0e6 Merge pull request #430 from frangio/fix-unchecked-transfer 
Use SafeERC20 to transfer tokens safely
 2017-09-07 20:33:43 -03:00
Francisco Giordano 20187f2970 use SafeERC20#safeTransfer 2017-09-07 20:04:48 -03:00
Francisco Giordano 84be318ca9 Merge pull request #424 from eugene-babichenko/transfer-ownership-event 
Add OwnershipTransferred event to Ownable contract and its derivatives
 2017-09-07 11:59:29 -03:00
Yevhenii Babichenko 5035718e4b fixed wrong call order in Ownable.transferOwnership 2017-09-07 11:59:36 +03:00
Francisco Giordano fdc8fbaa45 Merge pull request #428 from frangio/fix-425-pausable-docs 
Fix Pausable documentation
 2017-09-06 16:25:37 -03:00
Francisco Giordano 99887da49a fix Pausable documentation 2017-09-06 15:07:12 -03:00
Yevhenii Babichenko 7a36a6c92a fix calls to OwnershipTransferred 2017-09-06 10:31:23 +03:00
Yevhenii Babichenko 6beac0f215 add previousOwner field to OwnershipTransferred event 2017-09-06 10:29:25 +03:00
Yevhenii Babichenko b59469c151 fire OwnershipTransferred event when the owner of an Ownable contract instance actually changed 2017-09-05 18:32:07 +03:00
Francisco Giordano b07466a477 Merge pull request #420 from sh4ka/patch-1 
Fix docblock syntax
 2017-09-01 11:25:50 -03:00
Jesús Flores 0bd22e78d3 Fix docblock syntax 2017-09-01 14:03:31 +01:00
Francisco Giordano f073352632 Merge pull request #416 from frangio/add-comment-basictoken-throw 
Add comment making explicit that transfer throws without enough balance
 2017-08-29 12:05:14 -03:00
Francisco Giordano aad25205cd add comment making explicit that SafeMath.sub can throw 2017-08-29 11:51:41 -03:00
Francisco Giordano dcdc453a55 Merge pull request #413 from frangio/add-safe-erc20 
Add SafeERC20 helpers
 2017-08-28 19:43:32 -03:00
Francisco Giordano 5636575327 Merge pull request #415 from frangio/merge-411-manually 
Check that destination of token transfers is not 0x0
 2017-08-28 19:41:29 -03:00
Francisco Giordano 00f80c726a fix reference to mock contract 2017-08-28 19:31:19 -03:00
Francisco Giordano 74db6c2b3b add missing test for error when doing transferFrom to 0x0 2017-08-28 19:31:19 -03:00
Pavel Rubin d095ba84bf Add tests to check transfers to 0x0 fail 2017-08-28 19:31:19 -03:00
Pavel Rubin 209e2de93b Fix for #400: Check that destination of token transfers is not 0x 2017-08-28 19:31:07 -03:00
Francisco Giordano c37c233d22 add SafeERC20 tests for succeeding operations 2017-08-28 19:27:56 -03:00
Francisco Giordano 7b463769a5 explain how to use SafeERC20 2017-08-28 17:34:25 -03:00
Francisco Giordano c7636bdc4c add safe ERC20 helpers 2017-08-28 17:32:18 -03:00