3296ca7219
Rearrange erc721metadata layout to mimic eth-pkg ( #2098 )
...
In https://github.com/OpenZeppelin/openzeppelin-contracts-ethereum-package/pull/76 , we are rearranging the erc721metadata contract storage layout, so the new variable is added at the end. This commit applies the same change to the vanilla contracts repository, so migration from 2.5 to 3.0 is easier for users using the transpiler.
5 years ago
5dfe7215a9
Migrate Contracts to Solidity v0.6 ( #2080 )
...
* Initial migration to Solidity 0.6.x - v3.0 first steps (#2063 )
* Initial migration, missing GSN, 721, 777 and Crowdsales.
* Add _beforeTokenOperation and _afterTokenOperation.
* Add documentation for hooks.
* Add hooks doc
* Add missing drafts
* Add back ERC721 with hooks
* Bring back ERC777
* Notes on hooks
* Bring back GSN
* Make functions virtual
* Make GSN overrides explicit
* Fix ERC20Pausable tests
* Remove virtual from some view functions
* Update linter
* Delete examples
* Remove unnecessary virtual
* Remove roles from Pausable
* Remove roles
* Remove users of roles
* Adapt ERC20 tests
* Fix ERC721 tests
* Add all ERC721 hooks
* Add ERC777 hooks
* Fix remaining tests
* Bump compiler version
* Move 721BurnableMock into mocks directory
* Remove _before hooks
* Fix tests
* Upgrade linter
* Put modifiers last
* Remove _beforeTokenApproval and _beforeOperatorApproval hooks
5 years ago
88dc1ca6fc
Reorder functions to prevent shadowing warning
5 years ago
e493fb3e95
Add 'available since' notes. Fixes #2054
5 years ago
49042f2b1a
feat: add baseTokenURI to ERC721Metadata ( #1970 )
...
* feat: add baseTokenURI
* fix: tests
* chore: dev notation
* chore: changelog
* chore: typo
* Remove extra getters, return empty URI by default
* Update docs
* Rename baseTokenURI to baseURI
* Roll back visibility change of tokenURI
* Update changelog entry
* Version setBaseURI docs
* Improve internal names and comments
* Fix compilation errors
* Add an external getter for baseURI
5 years ago
d1158ea68c
GSN compatibility ( #1880 )
...
* switch to using Context internally
* add context import
* Add smoke test to make sure enabling GSN support works
* Update test/GSN/ERC721GSNRecipientMock.test.js
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>
* Upgrade truffle
* add missing awaits
* Revert "Upgrade truffle"
This reverts commit f9b0ba9019
6 years ago
ae919629cd
Revert Solidity version bump. ( #1729 )
...
(cherry picked from commit 67bca857ee
6 years ago
67bca857ee
Revert Solidity version bump. ( #1729 )
6 years ago
3682c6575c
Added message string for require() ( #1704 )
...
* Error handling in ERC20 and ERC721
* Added message string for require.
* Fixed solhint errors.
* Updated PR as per issue #1709
* changes as per #1709 and openzeppelin forum.
* Changes in require statement
* Changes in require statement
* build pipeline fix
* Changes as per @nventuro's comment.
* Update revert reason strings.
* Fianal update of revert reason strings.
* WIP: Updating reason strings in test cases
* WIP: Added changes to ERC20 and ERC721
* Fixes linting errors in *.tes.js files
* Achieved 100% code coverage
* Updated the test cases with shouldFail.reverting.withMessage()
* Fix package-lock.
* address review comments
* fix linter issues
* fix remaining revert reasons
6 years ago
19c7414052
Bump minimum Solidity version to 0.5.7 ( #1724 )
...
* Bump Solidity version to 0.5.7
* Add changelog entry.
6 years ago
0df0e1b250
Fixes/Improves constants inline documentation. ( #1707 )
...
* Fixes/Improves constants inline documentation.
* Fixed solhint error.
* Moved the comment before the variable
6 years ago
3cb4a00fce
Added basic punctuation to @dev docs ( #1697 ) ( #1700 )
...
* Added basic punctuation to @dev docs (#1697 )
* add missing uppercase
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
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
dd2e947976
Deprecated ERC721._burn(address, uint256) ( #1550 )
...
* Deprecated ERC721._burn(address, uint256)
* Added missing natspec comment.
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
e237530538
Made tokenURI external, as per the spec. ( #1444 )
...
(cherry picked from commit 5bf3907862
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
e7aa8dedbc
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
(cherry picked from commit 9b37104655
6 years ago
5bf3907862
Made tokenURI external, as per the spec. ( #1444 )
6 years ago
03765e08b9
Make state variables private ( #1426 )
...
* added function to renounce ownership
* Make state variables private (#1411 )
6 years ago
9b37104655
Turn off blank-lines Solium rule ( #1284 )
...
* turn off blank-lines rule
* remove triple newlines
6 years ago
4b33eaefa2
Improved ERC721 granularity ( #1304 )
...
* Split enumerable and metadata implementations.
* Renamed ERC721Basic to ERC721, and ERC721 to ERC721Full.
* Fixed linter errors.
7 years ago
Nicolás Venturo
Ignacio Mazzara
Balaji Pachai
J Quinn
skyge
Paweł Winnicki
Francisco Giordano