Commit Graph

155 Commits

Author SHA1 Message Date
08da709ba7 refactor _checkAuhtorized 2023-07-13 16:45:30 +02:00
328b16bf8c Authorised → Authorized 2023-07-13 16:29:05 +02:00
e996ba49d8 add ERC721 specific details in the 'How to upgrade from 4.x' section of the CHANGELOG 2023-07-13 16:00:38 +02:00
20048ca3b9 Changes suggested in the PR discussions 2023-07-13 11:00:11 +02:00
4c25b48803 Merge branch 'refactor/erc721-update-fnPointer' of https://github.com/Amxx/openzeppelin-contracts into refactor/erc721-update-fnPointer 2023-07-13 10:00:55 +02:00
d7a6aaf41f remove _exists 2023-07-13 10:00:50 +02:00
fb4d9510de Apply suggestions from code review
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
2023-07-13 10:00:39 +02:00
4516803058 make the safe function without a data field non virtual 2023-07-12 17:15:48 +02:00
7121ff7c5f Merge branch 'erc721-approve-0' into refactor/erc721-update-fnPointer 2023-07-12 13:46:07 +02:00
de570d0d14 allow using approve/_approve to clean approval 2023-07-12 13:42:46 +02:00
2558c8fac8 change _increaseBalance type to uint128 2023-07-12 10:16:55 +02:00
16f2f15673 remove _isApproedOrOwner in favor of _isApproved + refactor _checkOnERC721Received 2023-07-12 10:01:30 +02:00
7e9d024d08 Apply suggestions from code review
Co-authored-by: Ernesto García <ernestognw@gmail.com>
2023-07-12 09:31:18 +02:00
1a9552009b replace constraints with a simple operator check 2023-07-11 21:47:23 +02:00
bd0c52e34a refactor constraint into an optionalChecks bitmap 2023-07-11 18:06:29 +02:00
562ddf566a implement hybrid _update 2023-07-05 18:45:42 +02:00
54cb3ca05f Merge branch 'master' into refactor/erc721-update-fnPointer 2023-07-03 21:09:30 +02:00
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
78c280b537 Merge branch 'master' into refactor/erc721-update-fnPointer 2023-06-30 18:40:55 +02:00
04342118dc Fix visibility in ERC721._checkOnERC721Received documentation (#4386) 2023-06-30 13:08:46 -03:00
e9f03bd211 Exclude address(0) in ERC721._isApprovedOrOwner 2023-06-30 13:00:34 -03:00
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
7ec34355ae Apply suggestions from code review 2023-06-21 17:59:22 +02:00
1ed8f9ef2c use __unsafe_increaseBalance to react to batch minting 2023-06-21 17:56:00 +02:00
a3526acdf2 Rebase ERC721._update on top of next-v5 2023-06-21 17:45:35 +02:00
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
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
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
df2778f38e Remove override interface implementations (#4315)
Co-authored-by: Ernesto García <ernestognw@gmail.com>
2023-06-06 18:13:08 -06:00
ffceb3cd98 Remove hardcoded function resolution (#4299) 2023-06-02 14:20:58 -03:00
7bb5592ad5 Bump minimum pragma version to 0.8.19 (#4288) 2023-05-29 21:37:37 +02:00
5955d8e85b Merge remote-tracking branch 'upstream/master' into next-v5.0 2023-05-25 10:52:46 +02:00
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
8de6eba8a3 Merge branch 'master' into next-v5.0 2023-05-16 00:07:07 -03:00
eedca5d873 Merge release-v4.8 branch 2023-03-02 21:13:25 -03:00
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
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
4147005b0c Update Prettier Solidity (#3898) 2022-12-26 23:28:51 -03:00
b709eae01d Update Prettier Solidity (#3898) 2022-12-23 22:28:05 -03:00
49c0e4370d 4.8.0 2022-11-08 11:29:29 -03:00
1f18fea1de 4.8.0-rc.2 2022-10-17 18:53:40 +02:00
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
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
16791134c1 4.8.0-rc.1 2022-09-23 18:59:29 +02:00
5e6fd491f3 4.8.0-rc.0 2022-09-07 18:08:32 -03:00
171fa40bc8 ERC721 extension for efficient batch minting (#3311)
Co-authored-by: Francisco <frangio.1@gmail.com>
2022-09-05 23:09:30 +02:00
24fc709533 Set up codespell (#3643) 2022-08-23 12:43:03 -03:00
f491e98d37 Use unchecked for ERC721 balance updates (#3524)
Co-authored-by: Francisco <frangio.1@gmail.com>
2022-08-23 02:48:09 +00:00
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
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