d2832ca7a9
make ERC2981:royaltyInfo public ( #3305 )
2022-03-31 20:01:22 +02:00
2bd75a44bb
Fix release script to only release @openzeppelin/contracts
2022-03-30 23:15:27 -03:00
2a4ca65404
Update release script to stop publishing old openzeppelin-solidity package
2022-03-30 22:29:53 -03:00
92f07bae1b
typechecker error and skipped require bug
2022-03-30 17:12:30 -07:00
3f49408fb6
Move event definition at the top of IERC20, IERC777 and IERC1820 ( #3228 )
2022-03-30 12:36:37 -03:00
e7719ded56
Match IERC721 function order with EIP spec ( #3287 )
2022-03-30 12:34:17 -03:00
668a648bc6
Add utilities for CrossChain messaging ( #3183 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-30 11:41:04 -03:00
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
ae270b0d89
Align data location of interface with implementation ( #3295 )
...
Co-authored-by: chriseth <chris@ethereum.org >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-28 17:48:28 -03:00
4c74b2951d
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into
...
remotes/origin/certora/erc20
2022-03-28 12:07:21 -07:00
3f1ee39910
call trace error
2022-03-28 12:05:33 -07:00
e029096ca4
Add Initialized event ( #3294 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-28 15:36:30 -03:00
4b9500cf25
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into certora/erc20
2022-03-27 16:06:49 +01:00
a35ad6dfc3
wrapper and timelockController cleaning
2022-03-27 16:04:31 +01:00
140f019155
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
2022-03-25 12:57:21 -07:00
6895946f41
updated rules
2022-03-25 12:57:16 -07:00
76eee35971
Improve revert message in Governor ( #3275 )
...
* Fixed typo
* fix testing and adding changelog
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-03-25 11:02:15 +01:00
bfff03c0d2
add missing PR link in Changelog
2022-03-25 10:36:08 +01:00
76fca3aec8
Add ERC721 and ERC1155 receiver support in Governor, Timelock ( #3230 )
...
* add ERC721 and ERC1155 receiver support in Governor, Timelock and MinimalForwarder (#3174 )
* revert the nft receiver hooks from MinimalForwarder and linting updates
* add ERC165 support & simplify test
* add changelog entry
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-03-24 01:25:00 +01:00
5153c462d5
wrapper counterexample to check
2022-03-23 19:42:14 +00:00
8318470cca
flashMint cleaning
2022-03-23 19:12:16 +00:00
74c9130a59
typo fixed ( #3264 )
2022-03-23 15:31:25 +01:00
15d5174139
Fix minor typo in CONTRIBUTING.md. ( #3284 )
2022-03-23 09:21:33 +01:00
05077f70f1
Update actions/cache action to v3 ( #3277 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com >
2022-03-22 18:47:06 -03:00
faf5820f03
Fix many spelling errors ( #3274 )
2022-03-22 18:16:20 -03:00
0eba5112c8
Allow the re-initialization of contracts ( #3232 )
...
* allow re-initialization of contracts
* fix lint
* use a private function to avoid code duplication
* use oz-retyped-from syntax
* add documentation
* rephrase
* documentation
* Update contracts/proxy/utils/Initializable.sol
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* reinitialize test
* lint
* typos and style
* add note about relation between initializer and reinitializer
* lint
* set _initializing in the modifier
* remove unnecessary variable set
* rename _preventInitialize -> _disableInitializers
* rename preventInitialize -> disableInitializers
* test nested reinitializers in reverse order
* docs typos and style
* edit docs for consistency between initializer and reinitializer
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-22 18:06:29 +00:00
b13bdb0249
Add bytes32 to bytes32 enumerable map ( #3192 )
...
* feat(enumerablemap): add bytes32 to bytes32 map
* chore(changelog): edit CHANGELOG
* feat(enumerable map): edit struct visibility
2022-03-22 16:36:29 +01:00
c028c56965
Add changelog entry for #3259 ( #3281 )
...
* improve wrapper decimal support
* Update test/token/ERC20/extensions/ERC20Wrapper.test.js
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* add changelog entry
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-22 16:11:20 +01:00
98716177ae
Inherit ERC20Wrapper decimals from the underlying ( #3259 )
2022-03-22 09:55:49 +01:00
89f9878ba2
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
2022-03-21 11:13:36 -07:00
6c5d33ba22
run scripts
2022-03-21 11:13:24 -07:00
8d9ab176d7
Timelock hash bug, example for Alex
2022-03-21 17:58:21 +00:00
62d60a5890
Timelock, erc20Wrapper and erc20FlashMint verification
2022-03-20 22:36:48 +00:00
52eeebecda
spelling fix
2022-03-14 12:54:08 +01:00
6a5bbfc4cb
Refactor governor testing ( #3194 )
...
* starting a governor test refactor
* improve governor tests
* refactor compatibility tests using the governor helper
* improve governor helper
* improve governor helper
* refactor governor tests
* refactor testing
* fix testing (still TODO)
* fix tests
* fix tests
* fix spelling
* use different instances of GovernorHelper
* add vote with params support
* coverage
* simplify ERC165 helper
* remove unused proposal argument
* refactor setProposal
* lint
* refactor setProposal return values
* add a data default value
* improve proposal reconstruction and storage in helper
* proposal object refactoring
* lint
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-11 09:30:30 +01:00
7caa9bbb2c
TimelockController wating for hash fix
2022-03-11 00:29:03 +00:00
8372b4f923
Update Hardhat to latest ( #3260 )
2022-03-10 18:40:50 -03:00
cc1c18098c
Replace immutable with constant for _PERMIT_TYPEHASH ( #3196 )
...
* replace `immutable` with `constant` for _PERMIT_TYPEHASH
This commit is related to the following issue discussion: https://github.com/OpenZeppelin/contracts-wizard/issues/89#issuecomment-1042391318
Since Solidity version `0.6.12` the `keccak256` of string literals is treated specially and the hash is evaluated at compile time. Since the OpenZeppelin Wizard also uses `constant` for OpenZeppelin's AccessControl's roles declarations, it's good practice to make this consistent.
* Update CHANGELOG
* fix: ensure transpiler compatibility
* fix: fixing var-name-mixedcase
* prettier & lint check
Signed-off-by: Pascal Marco Caversaccio <pascal.caversaccio@hotmail.ch >
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-03-09 17:38:29 +01:00
c72281ea45
docs(erc1155): correct ERC1155Holder.sol import ( #3250 )
2022-03-09 09:32:46 +01:00
2be84e627b
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
2022-03-08 18:23:38 -08:00
f2a311dc4a
Make Votes._getVotingUnits view ( #3225 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-08 21:39:53 +00:00
8b162e39b5
Add a canceller role to the TimelockController ( #3165 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-08 18:28:20 -03:00
62eb4568be
Optimize ERC721 _isApprovedOrOwner function ( #3248 )
2022-03-08 18:18:56 -03:00
1900c86c99
removed unnecessary harness from the first iteration
2022-03-08 19:58:23 +00:00
f8bfa560e9
Use _spendAllowance in ERC20FlashMint ( #3226 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-03-08 19:34:24 +00:00
56e4ae9f4a
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
2022-03-08 11:29:12 -08:00
212221d6ff
Add mention of OpenZeppelin Defender in readme
2022-03-08 16:24:50 -03:00
3cb87abec1
removed flags for erc20Votes script
2022-03-08 19:20:55 +00:00
b3845e43d8
Merge branch 'master' of github.com:Certora/openzeppelin-contracts
2022-03-08 11:16:41 -08:00
61fa061ecf
erc20votes pointers workaround and preset
2022-03-08 16:38:11 +00:00
