|
|
b29e573383
|
rename from → previousOwner
|
2023-07-13 16:14:57 +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 |
|
|
|
10815081f7
|
Lint
|
2023-07-12 21:09:18 -06:00 |
|
|
|
9ba012005f
|
Format _increaseBalance NatSpec
|
2023-07-12 20:28:50 -06:00 |
|
|
|
4516803058
|
make the safe function without a data field non virtual
|
2023-07-12 17:15:48 +02:00 |
|
|
|
e4b0e725df
|
use whenNotPaused in ERC721Pausable
|
2023-07-12 16:56:07 +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 |
|
|
|
5ab254cf95
|
lint
|
2023-07-07 16:13:17 +02:00 |
|
|
|
0bb98cb8c6
|
Merge branch 'master' into feature/Governor-storage
|
2023-07-07 16:11:40 +02:00 |
|
|
|
7ccea54dc1
|
Add back IGovernor to docs (#4421)
|
2023-07-06 18:33:38 -03:00 |
|
|
|
6bf68a41d1
|
Remove "available since" comments (#4424)
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
|
2023-07-06 10:00:34 +02:00 |
|
|
|
3ff9b42ff5
|
Remove retyped and renamed storage layout annotations (#4423)
|
2023-07-05 18:38:27 -03:00 |
|
|
|
562ddf566a
|
implement hybrid _update
|
2023-07-05 18:45:42 +02:00 |
|
|
|
63bfab1a0c
|
Enable ERC-1271 signature checks in Governor castVoteBySig (#4418)
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
|
2023-07-05 15:11:29 +02:00 |
|
|
|
e3adf91e50
|
Add state getter in TimelockController using OperationState enum (#4358)
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Ernesto García <ernestognw@gmail.com>
|
2023-07-04 15:23:44 -03:00 |
|
|
|
6e21422737
|
Add Governor signature nonces (#4378)
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: Sergei Tikhomirov <sergey.s.tikhomirov@gmail.com>
Co-authored-by: Renan Souza <renan.rodrigues.souza1@gmail.com>
|
2023-07-03 22:29:30 +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 |
|
|
|
c7303ec2ae
|
fix lint
|
2023-07-03 09:37:53 +02:00 |
|
|
|
1cc7f54ab5
|
Merge remote-tracking branch 'upstream' into refactor/erc721-update-fnPointer
|
2023-07-03 09:35:35 +02:00 |
|
|
|
06861dce54
|
Update docs for SafeERC20.forceApprove (#4231)
|
2023-07-01 01:36:10 -03:00 |
|
|
|
37270eb08a
|
Add security considerations to ERC2771Forwarder (#4406)
|
2023-06-30 16:52:45 -03:00 |
|
|
|
621b867b1a
|
Imrove BitMaps documentation (#4400)
Co-authored-by: Francisco <fg@frang.io>
Co-authored-by: ernestognw <ernestognw@gmail.com>
|
2023-06-30 13:48:37 -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 |
|
|
|
023894deef
|
Add ERC2771Forwarder as an enhanced successor to MinimalForwarder (#4346)
Co-authored-by: Francisco <fg@frang.io>
|
2023-06-29 13:00:35 -03:00 |
|
|
|
8cab922347
|
Rename ERC1155InsufficientApprovalForAll to ERC1155MissingApprovalForAll (#4381)
|
2023-06-26 14:20:01 +02:00 |
|
|
|
c44c220254
|
Update Ownable2Step docs (#4384)
Co-authored-by: Francisco <fg@frang.io>
|
2023-06-23 19:37:27 -03:00 |
|
|
|
da89c438f1
|
Pack Governor's ProposalCore into a single slot (#4268)
Co-authored-by: Ernesto García <ernestognw@gmail.com>
Co-authored-by: Francisco <fg@frang.io>
|
2023-06-23 13:05:22 -03:00 |
|
|
|
a7a94c7746
|
Update comment to reflect code logic in Ownable.sol (#4369)
|
2023-06-22 16:34:53 -06:00 |
|
|
|
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 |
|
|
|
e2fdbacd63
|
fix lint
|
2023-06-21 22:09:57 +02: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 |
|
|
|
6ddacdbde8
|
Cleanup timelockId on execution for gas refund (#4118)
Co-authored-by: Francisco <fg@frang.io>
|
2023-06-20 16:38:03 -03:00 |
|
|
|
b66c77a1fc
|
Merge branch 'release-v4.9' into master (#4373)
|
2023-06-20 13:06:56 -03:00 |
|
|
|
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 |
|