NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,639 Commits 61 Branches 143 Tags
a221c17fb22a16655f3e50b078bb2167f30c3e5c
Commit Graph

16 Commits

Author SHA1 Message Date
Francisco Giordano
a221c17fb2 Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity 
v2.1.1
 2019-01-18 15:33:51 -03:00
Francisco Giordano
bce2d68e7f convert 2 spaces to 4 spaces 2019-01-17 18:02:50 -03:00
Nicolás Venturo
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
Nicolás Venturo
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
Nicolás Venturo
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
Aniket
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 a6889776f4.

* updates

* fixes #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
Nicolás Venturo
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
Nicolás Venturo
d75ba16223 ERC721 contracts no longer initialize their parents (but have some safety checks). 2018-10-15 13:41:51 -03:00
Nicolás Venturo
14dd3f6610 Added sender parameter to initializers using msg.sender. 2018-10-05 17:40:38 -03:00
Nicolás Venturo
143ccf7a74 Removed Initializable from mocks, removed explicit inheritances in the crowdsale mocks. 2018-10-05 16:34:29 -03:00
Nicolás Venturo
f29e98f772 Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3 2018-10-04 12:00:12 -03:00
Francisco Giordano
bd8345a153 Separate ERC721Mintable (#1365) 
* separate part of ERC721Mintable into ERC721MetadataMintable

* remove mint and burn from 721 tests

* Fixed linter error.

* fix ERC721 mint tests

* Minor fixes.

(cherry picked from commit 744f567f40)
 2018-10-04 11:12:05 -03:00
Francisco Giordano
744f567f40 Separate ERC721Mintable (#1365) 
* separate part of ERC721Mintable into ERC721MetadataMintable

* remove mint and burn from 721 tests

* Fixed linter error.

* fix ERC721 mint tests

* Minor fixes.
 2018-10-04 11:10:08 -03:00
Francisco Giordano
f3a0a6a463 convert ERC721Full, ERC721Enumerable, ERC721Metadata to initializers 2018-09-25 17:51:28 -03:00
Francisco Giordano
9b37104655 Turn off blank-lines Solium rule (#1284) 
* turn off blank-lines rule

* remove triple newlines
 2018-09-19 19:59:13 -03:00
Nicolás Venturo
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