74db03ba06
Keep ownedTokensCount state var in sync in full ERC721 implementation
2018-03-21 11:56:42 -03:00
3f2ea8a329
Use if-statements instead of boolean one-liners for clarity
...
:-(
2018-03-21 11:42:47 -03:00
6b98e4e080
Use address(0) instead of 0 or 0x0
2018-03-21 11:42:10 -03:00
fb4f728734
Minor text changes in natspec comments
2018-03-21 11:41:45 -03:00
f4748dabc3
Use 4-params safeTransferFrom for implementing the 3-params overload
2018-03-21 11:40:28 -03:00
b33299569b
Add constant modifier to ERC721_RECEIVED magic value
2018-03-21 11:13:20 -03:00
95a1f9a4c5
Change natspec delimiters for consistency
2018-03-21 11:05:17 -03:00
6fbe771c27
Remove deprecated implementation
...
We only want to keep the interface, for interacting with already deployed contracts
2018-03-09 17:19:11 -03:00
6f180a6c5a
Remove gas stipend restriction in call to 721 receiver
2018-03-09 17:19:11 -03:00
3cef880803
Allow operators to call approve on a token
2018-03-09 17:19:11 -03:00
851685c40e
Add default implementation for metadata URI
...
This allows token implementation to be non-abstract
2018-03-09 17:19:11 -03:00
54a1d2eacc
Implement tokensByIndex extension
...
- Remove restrictions from mock mint and burn calls
2018-03-09 17:19:11 -03:00
d726c79e5f
Update comments in ERC721 contracts
2018-03-09 17:19:11 -03:00
559df81c49
Implement suggestions by @dekz
2018-03-09 17:19:11 -03:00
3745025a1e
Add more tests for ERC721
2018-03-09 17:19:11 -03:00
71cbc511ec
Support for new ERC721 interface
...
- Tests for new features are pending
- ERC721 is abstract, since it requires metadata implementation
- Move some methods into DeprecatedERC721 contract
- Reorganise base vs full implementation
- Pending tokenByIndex
2018-03-09 17:19:11 -03:00
ca163a849b
Implement ERC721 optional & approveAll functionality
2018-03-09 17:19:11 -03:00
1192e684c2
Rename current ERC721 implementation to BaseERC721
2018-03-09 17:19:11 -03:00
5ef8554727
Add Transfer event to Burnable Token. ( #735 )
...
Fixes #732
2018-02-20 15:44:50 -07:00
c5d66183ab
Move ERC20 contracts to ERC20 custom folder ( #701 )
...
* Move ERC20 contracts to ERC20 custom folder
* Fix linter warnings for ERC20 contracts
2018-01-23 17:46:41 -03:00
1eea95f9ac
Move ERC721 files to custom folder ( #700 )
2018-01-23 17:03:05 -03:00
4be30dc3ae
Merge branch 'master' into feature/implement_erc721_standard
2018-01-19 17:43:03 -03:00
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
