6ab8d6a67e
Improve spelling in ERC1155 revert reasons ( #3433 )
2022-07-12 14:00:12 +00:00
3dac7bbed7
Merge v4.7 back into master ( #3516 )
2022-06-29 12:34:30 +02: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
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
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
742e85be7c
Change zero address revert message in the balanceOf function of ERC721 and ERC1155 ( #3314 )
2022-04-02 12:13:33 +02: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
f6b614a7c5
Perform ERC1155.afterTokenTransfer hooks before acceptance check ( #3215 )
2022-02-22 18:24:03 -03: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
afb20119b3
Release v4.5
2022-02-09 18:16:53 -03:00
574f3b89e1
Add proper revert message on overflow of totalSupply during burn ( #3144 )
2022-02-01 19:10:11 -03:00
4a9cc8b491
Merge branch 'release-v4.4'
2021-12-14 13:34:03 -03:00
6bd6b76d11
4.4.1
2021-12-14 13:14:39 -03:00
7d17acfb2f
Merge branch 'release-v4.4'
2021-11-25 16:56:07 -03:00
4961a51cc7
4.4.0
2021-11-25 16:35:37 -03:00
2f2604d673
Deprecate presets in favor of Wizard ( #2986 )
2021-11-24 10:14:14 +01:00
65ef662a2b
4.4.0-rc.1
2021-11-16 10:23:53 -03:00
70138680cf
Fix ERC1155 supply tracking ( #2956 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
(cherry picked from commit 4088540aef
2021-11-15 18:07:21 -03:00
4088540aef
Fix ERC1155 supply tracking ( #2956 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-11-08 18:47:21 -03:00
fbfe19d6db
Improve documentation around ERC1155
2021-11-03 10:35:42 -03:00
0a87a4e75b
4.4.0-rc.0
2021-10-20 17:21:04 -03:00
9e13852135
Fix typo ( #2919 )
2021-10-20 08:33:08 +02:00
c9bdb1f0ae
Add a comment documenting the package version being used ( #2918 )
2021-10-19 19:18:19 -03:00
caba6b93ef
Add an internal _setApprovalForAll function (721 & 1155) ( #2834 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-06 13:48:18 +00:00
e2fa301bfb
Improve parameters naming and remove unecessary returns ( #2891 )
2021-10-06 10:34:27 -03:00
4e2641a915
Simplify selector access ( #2766 )
2021-07-13 01:23:14 +02:00
b0cf6fbb7a
Add Prettier for linting and fix Solhint config ( #2697 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-06-07 12:33:03 -03:00
406c83649b
Introduce ERC1155 totalSupply() and exists() functions ( #2593 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-05-20 21:46:21 +00:00
5f7eda1f98
Tokens: wrap safe substractions in uchecked block ( #2669 )
...
* Tokens: wrap definitely safe subs in unchecked
* Add change in changelog
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2021-05-20 10:33:28 +02:00
a98814b930
Fix documentation typos
2021-04-26 15:41:17 -03:00
440b65bf77
Refactor ERC1155 transfers to use internal functions ( #2636 )
...
* Refactor ERC1155 transfers to use internal functions #2622
* apply length check to all internal calls
Co-authored-by: Robert Kaiser <kairo@kairo.at >
2021-04-19 22:13:15 +02:00
5dbbda5435
Make ERC1155.uri public ( #2576 )
2021-03-08 15:42:34 -03:00
29ffe6f426
Add ERC165 interface detection to AccessControl ( #2562 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2021-03-04 18:50:12 -03:00
24a0bc23cf
Reorganize the repo structure ( #2503 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-02-22 16:44:16 +00:00
e733b24dfe
Refactor ERC165 to use function overriding instead of storage ( #2505 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-02-18 19:02:28 +00:00
a44303c373
Remove double sload when doing math checks in tokens ( #2506 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-02-09 12:58:23 -03:00
5db7413827
re-enabling safemath revert reasons in ERC20, ERC777 and ERC1155 ( #2491 )
...
* re-enabling safemath revert reasons in ERC20 and ERC1155
* adding revert messages to ERC777
* removing uncheck block
2021-02-01 11:00:16 +01:00
60205944bb
Adopt new Solidity features interfaceId, try/catch, keccak constants ( #2487 )
...
* Clean code
- using type().interfaceId to improve readeability of ERC165 registration
- hardcoding some keccak256 that are otherwise computed at construction.
* hardcode keccak256 result
* Improve code readeability using try/catch
* Remove hardcoded hash
tests show that solc 0.8.0 does the optimization as expected
* Use try/catch to improve readability
* ERC165Checker: Do not revert when returndata is empty + new test
* Address PR comments
* improve testing of ERC721Receiver errors
* put back comment about invalid interface id
* coverage does not support 0.8.1. Reverting back to 0.8.0
* bubble all data with length > 0 if onERC721Receive fails.
* Fix test: revert without message trigger is bubble with the default message
* using enum object to improve readability
2021-01-29 22:20:49 +01:00
0db76e98f9
Merge branch 'solc-0.7' into solc-0.8
2021-01-27 11:28:23 +01:00
6d202894b6
Merge branch 'master'
2021-01-26 18:58:15 +01:00
18c7efe800
Make view and pure functions virtual ( #2473 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-01-26 13:23:23 -03:00
974c534210
Update contracts to support Solidity 0.8.x ( #2442 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-01-14 19:38:53 -03:00
faec973e09
Make non-view functions virtual ( #2468 )
2021-01-13 18:25:39 -03:00
318c4b44ea
Move Context from GSN to utils directory ( #2453 )
...
Co-authored-by: Hadrien Croubois <hadrien@openzeppelin.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-01-07 13:04:13 -03:00
6be0b410dc
Use explicit conversions between addresses and numbers ( #2439 )
...
Co-authored-by: hrkrshnn <webmail.hari@gmail.com >
Co-authored-by: cameel <cameel2@gmail.com >
2020-12-17 22:51:48 -03:00
42da4d6867
Fix name of argument in docstring
...
Fixes #2410
2020-11-18 18:54:09 -03:00
90ed1af972
Support compiling with solc 0.7 ( #2408 )
2020-11-17 21:29:39 -03:00
0f55c18595
Fix/solc 0.7.4 warnings #2391 ( #2396 )
...
* Fix unnamed return variable warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: Unnamed return variable can remain unassigned. Add an explicit
return with value to all non-reverting code paths or name the variable."
* Fix function state mutability warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: Function state mutability can be restricted to pure"
* Fix shadows an existing declaration warning
This commit fixes warnings thrown by the solc 0.7.4 compiler:
"Warning: This declaration shadows an existing declaration."
1. Arguments by default are not underscored.
2. If the name isn't available due to shadowing, use prefix underscore.
3. If prefix underscore isn't available due to shadowing, use suffix underscore.
2020-10-28 13:42:38 -03:00
