4b9500cf25
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into certora/erc20
3 years ago
a35ad6dfc3
wrapper and timelockController cleaning
3 years ago
140f019155
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
3 years ago
6895946f41
updated rules
3 years ago
76eee35971
Improve revert message in Governor ( #3275 )
...
* Fixed typo
* fix testing and adding changelog
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
3 years ago
bfff03c0d2
add missing PR link in Changelog
3 years ago
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>
3 years ago
5153c462d5
wrapper counterexample to check
3 years ago
8318470cca
flashMint cleaning
3 years ago
74c9130a59
typo fixed ( #3264 )
3 years ago
15d5174139
Fix minor typo in CONTRIBUTING.md. ( #3284 )
3 years ago
05077f70f1
Update actions/cache action to v3 ( #3277 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
faf5820f03
Fix many spelling errors ( #3274 )
3 years ago
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>
3 years ago
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
3 years ago
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>
3 years ago
98716177ae
Inherit ERC20Wrapper decimals from the underlying ( #3259 )
3 years ago
89f9878ba2
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
3 years ago
6c5d33ba22
run scripts
3 years ago
8d9ab176d7
Timelock hash bug, example for Alex
3 years ago
62d60a5890
Timelock, erc20Wrapper and erc20FlashMint verification
3 years ago
52eeebecda
spelling fix
3 years ago
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>
3 years ago
7caa9bbb2c
TimelockController wating for hash fix
3 years ago
8372b4f923
Update Hardhat to latest ( #3260 )
3 years ago
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>
3 years ago
c72281ea45
docs(erc1155): correct ERC1155Holder.sol import ( #3250 )
3 years ago
2be84e627b
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
3 years ago
f2a311dc4a
Make Votes._getVotingUnits view ( #3225 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
3 years ago
8b162e39b5
Add a canceller role to the TimelockController ( #3165 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
3 years ago
62eb4568be
Optimize ERC721 _isApprovedOrOwner function ( #3248 )
3 years ago
1900c86c99
removed unnecessary harness from the first iteration
3 years ago
f8bfa560e9
Use _spendAllowance in ERC20FlashMint ( #3226 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
3 years ago
56e4ae9f4a
Merge branch 'certora/erc20' of github.com:Certora/openzeppelin-contracts into remotes/origin/certora/erc20
3 years ago
212221d6ff
Add mention of OpenZeppelin Defender in readme
3 years ago
3cb87abec1
removed flags for erc20Votes script
3 years ago
b3845e43d8
Merge branch 'master' of github.com:Certora/openzeppelin-contracts
3 years ago
61fa061ecf
erc20votes pointers workaround and preset
3 years ago
c239e1af8d
Fix typo ( #3241 )
...
Fix camelcase of 'lastvalue' to 'lastValue'
3 years ago
f590fcdfe9
Fix typo in Proxy.sol
3 years ago
ef8013ef79
sanity for TimelockController and Votes
3 years ago
9bded169e8
Update lockfile ( #3229 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
7ab95baab8
Merge branch 'OpenZeppelin:master' into certora/erc20
3 years ago
dc739dcbe3
Update actions/checkout action to v3 ( #3234 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
fd07cc6290
Extend Governor with parameterized votes ( #3043 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com>
3 years ago
99864fd2da
Merge branch 'OpenZeppelin:master' into certora/erc20
3 years ago
1c3b17826e
Merge branch 'OpenZeppelin:master' into master
3 years ago
f9d9279320
Update actions/setup-node action to v3 ( #3220 )
...
Co-authored-by: Renovate Bot <bot@renovateapp.com>
3 years ago
abdb20a6bd
Change dependency source to work around Truffle limitation ( #3218 )
3 years ago
3e74681e77
Read allowance from overridable function in increase/decrease ( #3213 )
3 years ago
Aleksander Kryukov
Nick Armstrong
Mihir Wadekar
Hadrien Croubois
Ashwin Yardi
gh3sthauss
GitHubPang
renovate[bot]
Pandapip1
Wias Liaw
Francisco Giordano
Pascal Marco Caversaccio
Vuong Tru
Amirhossein Banavi
Ben
Sameer Arora
Michael D. George
Ben DiFrancesco
JulissaDantes