3e6c86392c
Merge release-v5.0 branch ( #4665 )
...
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Eric Lau <ericglau@outlook.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
1 year ago
9e3f4d60c5
Use the _update mechanism in ERC721 ( #4377 )
...
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
2 years ago
cb0ffefe2f
Use named arguments in mapping types ( #4433 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
2 years ago
00cbf5a236
Update pragma to 0.8.20 ( #4489 )
...
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: ernestognw <ernestognw@gmail.com>
2 years ago
874c2d3c02
Use explicit imports ( #4399 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: ernestognw <ernestognw@gmail.com>
2 years ago
b425a72240
Replace revert strings with custom errors ( #4261 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
2 years ago
df2778f38e
Remove override interface implementations ( #4315 )
...
Co-authored-by: Ernesto García <ernestognw@gmail.com>
2 years ago
85696d80ad
Remove further hardcoded function resolution ( #4309 )
2 years ago
ffceb3cd98
Remove hardcoded function resolution ( #4299 )
2 years ago
7bb5592ad5
Bump minimum pragma version to `0.8.19` ( #4288 )
2 years ago
49c0e4370d
4.8.0
2 years ago
1f18fea1de
4.8.0-rc.2
2 years ago
3742c16948
Refactor consecutive transfer hooks ( #3753 )
...
(cherry picked from commit 08d5e4a9b0
2 years ago
08d5e4a9b0
Refactor consecutive transfer hooks ( #3753 )
2 years ago
16791134c1
4.8.0-rc.1
2 years ago
089f9b95af
Ignore specific warnings and make the rest into errors ( #3695 )
...
(cherry picked from commit 046121e080
2 years ago
046121e080
Ignore specific warnings and make the rest into errors ( #3695 )
2 years ago
5e6fd491f3
4.8.0-rc.0
2 years ago
171fa40bc8
ERC721 extension for efficient batch minting ( #3311 )
...
Co-authored-by: Francisco <frangio.1@gmail.com>
2 years ago
dc14c72e53
Update comment for _beforeTokenTransfer ( #3586 )
2 years ago
6bd6b76d11
4.4.1
3 years ago
4961a51cc7
4.4.0
3 years ago
65ef662a2b
4.4.0-rc.1
3 years ago
0a87a4e75b
4.4.0-rc.0
3 years ago
c9bdb1f0ae
Add a comment documenting the package version being used ( #2918 )
3 years ago
b0cf6fbb7a
Add Prettier for linting and fix Solhint config ( #2697 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
4 years ago
24a0bc23cf
Reorganize the repo structure ( #2503 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
4 years ago
09734e8028
Remove enumerable from ERC721 and add an ERC721Enumerable extension ( #2511 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
4 years ago
24c37c1f9e
Bundle ERC721 extensions into base contract ( #2149 )
...
* Add IERC721Metadata implementation into ERC721
* Add IERC721Enumerable into ERC721
* Update ERC721Pausable and ERC721Burnable
* Delete ERC721Metadata, ERC721Enumerable and ERC721 (now ERC721)
* Update mocks
* Update tests
* Update contracts/token/ERC721/ERC721.sol
Co-Authored-By: Francisco Giordano <frangio.1@gmail.com>
* Make ERC721Pausable and ERC721Burnable abstract
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
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
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
7552af95e4
migrate content to format for new docs site
...
Squashed commit of the following:
commit fcf35eb806100de300bd9803ce3150dde1ecc424
Author: Francisco Giordano <frangio.1@gmail.com>
Date: Wed Jul 17 17:16:04 2019 -0300
remove all docsite dependency
commit eeaee9a9d43d70704f6ab17b5126ddbd52b93a50
Author: Francisco Giordano <frangio.1@gmail.com>
Date: Wed Jul 17 17:15:23 2019 -0300
update solidity-docgen
commit f021ff951829ea0c155186749819403c6b76e803
Author: Francisco Giordano <frangio.1@gmail.com>
Date: Wed Jul 17 17:05:06 2019 -0300
update docsite script for new setup
commit ff887699d381cfbbe3acf1f1c0de8e22b58480f3
Merge: c938aa1d 84f85a41
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
0dded493a0
Nonfunctional typos #1643 ( #1652 )
...
* Add IntelliJ IDE config to .gitignore
* Fix variable name in ERC20 function comments
* Fix typos in Arrays function comment
* Fix typos in ownership test names
* Fix typo in Pausable test name
* Fix grammar in Ownable function comment
* Fix grammar in Crowdsale contract comment
* Fix typo in Counters contract comment
* Fix typo in ERC721Enumerable comment
* Fix typo in ERC721PausedToken test name
* Fix typo in Crowdsale function comment
* Fix typo in IncreasingPriceCrowdsale function comment
* Fix grammar in IncreasingPriceCrowdsale test name
* Fix typo in AllowanceCrowdsale test name
* Fix typo in RefundEscrow function comment
* Fix typo in ERC20Migrator contract comment
* Fix typos in SignatureBouncer comments
* Fix typo in SignedSafeMath test name
* Fix typo in TokenVesting contract comment
* Move Ownable comment from @notice section to @dev
The Ownable contract has a comment explaining that renouncing
ownership will prevent execution of functions with the onlyOwner
modifier.
This commit moves that comment to the @dev section and replaces it
with a description suitable for a generic user.
* Clarify purpose of ERC20 transfer function
* Clarify registration of ERC721Enumerable interface
* Clarify purpose of AllowanceCrowdsale test
* Increase specificity of inheritance comments
FinalizableCrowdsale and RefundableCrowsale both have comments
indicating that they are extensions of the Crowdsale contract.
This commit refines those comments to the most immediate ancestor
( TimedCrowdsale and RefundableCrowdsale respectively )
* Remove unused parameter in PaymentSplitter test
* Rename parameter in SignatureBouncer functions
The SignatureBouncer contract has modifiers to validate the
message sender is authorised to perform an action. They pass
msg.sender to internal functions as the variable `account`, but
the function comments refer to the variable as `sender`
This commit changes the variable name to `sender`
* Clarify comments in SignatureBouncer functions
The SignatureBouncer has comments that use the description
`sender` to refer to the variable `account`.
This commit updates the comments for consistency.
Maintainer Note: this reverts changes in the previous commit,
which renamed the variable `account` instead.
6 years ago
2fc0aaabb3
Use canonical EIP reference format
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
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
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
18552a8d5f
Fix/add comment erc721 burnable #1464 ( #1469 )
...
* fix Add a comment to ERC721Enumerable #1465
* fix Add comments to ERC721Burnable #1464
6 years ago
github-actions[bot]
Hadrien Croubois
Ernesto García
Francisco
Renan Souza
Francisco Giordano
hamiltoncyber
Hadrien Croubois
Nicolás Venturo
Balaji Pachai
J Quinn
nikeshnazareth
William Entriken
skyge
Aniket
Hao (Alan) Tang