370e6a882a
ERC20 totalSupply changed from public property to a function ( #666 )
...
Fixes OpenZeppelin/zeppelin-solidity#434
2018-01-19 17:15:27 -03:00
48594890cf
Merge branch 'master' into feature/implement_erc721_standard
2018-01-19 15:36:52 -03:00
23afc74b59
Address feedback comments for ERC721
2018-01-18 10:15:59 -03:00
b67856c69d
Separate ERC20 and ERC827 form tokens implementations in contracts and test folders
2018-01-17 16:24:29 -03:00
af337047a4
Fix solint errors
2018-01-17 12:00:15 -03:00
2b008f4cb6
Fix solidity linter errors
2018-01-17 11:21:25 -03:00
d060d29912
Merge remote-tracking branch 'upstream/master' into add-smart-token
2018-01-17 11:01:05 -03:00
7ddd66fb74
fix increaseApproval in ERC827Token with tests
2018-01-16 18:43:50 -03:00
b09d7aada4
Implement ERC721 required functionality
2018-01-16 16:04:26 -03:00
5fc5ded661
Provide ERC721 required functionality interface
2018-01-16 16:04:26 -03:00
87f5916341
Separate ERC827 interface in another contract
2018-01-15 21:17:32 -03:00
685d2087ca
Add increase and decrease approval functions to ERC827 with tests
2018-01-15 20:56:25 -03:00
e60aee61f2
fix: solium errors - blank-line only
2018-01-15 16:11:45 -05:00
b2e2d9ab1c
fix: solium errors - indentation only
2018-01-15 16:11:45 -05:00
4d263b7fc3
fix: the result of 'npm run lint:sol:fix'
2018-01-15 16:11:45 -05:00
7bd95b1e31
Overload ERC20 funcitons with new _data argument
2018-01-11 16:35:21 -03:00
4ecdf312df
Change order of ERC20 methods and call in transferData and transferDataFrom
2018-01-11 13:56:52 -03:00
e57f4be1fb
Rename SmartToken to ERC827
2018-01-11 13:52:36 -03:00
a4b1cd6e31
Add SmartToken contract with tests and documentation
...
add missing public identifier in approveData in SmartToken contract
remove constact from showMessage function in message helper contract
move Message helper contract to mocks folder
move SmartTokenMock contract to mocks folder
2018-01-11 12:57:30 -03:00
9af6ad5ddf
Merge pull request #610 from TalAter/master
...
Documented increaseApproval() and decreaseApproval()
2017-12-22 18:32:38 -03:00
f446f5c5cd
Use uint256 in TokenTimeLock contract
2017-12-22 10:34:29 -03:00
687dc19a4a
Documented increaseApproval() and decreaseApproval()
2017-12-14 20:14:58 +02:00
8375b6085f
Burnable Token should be inherited from Basic Token issue#596
2017-12-06 08:08:42 +03:00
aef0f63aee
There's no need to throw when burning 0 tokens
...
Throwing when trying to burn 0 tokens is an unnecessary special case.
If another contract wants to burn() a variable amount, it should not be forced to deal with this special case of burning 0.
2017-12-03 12:08:53 +01:00
b9cbea1c9c
Merge pull request #576 from ajsantander/master
...
Address new compiler warnings
2017-11-23 12:54:44 -03:00
11349835e9
Minor formatting change
2017-11-23 08:22:59 -06:00
b50391862c
Changes to remove warnings
2017-11-23 10:41:18 -03:00
815d9e1f45
Replace constant with view/pure
2017-11-22 18:59:54 -03:00
e6213767fa
Update all solidity versions to 0.4.18
2017-11-22 18:52:52 -03:00
9001ce9d3a
Merge pull request #515 from cwhinfrey/master
...
Create CappedToken, a capped MintableToken
2017-11-22 15:25:12 -03:00
3c5a268da4
fixes #572
2017-11-22 12:55:11 +00:00
8765e2a53f
Use instead of directly calling on
2017-11-15 16:14:28 -05:00
7a19bcf6d9
Merge pull request #505 from ZumZoom/patch-1
...
Finish minting should be called only once
2017-11-15 11:59:05 -03:00
84bffb854a
Merge pull request #477 from facuspagnuolo/feaure/create_detailed_erc20_interface
...
Create detailed ERC20 interface
2017-11-13 15:42:09 -03:00
365c875ced
Create detailed ERC20 interface
2017-11-13 15:36:02 -03:00
9be77ddd54
Merge pull request #469 from nedodn/patch-2
...
Update TokenTimelock.sol: Issue #464
2017-11-10 17:44:20 -03:00
e74652415f
Math.sol is not used, not needed
...
Small thing, but the Math.sol is not really needed, since it is not used.
2017-10-30 11:07:26 +01:00
7a26a0ecf1
Add capped token contract
2017-10-25 23:57:21 -04:00
8e01dd14f9
Merge pull request #510 from doraemondrian/master
...
Use address(0) instead of 0x0
2017-10-24 16:46:05 -03:00
d7b67eca52
Use address type
2017-10-23 03:10:00 -07:00
e4427befbb
Use address type
2017-10-23 03:08:30 -07:00
2d83c557b1
Finish minting should me called only once
...
Multiple calls to `finishMinting` will emit multiple `MintFinished` events which may be surprising if one rely on `MintFinished` event.
2017-10-17 16:24:16 +03:00
b60e434e0b
[TokenVesting] Add missing safemath ops
2017-10-16 03:48:32 -03:00
eb9f88bafc
[TokenVesting] Remove unused variable
2017-10-13 16:20:24 -03:00
aa431dfb20
[TokenVesting] Increase released amount before transfer
2017-10-13 16:13:54 -03:00
fff8e040b7
[TokenVesting] vestedAmount returns the historical vested amount
2017-10-13 15:32:44 -03:00
74636b7333
[TokenVesting] Use SafeMath
2017-10-12 00:34:03 -03:00
d5e0714faf
use safeTransfer
2017-10-11 16:31:31 -03:00
a184013d1e
explicitly mark functions public
2017-10-09 19:08:32 -03:00
7d08c4da7f
make TokenVesting variables public
2017-10-09 19:02:57 -03:00
