4e026cd4c7
remove new gap
2019-01-24 17:49:30 -03:00
e357592208
fix linter errors
2019-01-24 13:18:09 -03:00
f3635e1517
add missing gaps and Initializables
2019-01-23 19:38:00 -03:00
cff2509c63
fix all tests for 2.1.2
2019-01-22 17:35:47 -03:00
5eafd1dec2
fix remaining tests in standalone contracts
2019-01-21 19:28:34 -03:00
73a34f96a7
fix roles initialization bug
2019-01-18 17:53:35 -03:00
877f07f0a9
fix all compilation errors
2019-01-18 17:14:53 -03:00
e808a64649
rename internal initializers
2019-01-18 16:38:26 -03:00
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
7ef2730506
Approval events on transferFrom and burnFrom ( #1524 )
...
* transferFrom now emits an Approval event, indicating the updated allowance.
* Updated burnFrom to also emit Approval.
* Added notices about the extra Approval events.
2018-11-29 12:06:47 -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
83bc045a56
Remove extraneous quantity check, fixes #1454 ( #1455 )
2018-11-02 07:16:35 -03:00
6363a776f7
Remove redundant require statements ( #1409 )
...
* Remove redundant require statements
Now that SafeMath uses require, the require statements are redundant. They were also previously inconsistent because they were only included in some functions, but not others
* Update ERC20.sol
2018-11-02 07:14:06 -03:00
79eb94d3cd
fix ERC20.sol#L174 and ERC20.sol#L187 should be casted to an address type. ( #1470 )
2018-11-01 15:27:51 -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
54268bfeed
Move standalone ERC20 and ERC721 to token dir ( #38 )
2018-10-19 11:45:02 -06: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
bbe804a14b
Deleted unnecessary import. ( #1437 )
...
* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
2018-10-18 18:43:44 -03:00
384dff9abe
Renamed internal ERC721 check function. ( #1445 )
2018-10-18 16:56:58 -03:00
5bf3907862
Made tokenURI external, as per the spec. ( #1444 )
2018-10-18 16:49:46 -03:00
c8220aeea8
ERC20Capped now capps _all_ minting, even internal calls. ( #1443 )
2018-10-18 16:49:31 -03:00
315f426f5c
Improved SafeERC20 allowance handling ( #1407 )
...
* 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
* allowance methods in library
* Improved SafeERC20 tests.
* Fixed test coverage.
2018-10-18 12:25:03 -03:00
03765e08b9
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
2018-10-17 11:35:31 -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
14dd3f6610
Added sender parameter to initializers using msg.sender.
2018-10-05 17:40:38 -03:00
dd750bc094
Added missing initializations.
2018-10-05 16:34:29 -03:00
ef83f895b9
Added initializer to ERC721MetadataMintable.
2018-10-05 16:34:29 -03:00
f29e98f772
Merge remote-tracking branch 'solidity/release-v2.0.0' into oz-sol-rc3
2018-10-04 12:00:12 -03:00
ffeae0d83e
ERC20 internal transfer method ( #1370 )
...
(cherry picked from commit 43ebb4fc43
2018-10-04 11:14:05 -03:00
38ca422170
Removing unrequired _burn() override ( #1373 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1371
* Removed extra whitespace
(cherry picked from commit f3888bb0b0
2018-10-04 11:13:05 -03:00
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
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
fd4de77651
Replaces amount with value for consistency ( #1378 )
...
* fixes #1372
* done in ERC20Capped and ERC20Mintable
2018-10-04 07:51:52 -03:00
f3888bb0b0
Removing unrequired _burn() override ( #1373 )
...
* signing prefix added
* Minor improvement
* Tests changed
* Successfully tested
* Minor improvements
* Minor improvements
* Revert "Dangling commas are now required. (#1359 )"
This reverts commit a6889776f4fixes #1371
* Removed extra whitespace
2018-10-03 12:23:08 -03:00
43ebb4fc43
ERC20 internal transfer method ( #1370 )
2018-10-02 18:15:59 -03:00
838509c0a4
Merge branch 'release-v2.0.0' of github.com:OpenZeppelin/openzeppelin-solidity into release-v2.0.0
2018-09-26 18:19:41 -03:00
8d28bd445a
covnert TokenTimelock into initializers
2018-09-26 17:46:54 -03:00
a010d88def
convert ERC721Pausable to initializers
2018-09-26 17:12:16 -03:00
d3116fcea8
add Initializable to simple ERC721 contracts
2018-09-26 17:12:16 -03:00
cda2866e7c
convert ERC721Burnable to initializers
2018-09-26 16:45:37 -03:00
