2648206394
Merge pull request #1647 from nventuro/safeerc20-bugfix
...
Fix SafeERC20.safeApprove bug
(cherry picked from commit 3111291b4a
6 years ago
de90f4458a
Merge pull request #1647 from nventuro/safeerc20-bugfix
...
Fix SafeERC20.safeApprove bug
(cherry picked from commit 3111291b4a
6 years ago
b14c9f4b68
Fix SafeERC20.safeApprove bug, improve test coverage.
6 years ago
2fc0aaabb3
Use canonical EIP reference format
6 years ago
99a07493f2
Update to preferred citation formation for ERC-721
6 years ago
1fd993bc01
Unify code comments style. ( #1603 )
...
* Updated code style to no more than120 characters per line.
* Unify code comments style with Doxygen-style tags.
6 years ago
07603d5875
Remove unnecessary SafeMath call ( #1610 )
...
* Refactor Counter to support increment and decrement.
* Move Counter out of drafts.
* Refactor ERC721 to use Counter.
* Rollback Counter returning the current value in increment and decrement.
* Update test/drafts/Counter.test.js
Co-Authored-By: nventuro <nicolas.venturo@gmail.com>
* Improve Counter documentation.
* Move Counter.test to utils.
* Move back Counter to drafts.
6 years ago
3a5da75876
ERC20._approve ( #1609 )
...
* Add ERC20._approve.
* Add ERC20._approve tests.
* Fix linter error.
* Require owner in _approve to be non-zero.
6 years ago
b7d60f2f9a
Fix warnings ( #1606 )
...
* Bump required compiler version to 0.5.2.
* Fix shadowed variable warning in ERC20Migrator.
* Rename Counter to Counters.
* Add dummy state variable to SafeERC20Helper.
* Update changelog entry.
* Fix CountersImpl name.
* Improve changelog entry.
6 years ago
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.
6 years ago
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.
6 years ago
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
6 years ago
dd2e947976
Deprecated ERC721._burn(address, uint256) ( #1550 )
...
* Deprecated ERC721._burn(address, uint256)
* Added missing natspec comment.
6 years ago
70e616db7c
Optimized ERC721 transfers. ( #1539 )
...
* Added _transferToken.
* _transferFrom is now usable by derived contracts, abstracted away enumerable behavior.
* Removed unnecesary check from _clearApprovals
6 years ago
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>
6 years ago
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.
6 years ago
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>
6 years ago
83bc045a56
Remove extraneous quantity check, fixes #1454 ( #1455 )
6 years ago
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
6 years ago
79eb94d3cd
fix ERC20.sol#L174 and ERC20.sol#L187 should be casted to an address type. ( #1470 )
6 years ago
18552a8d5f
Fix/add comment erc721 burnable #1464 ( #1469 )
...
* fix Add a comment to ERC721Enumerable #1465
* fix Add comments to ERC721Burnable #1464
6 years ago
643ac86d0a
Improved some ERC721 internal shenanigans ( #1450 )
...
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.
* Added approval information.
(cherry picked from commit 8204f6a71f
6 years ago
984fe23a46
Deleted unnecessary import. ( #1437 )
...
* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
(cherry picked from commit bbe804a14b
6 years ago
95411da289
Renamed internal ERC721 check function. ( #1445 )
...
(cherry picked from commit 384dff9abe
6 years ago
e237530538
Made tokenURI external, as per the spec. ( #1444 )
...
(cherry picked from commit 5bf3907862
6 years ago
0ead40ae03
ERC20Capped now capps _all_ minting, even internal calls. ( #1443 )
...
(cherry picked from commit c8220aeea8
6 years ago
1b27b4bb34
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.
(cherry picked from commit 315f426f5c
6 years ago
1cf96ef0d1
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
(cherry picked from commit 03765e08b9
6 years ago
109eba9273
Replaces `amount` with `value` for consistency ( #1378 )
...
* fixes #1372
* done in ERC20Capped and ERC20Mintable
(cherry picked from commit fd4de77651
6 years ago
e7aa8dedbc
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
(cherry picked from commit 9b37104655
6 years ago
7ea34d9e97
Update ERC20.sol ( #1313 )
...
correct typo in doc
(cherry picked from commit b644c72eb0
6 years ago
8204f6a71f
Improved some ERC721 internal shenanigans ( #1450 )
...
* Made _clearApproval private, added clarifying comments in _addTokenTo and _removeTokenFrom.
* Added approval information.
6 years ago
bbe804a14b
Deleted unnecessary import. ( #1437 )
...
* Deleted unnecessary import.
* Added back SafeMath.
* Removed another unnecessary import.
6 years ago
384dff9abe
Renamed internal ERC721 check function. ( #1445 )
6 years ago
5bf3907862
Made tokenURI external, as per the spec. ( #1444 )
6 years ago
c8220aeea8
ERC20Capped now capps _all_ minting, even internal calls. ( #1443 )
6 years ago
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.
6 years ago
03765e08b9
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
6 years ago
ffeae0d83e
ERC20 internal transfer method ( #1370 )
...
(cherry picked from commit 43ebb4fc43
6 years ago
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
6 years ago
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
6 years ago
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.
6 years ago
fd4de77651
Replaces `amount` with `value` for consistency ( #1378 )
...
* fixes #1372
* done in ERC20Capped and ERC20Mintable
6 years ago
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
6 years ago
43ebb4fc43
ERC20 internal transfer method ( #1370 )
6 years ago
1b0c6b94b9
Removed mintingFinished. ( #1351 )
...
* Removed mintingFinished from ERC20Mintable.
* Removed MintingFinished from ERC721Mintable.
* Removed MintingFinished event.
(cherry picked from commit 5fdeaa81d5
6 years ago
5fdeaa81d5
Removed mintingFinished. ( #1351 )
...
* Removed mintingFinished from ERC20Mintable.
* Removed MintingFinished from ERC721Mintable.
* Removed MintingFinished event.
6 years ago
9b37104655
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
6 years ago
b644c72eb0
Update ERC20.sol ( #1313 )
...
correct typo in doc
6 years ago
2ce1fde405
Fixed variable shadowing. ( #1310 )
6 years ago
Nicolás Venturo
William Entriken
skyge
Aniket
Brendan Chou
Hao (Alan) Tang
Paweł Winnicki
Francisco Giordano
Jerome de Tychey
Anton Bukov