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

241 Commits

Author SHA1 Message Date
ernestognw
ba8e296915 ERC721 _update 
commit 2897abccc9
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 15:31:29 2023 +0200

    Update ERC721.sol

commit e26d5c0951
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 08:46:48 2023 +0200

    Update IERC721.sol

commit a475ffae0a
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 08:45:25 2023 +0200

    Update ERC721.sol

commit 20bb47f439
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 08:43:14 2023 +0200

    Update contracts/token/ERC721/ERC721.sol

commit f404802d55
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 08:41:30 2023 +0200

    Update ERC721.sol

commit b982e2a808
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 14 08:38:46 2023 +0200

    Update ERC721.behavior.js

commit ca32b459ec
Author: Francisco Giordano <fg@frang.io>
Date:   Thu Jul 13 19:14:15 2023 -0300

    fix _safeTransfer docs

commit caabbf3c46
Author: Francisco Giordano <fg@frang.io>
Date:   Thu Jul 13 19:08:36 2023 -0300

    improve warnings and notes

commit a023cad591
Author: Francisco Giordano <fg@frang.io>
Date:   Thu Jul 13 18:21:27 2023 -0300

    wrap long line

commit 5ce49a45fd
Author: Francisco Giordano <fg@frang.io>
Date:   Thu Jul 13 18:19:30 2023 -0300

    remove unnecessary solhint annotation

commit d0375301f1
Author: Francisco <fg@frang.io>
Date:   Thu Jul 13 18:17:24 2023 -0300

    Apply suggestions from code review

    Co-authored-by: Ernesto García <ernestognw@gmail.com>

commit 81aca96467
Author: Francisco <fg@frang.io>
Date:   Thu Jul 13 18:16:42 2023 -0300

    Update CHANGELOG.md

    Co-authored-by: Ernesto García <ernestognw@gmail.com>

commit 12f63b3b1b
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 17:28:04 2023 +0200

    add test

commit 08da709ba7
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 16:45:30 2023 +0200

    refactor _checkAuhtorized

commit 328b16bf8c
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 16:29:05 2023 +0200

    Authorised → Authorized

commit b29e573383
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 16:14:57 2023 +0200

    rename from → previousOwner

commit e996ba49d8
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 16:00:38 2023 +0200

    add ERC721 specific details in the 'How to upgrade from 4.x' section of the CHANGELOG

commit 20048ca3b9
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 11:00:11 2023 +0200

    Changes suggested in the PR discussions

commit 4c25b48803
Merge: d7a6aaf4 fb4d9510
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 10:00:55 2023 +0200

    Merge branch 'refactor/erc721-update-fnPointer' of https://github.com/Amxx/openzeppelin-contracts into refactor/erc721-update-fnPointer

commit d7a6aaf41f
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 10:00:50 2023 +0200

    remove _exists

commit fb4d9510de
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Jul 13 10:00:39 2023 +0200

    Apply suggestions from code review

    Co-authored-by: Francisco <fg@frang.io>
    Co-authored-by: Ernesto García <ernestognw@gmail.com>

commit 10815081f7
Author: ernestognw <ernestognw@gmail.com>
Date:   Wed Jul 12 21:09:18 2023 -0600

    Lint

commit 9ba012005f
Author: ernestognw <ernestognw@gmail.com>
Date:   Wed Jul 12 20:28:50 2023 -0600

    Format _increaseBalance NatSpec

commit 7c3f1615b0
Author: Francisco <fg@frang.io>
Date:   Wed Jul 12 20:29:11 2023 -0300

    Update .changeset/eighty-lemons-shake.md

    Co-authored-by: Ernesto García <ernestognw@gmail.com>

commit 4516803058
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 17:15:48 2023 +0200

    make the safe function without a data field non virtual

commit e4b0e725df
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 16:56:07 2023 +0200

    use whenNotPaused in ERC721Pausable

commit b973d985a4
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 14:11:59 2023 +0200

    changesets

commit 7121ff7c5f
Merge: 2558c8fa de570d0d
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 13:46:07 2023 +0200

    Merge branch 'erc721-approve-0' into refactor/erc721-update-fnPointer

commit de570d0d14
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 13:42:46 2023 +0200

    allow using approve/_approve to clean approval

commit 2558c8fac8
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 10:16:55 2023 +0200

    change _increaseBalance type to uint128

commit 16f2f15673
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 10:01:30 2023 +0200

    remove _isApproedOrOwner in favor of _isApproved + refactor _checkOnERC721Received

commit 7e9d024d08
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 12 09:31:18 2023 +0200

    Apply suggestions from code review

    Co-authored-by: Ernesto García <ernestognw@gmail.com>

commit 1a9552009b
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Tue Jul 11 21:47:23 2023 +0200

    replace constraints with a simple operator check

commit bd0c52e34a
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Tue Jul 11 18:06:29 2023 +0200

    refactor constraint into an optionalChecks bitmap

commit 5ab254cf95
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 7 16:13:17 2023 +0200

    lint

commit 0bb98cb8c6
Merge: 562ddf56 7ccea54d
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jul 7 16:11:40 2023 +0200

    Merge branch 'master' into feature/Governor-storage

commit 562ddf566a
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jul 5 18:45:42 2023 +0200

    implement hybrid _update

commit 54cb3ca05f
Merge: c7303ec2 bb644589
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Mon Jul 3 21:09:30 2023 +0200

    Merge branch 'master' into refactor/erc721-update-fnPointer

commit c7303ec2ae
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Mon Jul 3 09:37:53 2023 +0200

    fix lint

commit 1cc7f54ab5
Merge: 78c280b5 06861dce
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Mon Jul 3 09:35:35 2023 +0200

    Merge remote-tracking branch 'upstream' into refactor/erc721-update-fnPointer

commit 78c280b537
Merge: e2fdbacd 04342118
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Fri Jun 30 18:40:55 2023 +0200

    Merge branch 'master' into refactor/erc721-update-fnPointer

commit e9f03bd211
Author: Francisco Giordano <fg@frang.io>
Date:   Fri Jun 30 12:09:15 2023 -0300

    Exclude address(0) in ERC721._isApprovedOrOwner

commit e2fdbacd63
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jun 21 22:09:50 2023 +0200

    fix lint

commit 7ec34355ae
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jun 21 17:59:22 2023 +0200

    Apply suggestions from code review

commit 1ed8f9ef2c
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Wed Jun 21 17:56:00 2023 +0200

    use __unsafe_increaseBalance to react to batch minting

commit a3526acdf2
Author: Hadrien Croubois <hadrien.croubois@gmail.com>
Date:   Thu Apr 27 16:37:40 2023 +0200

    Rebase ERC721._update on top of next-v5
 2023-07-19 13:11:33 -06:00
Francisco
84db204a41 Rename rounding modes and complete with fourth (#4455) 
Co-authored-by: ernestognw <ernestognw@gmail.com>
 2023-07-13 17:52:03 -03:00
Ernesto García
24ebff5ae9 Remove unused imports (#4436) 
Co-authored-by: Francisco <fg@frang.io>
 2023-07-11 14:51:40 -03: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
Hadrien Croubois
1e0e4e20bb Do not emit Approval event when calling transferFrom (#4370) 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
 2023-06-22 10:41:56 -06:00
Hadrien Croubois
365aca6d60 Improve tests for ERC1155 and ERC721 error handling (#3781) 
Co-authored-by: Francisco <fg@frang.io>
 2023-06-20 03:20:02 +00: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
Ernesto García
2477534260 Change behavior of ceilDiv(0, 0) and improve test coverage (#4348) 2023-06-14 17:21:42 -03: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
Francisco
3902a410f1 Remove DOMAIN_SEPARATOR from Votes and update docs examples (#4297) 
Co-authored-by: Qiwei Yang <yangqiwei97@gmail.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-06-02 12:02:57 -03:00
Francisco Giordano
4c713f8cea Merge branch 'master' into next-v5.0 2023-05-30 17:02:47 -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
15c5c71795 Remove TokenTimelock, PaymentSplitter, ERC20Snapshot, ERC20VotesComp, GovernorVotesComp (#4276) 2023-05-26 23:30:00 +01:00
kfishnchips
5420879d9b Ability to set starting token id for ERC721Consecutive (#4097) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: ernestognw <ernestognw@gmail.com>
 2023-05-26 10:07:16 -06:00
Hadrien Croubois
25edd3cd62 Use SafeERC20.forceApprove in safeIncreaseAllowance and safeDecreaseAllowance (#4260) 
Co-authored-by: Francisco <fg@frang.io>
 2023-05-25 16:27:48 -03:00
Hadrien Croubois
5955d8e85b Merge remote-tracking branch 'upstream/master' into next-v5.0 2023-05-25 10:52:46 +02: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
Hadrien Croubois
0f10efe232 Remove code in preparation for v5.0 (#4258) 
Co-authored-by: Ernesto García <ernestognw@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
 2023-05-19 22:48:05 +02:00
Francisco Giordano
8de6eba8a3 Merge branch 'master' into next-v5.0 2023-05-16 00:07:07 -03:00
Ernesto García
538655c3c0 Add reentrancy test cases for ERC4626 (#4197) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-05-03 09:35:48 +02:00
Pascal Marco Caversaccio
dd1265cb1d Improve ERC4626 test coverage (#4134) 
Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch>
 2023-04-12 17:33:50 -03:00
Francisco Giordano
e58c6d8ff4 Fix linter error 2023-03-02 19:47:41 -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
Hadrien Croubois
8b47e96af1 Add SafeERC20.forceApprove() (#4067) 2023-02-24 20:29:49 +00:00
Hadrien Croubois
d5581531de Add a "fees" section to the ERC4626 guide (#4054) 
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-02-24 11:49:10 -03:00
Hadrien Croubois
a6b8366980 Improve ERC4626 event coverage (#4072) 2023-02-23 17:06:47 -03:00
Hadrien Croubois
7b3e7b7055 Re-enable ERC4626 property test on empty vaults (#4068) 2023-02-22 15:23:06 -03:00
Hadrien Croubois
08d085f2c9 Fix ERC4906 compliance of ERC721URIStorage (#4055) 
Co-authored-by: Francisco <fg@frang.io>
 2023-02-17 13:43:23 -03:00
Hadrien Croubois
96a2297e15 Add IERC4906 interface and use in ERC721 (#4012) 
Co-authored-by: Francisco Giordano <fg@frang.io>
 2023-02-17 09:26:10 +00:00
Hadrien Croubois
d64d7aa5d1 ERC4626 inflation attack mitigation (#3979) 
Co-authored-by: Francisco <fg@frang.io>
 2023-02-17 10:08:31 +01:00
Hadrien Croubois
d5d9d4bd3d Simplify ERC721Wrapper.depositFor to save gas (#4048) 2023-02-16 23:35:43 -03:00
Ernesto García
2c711d0b05 Restrict ERC721Wrapper wrap by direct transfer (#4043) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-02-14 17:47:07 -03:00
Ernesto García
6259e13a0c Improve ERC721 Wrapper tests (#4039) 2023-02-09 22:36:14 +01:00
Hadrien Croubois
790cc5b65a Add timestamp based governor with EIP-6372 and EIP-5805 (#3934) 
Co-authored-by: Francisco Giordano <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
Co-authored-by: Francisco <frangio.1@gmail.com>
 2023-02-09 22:33:55 +01:00
Ernesto García
94cd8ef12e Add ERC721 Wrapper (#3863) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-02-09 13:43:34 -06:00
Hadrien Croubois
5b027e517e Add missing await in tests (#4037) 2023-02-08 21:03:27 +00:00
Hadrien Croubois
d625cb45ea Include EIP-5267 discovery in EIP-712 (#3969) 
Co-authored-by: Francisco <frangio.1@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
 2023-02-08 15:53:57 +01:00
JulissaDantes
e919d96ff2 Add ERC1155.totalSupply that returns overall supply count (#3962) 2023-01-25 21:39:02 +01:00
Hadrien Croubois
147dc89054 Merge branch 'master' into next-v5.0 2023-01-14 18:51:03 -03:00
Hadrien Croubois
7c6e289782 Prepare tests for hardhat-exposed transition (#3930) 
Co-authored-by: Francisco <frangio.1@gmail.com>
 2023-01-12 09:51:29 +01:00
JulissaDantes
d210847e28 Fix ERC20._update (#3921) 
Co-authored-by: Francisco <frangio.1@gmail.com>
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-01-10 17:21:35 -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
a28aafdc85 Use Prettier for JS files (#3913) 
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
 2023-01-04 15:03:40 +01:00
Hadrien Croubois
c1d9da4052 Use hardhat-exposed to reduce the need for mocks (#3666) 
Co-authored-by: Francisco <fg@frang.io>
 2023-01-03 14:38:13 +00:00
Francisco
2336bd3e8e Simplify ESLint config (#3903) 2022-12-29 17:08:12 -03:00
Francisco Giordano
9cbe8b340c Merge branch 'master' into next-v5.0 2022-12-19 18:17:33 -03:00
JulissaDantes
3c80a42866 Remove hooks from ERC20 (#3838) 
Co-authored-by: Francisco <frangio.1@gmail.com>
 2022-12-14 16:43:45 -03:00