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

143 Commits

Author SHA1 Message Date
Hadrien Croubois
16f2f15673 remove _isApproedOrOwner in favor of _isApproved + refactor _checkOnERC721Received 2023-07-12 10:01:30 +02:00
Hadrien Croubois
7e9d024d08 Apply suggestions from code review 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
 2023-07-12 09:31:18 +02:00
Hadrien Croubois
1a9552009b replace constraints with a simple operator check 2023-07-11 21:47:23 +02:00
Hadrien Croubois
bd0c52e34a refactor constraint into an optionalChecks bitmap 2023-07-11 18:06:29 +02:00
Hadrien Croubois
562ddf566a implement hybrid _update 2023-07-05 18:45:42 +02:00
Hadrien Croubois
54cb3ca05f Merge branch 'master' into refactor/erc721-update-fnPointer 2023-07-03 21:09:30 +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
Hadrien Croubois
78c280b537 Merge branch 'master' into refactor/erc721-update-fnPointer 2023-06-30 18:40:55 +02:00
Hicham010
04342118dc Fix visibility in ERC721._checkOnERC721Received documentation (#4386) 2023-06-30 13:08:46 -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
Hadrien Croubois
7ec34355ae Apply suggestions from code review 2023-06-21 17:59:22 +02:00
Hadrien Croubois
1ed8f9ef2c use __unsafe_increaseBalance to react to batch minting 2023-06-21 17:56:00 +02:00
Hadrien Croubois
a3526acdf2 Rebase ERC721._update on top of next-v5 2023-06-21 17:45:35 +02: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
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
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
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
Hadrien Croubois
8ba26f388f Merge pull request from GHSA-878m-3g6q-594q 
* Test batch minting of 1

* Fix balance tracking

* fix lint

* add changeset

* rename UNSAFE -> unsafe

* fix docs

* fix changeset

* grammar

* add explanation of preserved invariant

* add fuzz tests

* rename variable

* improve property definition

* add burn

* add test ownership multiple batches

* refactor fuzz tests

* change ownership test for better probability

* typo

* reorder comment

* update changelog notes

* edit changelog

* lint

* Update CHANGELOG.md

---------

Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-03-02 19:41:28 -03: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
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
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
Francisco
3742c16948 Refactor consecutive transfer hooks (#3753) 
(cherry picked from commit 08d5e4a9b0)
Signed-off-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2022-10-17 18:42:01 +02:00
Hadrien Croubois
0b3acb286a Recommended improvement to ERC721Consecutive (#3712) 
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
(cherry picked from commit c22db8104e)
 2022-09-30 12:54:56 -03: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
Hadrien Croubois
171fa40bc8 ERC721 extension for efficient batch minting (#3311) 
Co-authored-by: Francisco <frangio.1@gmail.com>
 2022-09-05 23:09:30 +02:00
Hadrien Croubois
24fc709533 Set up codespell (#3643) 2022-08-23 12:43:03 -03:00
Hadrien Croubois
f491e98d37 Use unchecked for ERC721 balance updates (#3524) 
Co-authored-by: Francisco <frangio.1@gmail.com>
 2022-08-23 02:48:09 +00:00
Hadrien Croubois
98c3a79b57 Change execution order to avoid reentry through the _beforeTokenTransfer hook (#3611) 
Co-authored-by: Francisco <frangio.1@gmail.com>
 2022-08-19 10:33:19 -03:00
Nicolas Bayle
7ddbfe181e Add access control comment for ERC721 _burn function (#3576) 
* Added access control comment for ERC721 _burn function

* Update contracts/token/ERC721/ERC721.sol

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>

* Update contracts/token/ERC721/ERC721.sol

Co-authored-by: Francisco <frangio.1@gmail.com>

Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <frangio.1@gmail.com>
 2022-07-25 22:42:13 +02:00
Aleksei Magusev
fbf235661e Improve grammar in transfer error messages (#3542) 2022-07-25 17:01:14 -03:00
EthanOK
96163c87e3 Implicitly clear ERC721 approval on burn (#3538) 2022-07-09 10:25:45 +02:00
Andrew Parker
e02c378745 Implicitly clear ERC721 approval on transfers (#3481) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
 2022-07-04 15:29:15 -03:00
Hadrien Croubois
3dac7bbed7 Merge v4.7 back into master (#3516) 2022-06-29 12:34:30 +02:00
Francisco Giordano
62f2c0531b Simplify ERC721 revert reasons (#3438) 2022-06-01 18:22:13 -03:00
rotcivegaf
82a63f6389 Remove redundant require in ERC721 (#3434) 
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
 2022-05-26 22:22:35 -03: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
Nate Lapinski
65b45726b3 Add memory safe assembly annotations (#3384) 
Co-authored-by: Nate <nate@Nates-MacBook-Pro.local>
 2022-05-23 15:37:08 -03: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