NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,347 Commits 61 Branches 143 Tags
fab65cd08b321b54d108142d16dfdbe1d9e5f11c
Commit Graph

99 Commits

Author SHA1 Message Date
Ernesto García
cb0ffefe2f Use named arguments in mapping types (#4433) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-08-08 22:48:56 -03:00
Hadrien Croubois
00cbf5a236 Update pragma to 0.8.20 (#4489) 
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: ernestognw <ernestognw@gmail.com>
 2023-07-31 17:25:45 -03:00
Francisco
3d0edbecf1 Remove ERC1155Receiver in favor of ERC1155Holder (#4450) 2023-07-11 14:49:58 -03:00
Francisco
6bf68a41d1 Remove "available since" comments (#4424) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-07-06 10:00:34 +02:00
Ernesto García
bb64458928 Implement recommendations from 5.0 audit Phase 1A (#4398) 
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-07-03 15:02:06 -03:00
Francisco
874c2d3c02 Use explicit imports (#4399) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: ernestognw <ernestognw@gmail.com>
 2023-06-29 20:12:26 +00:00
Ernesto García
8cab922347 Rename ERC1155InsufficientApprovalForAll to ERC1155MissingApprovalForAll (#4381) 2023-06-26 14:20:01 +02:00
Claudia Barcelo
cd48b3eab3 Add validation in Governor on ERC-721 or ERC-1155 received (#4314) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
 2023-06-15 21:43:17 -03:00
Claudia Barcelo
05ef6924ac Optimize array access in ERC1155 (#4300) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-06-15 02:39:34 +00:00
Hadrien Croubois
ef103f37e4 Replace some uses of abi.encodePacked with more explicit alternatives (#4296) 
Co-authored-by: Francisco <fg@frang.io>
 2023-06-14 21:11:12 +02:00
Ernesto García
5cc1ea0a39 Add GUIDELINES.md for marking abstract contracts (#4010) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-06-14 19:01:33 +00:00
Ernesto García
b425a72240 Replace revert strings with custom errors (#4261) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
 2023-06-12 23:41:52 +00:00
Pascal Marco Caversaccio
e73f90fa9d Fix IERC1155.safeBatchTransferFrom documentation (#4340) 2023-06-11 16:38:31 -03:00
Robb Walters
cc04263170 Highlight Reentrancy Risk in IERC1155 SafeTransferFrom Function (#4283) 
Co-authored-by: Francisco <fg@frang.io>
 2023-06-09 13:00:16 -03:00
Renan Souza
df2778f38e Remove override interface implementations (#4315) 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
 2023-06-06 18:13:08 -06:00
Francisco
ffceb3cd98 Remove hardcoded function resolution (#4299) 2023-06-02 14:20:58 -03:00
Renan Souza
5cef83d2c7 Optimize array allocation in ERC1155 (#4196) 
Co-authored-by: Francisco <fg@frang.io>
 2023-06-02 11:37:59 -03:00
Ernesto García
7bb5592ad5 Bump minimum pragma version to 0.8.19 (#4288) 2023-05-29 21:37:37 +02:00
Hadrien Croubois
5955d8e85b Merge remote-tracking branch 'upstream/master' into next-v5.0 2023-05-25 10:52:46 +02:00
github-actions[bot]
09329f8a18 Merge release-v4.9 branch (#4274) 
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-05-24 10:37:00 -03:00
Balaji Shetty Pachai
cbc6145f5f Removes zero address check from balanceOf in ERC1155 (#4263) 
Co-authored-by: bpachai <bpachai@v2soft.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-05-24 08:39:06 +00:00
Francisco Giordano
8de6eba8a3 Merge branch 'master' into next-v5.0 2023-05-16 00:07:07 -03:00
Francisco Giordano
eedca5d873 Merge release-v4.8 branch 2023-03-02 21:13:25 -03:00
Francisco Giordano
2d05db171a Add note about supply limit in ERC1155Supply 2023-01-31 17:27:05 -03:00
Ernesto García
1684c57922 Add ERC*Pausable warning for public pausing mechanism (#4007) 
Co-authored-by: Francisco <fg@frang.io>
 2023-01-28 20:21:07 -03:00
JulissaDantes
e919d96ff2 Add ERC1155.totalSupply that returns overall supply count (#3962) 2023-01-25 21:39:02 +01:00
JulissaDantes
c5d040beb9 Remove Address.isContract (#3945) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-01-24 17:59:07 -03:00
JulissaDantes
97bba5adaa Remove ERC1155 hooks (#3876) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <frangio.1@gmail.com>
 2023-01-10 11:13:05 +01:00
Francisco Giordano
4147005b0c Update Prettier Solidity (#3898) 2022-12-26 23:28:51 -03:00
Francisco
b709eae01d Update Prettier Solidity (#3898) 2022-12-23 22:28:05 -03:00
Francisco Giordano
9cbe8b340c Merge branch 'master' into next-v5.0 2022-12-19 18:17:33 -03:00
Hadrien Croubois
4a9db80cb9 Remove presets (#3637) 
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
Co-authored-by: JulissaDantes <julissadcj@gmail.com>
 2022-11-25 12:46:47 -03:00
Francisco Giordano
49c0e4370d 4.8.0 2022-11-08 11:29:29 -03:00
Hadrien Croubois
1f18fea1de 4.8.0-rc.2 2022-10-17 18:53:40 +02:00
Hadrien Croubois
16791134c1 4.8.0-rc.1 2022-09-23 18:59:29 +02:00
Francisco Giordano
5e6fd491f3 4.8.0-rc.0 2022-09-07 18:08:32 -03:00
Aleksei Magusev
fbf235661e Improve grammar in transfer error messages (#3542) 2022-07-25 17:01:14 -03:00
Aleksei Magusev
6ab8d6a67e Improve spelling in ERC1155 revert reasons (#3433) 2022-07-12 14:00:12 +00:00
Hadrien Croubois
3dac7bbed7 Merge v4.7 back into master (#3516) 2022-06-29 12:34:30 +02:00
Kata
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
harold-nft
ee4d8380d3 Fix minor typo in IERC1155 and IERC721 docs (#3419) 2022-05-18 15:19:41 +02:00
GitHubPang
e633ee9ed3 Fix spelling and grammar in comments (#3408) 2022-05-11 18:10:00 -03:00
Hadrien Croubois
07b1b472c0 Improve wording consistency in code/doc (#3365) 2022-05-04 18:20:59 -03:00
Hadrien Croubois
a035b235b4 Release v4.6 (#3358) 
* 4.6.0-rc.0

* Fix release script to only release @openzeppelin/contracts

(cherry picked from commit 2bd75a44bb)

* make ERC2981:royaltyInfo public (#3305)

(cherry picked from commit d2832ca7a9)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* add transpilation guards to the crosschain mocks (#3306)

(cherry picked from commit 9af5af8fff)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* Fix tests on upgradeable contracts after transpilation

(cherry picked from commit 0762479dd5)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* Remove unused constructor argument

(cherry picked from commit 69c3781043)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* Bump minimum Solidity version for Initializable.sol to 0.8.2 (#3328)

(cherry picked from commit cb14ea3c5c)

* Fix update-comment script to ignore invalid tags

(cherry picked from commit 848fef5b6c)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* 4.6.0

Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
 2022-04-27 09:34:09 +02:00
Amin Bashiri
742e85be7c Change zero address revert message in the balanceOf function of ERC721 and ERC1155 (#3314) 2022-04-02 12:13:33 +02:00
S E R A Y A
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
Hadrien Croubois
f6b614a7c5 Perform ERC1155.afterTokenTransfer hooks before acceptance check (#3215) 2022-02-22 18:24:03 -03:00
Hadrien Croubois
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
Francisco Giordano
afb20119b3 Release v4.5 2022-02-09 18:16:53 -03:00
Hadrien Croubois
574f3b89e1 Add proper revert message on overflow of totalSupply during burn (#3144) 2022-02-01 19:10:11 -03:00