3dac7bbed7
Merge v4.7 back into master ( #3516 )
2022-06-29 12:34:30 +02:00
b159b3fee2
Minor wording fixes ERC4626 contract ( #3510 )
2022-06-28 14:56:09 +02:00
74738721dc
Make ERC4626 _deposit and _withdraw internal virtual ( #3504 )
2022-06-24 14:55:20 -03:00
450c569d78
Add a caution note to ERC4626 about EOA access ( #3503 )
2022-06-24 10:22:10 +02:00
a55b7d1372
Rename ERC20TokenizedVault to ERC4626 ( #3467 )
2022-06-14 11:39:01 +02:00
7c75b8aa89
Add a SafeERC20:safePermit function ( #3280 )
2022-06-07 15:17:02 +00:00
5e00787199
ERC4626 ( #3171 )
2022-06-02 10:03:03 +02:00
62f2c0531b
Simplify ERC721 revert reasons ( #3438 )
2022-06-01 18:22:13 -03:00
82a63f6389
Remove redundant require in ERC721 ( #3434 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-05-26 22:22:35 -03:00
488dd562fb
Improve error messages for ERC721 and 1155 ( #3254 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-05-27 00:52:43 +00:00
65b45726b3
Add memory safe assembly annotations ( #3384 )
...
Co-authored-by: Nate <nate@Nates-MacBook-Pro.local >
2022-05-23 15:37:08 -03:00
c019e7c5bb
Fix typo causing broken URL in ERC20Snapshot comment ( #3428 )
2022-05-23 14:57:57 -03:00
ee4d8380d3
Fix minor typo in IERC1155 and IERC721 docs ( #3419 )
2022-05-18 15:19:41 +02:00
e633ee9ed3
Fix spelling and grammar in comments ( #3408 )
2022-05-11 18:10:00 -03:00
3b9381dfb1
Add customizable fee receiver to ERC20FlashMint ( #3327 )
...
Co-authored-by: Mazen Khalil <mazen@immunityledger.org >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-05-06 18:46:23 -03:00
07b1b472c0
Improve wording consistency in code/doc ( #3365 )
2022-05-04 18:20:59 -03:00
a035b235b4
Release v4.6 ( #3358 )
...
* 4.6.0-rc.0
* Fix release script to only release @openzeppelin/contracts
(cherry picked from commit 2bd75a44bb#3305 )
(cherry picked from commit d2832ca7a9hadrien.croubois@gmail.com >
* add transpilation guards to the crosschain mocks (#3306 )
(cherry picked from commit 9af5af8fffhadrien.croubois@gmail.com >
* Fix tests on upgradeable contracts after transpilation
(cherry picked from commit 0762479dd5hadrien.croubois@gmail.com >
* Remove unused constructor argument
(cherry picked from commit 69c3781043hadrien.croubois@gmail.com >
* Bump minimum Solidity version for Initializable.sol to 0.8.2 (#3328 )
(cherry picked from commit cb14ea3c5c848fef5b6chadrien.croubois@gmail.com >
* 4.6.0
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-04-27 09:34:09 +02:00
c12076fb7e
Fix ERC777 link ( #3351 )
2022-04-23 16:35:04 +02:00
dd01889434
Remove outdated documentation in ERC2981._setTokenRoyalty
2022-04-07 20:34:04 -03:00
731e199038
Improve docs for ERC721URIStorage._burn ( #3324 )
2022-04-07 20:28:18 -03:00
d4d8d2ed97
Fix burn documentation ( #3246 )
...
Co-authored-by: xombxomb <dmfinn@wustl.edu >
2022-04-05 19:44:20 -03:00
742e85be7c
Change zero address revert message in the balanceOf function of ERC721 and ERC1155 ( #3314 )
2022-04-02 12:13:33 +02:00
d2832ca7a9
make ERC2981:royaltyInfo public ( #3305 )
2022-03-31 20:01:22 +02:00
3f49408fb6
Move event definition at the top of IERC20, IERC777 and IERC1820 ( #3228 )
2022-03-30 12:36:37 -03:00
e7719ded56
Match IERC721 function order with EIP spec ( #3287 )
2022-03-30 12:34:17 -03:00
02fcc75bb7
Add ERC1155URIStorage ( #3210 )
...
* Add ERC721URIStorage-like extension for ERC1155
* Add tests for ERC1155URIStorage extension
* add changelog entry for ERC721URIStorage
* Fix linting errors
* Emit URI event in ERC1155URIStorage
* Remove exists check and ERC1155Supply dependency
* Fix lint error
* Overwrite ERC1155 uri method
* Update ERC1155URIStorage specs
* Fix ERC1155URIStorageMock
* Rename _setTokenURI => _setURI in ERC1155URIStorage
* Add baseURI to ERC1155URIStorage
* Move super.uri call in ERC1155URIStorage
* Clearify ERC1155URIStorage description in change log
* reorder changelog & add documentation
* improve documentation
* fix typo
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-03-29 09:15:43 +00:00
98716177ae
Inherit ERC20Wrapper decimals from the underlying ( #3259 )
2022-03-22 09:55:49 +01:00
cc1c18098c
Replace immutable with constant for _PERMIT_TYPEHASH ( #3196 )
...
* replace `immutable` with `constant` for _PERMIT_TYPEHASH
This commit is related to the following issue discussion: https://github.com/OpenZeppelin/contracts-wizard/issues/89#issuecomment-1042391318
Since Solidity version `0.6.12` the `keccak256` of string literals is treated specially and the hash is evaluated at compile time. Since the OpenZeppelin Wizard also uses `constant` for OpenZeppelin's AccessControl's roles declarations, it's good practice to make this consistent.
* Update CHANGELOG
* fix: ensure transpiler compatibility
* fix: fixing var-name-mixedcase
* prettier & lint check
Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch >
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-03-09 17:38:29 +01:00
f2a311dc4a
Make Votes._getVotingUnits view ( #3225 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-08 21:39:53 +00:00
62eb4568be
Optimize ERC721 _isApprovedOrOwner function ( #3248 )
2022-03-08 18:18:56 -03:00
f8bfa560e9
Use _spendAllowance in ERC20FlashMint ( #3226 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-08 19:34:24 +00:00
abdb20a6bd
Change dependency source to work around Truffle limitation ( #3218 )
2022-02-25 14:49:58 +00:00
3e74681e77
Read allowance from overridable function in increase/decrease ( #3213 )
2022-02-23 11:28:44 -03:00
f6b614a7c5
Perform ERC1155.afterTokenTransfer hooks before acceptance check ( #3215 )
2022-02-22 18:24:03 -03:00
458697be32
Fix typos ( #3207 )
...
Fix misspelling in ERC20 contract comments.
2022-02-22 18:26:18 +01:00
3dfc0a44f8
ERC1155 after token transfer hook ( #3166 )
...
* add Hooks _afterTokenTransfer
* avoid duplicate call to _asSingleton
* add changelog entry
* update changelog link to PR
* Update CHANGELOG.md
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: CryptoV8 <91189073+CryptoV8@users.noreply.github.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-02-14 16:55:43 +01:00
be3c5ca504
clarify _spendAllowance natspec ( #3188 )
2022-02-13 14:48:45 +01:00
4cb0926f11
Fix grammar typo in doc ( #3186 )
...
Add missing verb "are".
2022-02-11 15:41:22 +01:00
afb20119b3
Release v4.5
2022-02-09 18:16:53 -03:00
c5a6cae898
Add a _spendAllowance function to ERC20 & ERC777 ( #3170 )
2022-02-09 12:26:53 -03:00
63b466901f
Rename some ERC20 parameters to match the standard document. ( #3167 )
...
* Renames `sender` to `source`.
The naming variable was incorrect. The source of the funds is *not* necessarily (and in most cases isn't) the sender of the transaction. Also, this code has a `msgSender` which further adds confusion.
* Changes to `from/to` instead of `source`.
* Function documentation matches new names
* Changed other instances of sender/recipient to from/to.
Also changed `msgSender` to `owner` in the approval related methods.
* apply changes to IERC20.sol + minor renaming in ERC20.sol
Co-authored-by: Daniel Von Fange <daniel@leancoder.com >
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-02-08 00:05:29 +01:00
574f3b89e1
Add proper revert message on overflow of totalSupply during burn ( #3144 )
2022-02-01 19:10:11 -03:00
a81b07ce91
Fix typo in retrieval of onERC721Received selector ( #3151 )
2022-01-31 10:47:56 +01:00
6fb1e843cf
Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual ( #3133 )
...
* Make royaltyInfo(uint256 _tokenId, uint256 _salePrice) virtual
Should be cherrypicked in release 4.5
* fix lint
2022-01-26 17:35:05 +01:00
e298476a90
Simplification of ERC777's transfer & transferFrom by using _send ( #3128 )
...
* Update ERC777.sol
* Update ERC777.sol
* Update ERC777.sol
* Update ERC777.sol
* fix revert reasons
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-01-25 14:56:13 +01:00
8f70c8867e
Fix typo in ERC721.sol ( #3127 )
2022-01-23 11:05:41 +01:00
b3b83b558e
Add Slither reentrancy check in CI ( #3047 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-01-21 00:15:54 +00:00
ecae978cb5
Make more functions virtual ( #3078 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-01-13 18:56:36 +00:00
dee772a55f
Add documentation to TokenTimelock
2022-01-12 11:51:09 -03:00
80d8da0564
Do not reduce approval on transferFrom if current allowance is type(uint256).max ( #3085 )
...
* add feature request #3084
* Update contracts/token/ERC20/ERC20.sol
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* Add changelog note
* add documentation
* test unlimitted allowance and add ERC777 unlimitted allowance
* reference PR in changelog
* documentation IERC20 -> ERC20
* use asciidoc note syntax
* use asciidoc note syntax
* typo
* typos
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-01-11 00:08:33 +01:00
