a221c17fb2
Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity
...
v2.1.1
2019-01-18 15:33:51 -03:00
bce2d68e7f
convert 2 spaces to 4 spaces
2019-01-17 18:02:50 -03:00
76abd1a41e
Replaced Solium in favor of Solhint ( #1575 )
...
* Adding solhint, working on style fixes.
* Upgraded to solhint 1.5.0.
* Removed all references to Solium
* Updated mocks to make the pass the new linter rules.
* Reformatted the .solhint.json file a bit.
* Removed Solium configuration files.
* Remove Solium dependency.
* Add comment explaing disabled time rule in TokenVesting.
* Revert to the old (ugly?) style.
* Revert SignatureBouncerMock style.
* Fix ERC165InterfacesSupported interface.
2019-01-04 17:01:52 -03:00
be5ed7364b
Release v2.1.0 solc 0.5.x ( #1568 )
...
* Now compiling in a separate directory using truffle 5.
* Ported to 0.5.1, now compiling using 0.5.1.
* test now also compiles using the truffle 5 hack.
* Downgraded to 0.5.0.
* Sorted scripts.
* Cleaned up the compile script a bit.
2018-12-20 12:26:43 -03:00
12533bcb2b
ERC721 bugfix + gas optimizations ( #1549 )
...
* Now only swapping when needed.
* Removed _addTokenTo and _removeTokenFrom
* Removed removeTokenFrom test.
* Added tests for ERC721 _mint and _burn
* _burn now uses the same swap and pop mechanism as _removeFromOwner
* Gas optimization on burn
2018-12-12 18:51:43 -03:00
dd2e947976
Deprecated ERC721._burn(address, uint256) ( #1550 )
...
* Deprecated ERC721._burn(address, uint256)
* Added missing natspec comment.
2018-12-11 18:07:59 -03:00
70e616db7c
Optimized ERC721 transfers. ( #1539 )
...
* Added _transferToken.
* _transferFrom is now usable by derived contracts, abstracted away enumerable behavior.
* Removed unnecesary check from _clearApprovals
2018-12-11 12:51:26 -03:00
5caecf548c
getter added for an array of tokens held by an owner ( #1522 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1404
* approve failing test
* suggested changes done
* ISafeERC20 removed
* conflict fixes
* fixes #1512
* Update test/token/ERC721/ERC721Full.test.js
Co-Authored-By: Aniket-Engg <30843294+Aniket-Engg@users.noreply.github.com >
2018-12-05 17:45:27 -03:00
5471fc808a
Updated code style to 4 space indentation and 120 characters per line. ( #1508 )
...
* Updated code style to 4 spaces and 120 max characters per line.
* Update contracts/token/ERC721/ERC721Pausable.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
* Update contracts/token/ERC721/IERC721.sol
Co-Authored-By: nventuro <nicolas.venturo@gmail.com >
2018-11-22 16:53:30 -03:00
18552a8d5f
Fix/add comment erc721 burnable #1464 ( #1469 )
...
* fix Add a comment to ERC721Enumerable #1465
* fix Add comments to ERC721Burnable #1464
2018-11-01 15:15:04 -03:00
8204f6a71f
Improved some ERC721 internal shenanigans ( #1450 )
...
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.
* Added approval information.
2018-10-18 19:07:34 -03:00
d75ba16223
ERC721 contracts no longer initialize their parents (but have some safety checks).
2018-10-15 13:41:51 -03:00
fffa406aa4
Merge branch 'master' into peer-dep
2018-10-10 09:09:06 -03:00
bc7ba69f9b
Removed Initializable, now using zos-lib's.
2018-10-09 17:56:56 -03:00
932a39f5fd
Added gaps at the end of the storage of each contract.
2018-10-08 14:42:02 -03:00
f3a0a6a463
convert ERC721Full, ERC721Enumerable, ERC721Metadata to initializers
2018-09-25 17:51:28 -03:00
9b37104655
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
2018-09-19 19:59:13 -03:00
4b33eaefa2
Improved ERC721 granularity ( #1304 )
...
* Split enumerable and metadata implementations.
* Renamed ERC721Basic to ERC721, and ERC721 to ERC721Full.
* Fixed linter errors.
2018-09-07 14:04:42 -03:00
