c366de3626
Fix encoding of signature+calldata in GovernorCompatibilityBravo ( #3100 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-01-11 15:45:06 -03:00
80d8da0564
Do not reduce approval on transferFrom if current allowance is type(uint256).max ( #3085 )
...
* add feature request #3084
* Update contracts/token/ERC20/ERC20.sol
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* Add changelog note
* add documentation
* test unlimitted allowance and add ERC777 unlimitted allowance
* reference PR in changelog
* documentation IERC20 -> ERC20
* use asciidoc note syntax
* use asciidoc note syntax
* typo
* typos
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2022-01-11 00:08:33 +01:00
fd7c4ba8f0
Update pragma in utils/Address.sol to 0.8.1 ( #3098 )
2022-01-10 19:47:43 -03:00
8dd744fc18
Add missing reference to PR in changelog
2022-01-09 17:50:05 +01:00
a65c03bc0d
Implement Non Fungible Token Royalty (EIP2981) ( #3012 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2022-01-06 19:34:57 -03:00
a9f994f063
Reduce ERC20 allowance before triggering transfer ( #3056 )
...
* Reduce ERC20 allowance before triggering transfer
* adapt ERC777 to reduce allowance before transfer
* fix test for ERC777
* use smaller number to reduce balance
* simplify test description
* don't use deprecated expectEvents.inLogs
* fix test
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2021-12-31 09:17:12 +00:00
ef0273fde1
Add Base64 library to utils ( #2884 )
...
* Add Base64 library to utils
* Fix typo on Base64 padding
* Added documentation for Base64 and references from ERC1155 and ERC721
* Updated Changelog
* Fix typo in utilities doc
* use mstore8 to improve memory accesses
* use shorter strings with encodePacked
* do not use using-for syntax, for clarity
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-12-29 20:41:20 +01:00
fe38eae6cd
Re-enable immutable forwarder in ERC2771Context ( #2917 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-12-27 21:21:56 -03:00
4a9cc8b491
Merge branch 'release-v4.4'
2021-12-14 13:34:03 -03:00
6bd6b76d11
4.4.1
2021-12-14 13:14:39 -03:00
13a6ec753a
Remove bad date from changelog
2021-12-14 13:14:21 -03:00
b42b05311b
Add ERC721Votes for NFT-based governance ( #2944 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Hadrien Croubois <hadrien@openzeppelin.com >
2021-12-10 18:58:45 -03:00
553c8fdec7
Update initializer modifier to prevent reentrancy during initialization ( #3006 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
(cherry picked from commit 08840b9f8c
2021-12-10 13:10:17 -03:00
9a7e4a0112
Remove trailing whitespace
2021-12-10 13:09:46 -03:00
e141d8917a
Create v4.4.1 section in changelog
2021-12-10 13:04:03 -03:00
08840b9f8c
Update initializer modifier to prevent reentrancy during initialization ( #3006 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-12-10 13:02:35 -03:00
0c858e2071
Improve revert reason in ERC721 ( #2975 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-12-09 23:42:18 +00:00
4625192940
Fix changelog entry for GovernorPreventLateQuorum
2021-12-09 20:32:53 -03:00
a05312f1b7
fix changelog structure
2021-12-01 18:20:42 +01:00
abf6024faf
Add a governor module to protect against late quorum ( #2973 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-12-01 13:56:31 -03:00
6089f11c2f
Add a relay mechanism in the governor ( #2926 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-11-30 17:19:20 -03:00
7d17acfb2f
Merge branch 'release-v4.4'
2021-11-25 16:56:07 -03:00
4961a51cc7
4.4.0
2021-11-25 16:35:37 -03:00
6481b05e4f
Add changelog entry for deprecation of presets
2021-11-25 14:23:30 -03:00
f6db5c1f30
A function which returns the absolute value of a signed value ( #2984 )
...
* Add a function which returns the absolute (and obviously unsigned) value of a signed value.
* add changelog entry and fix lint
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2021-11-24 14:09:05 +01:00
a57e638f57
Improve GovernorTimelockControl.state() to detect direct cancel ( #2977 )
2021-11-18 09:53:05 -03:00
8b8ee57a1a
Make quorum behavior match GovernorBravo ( #2974 )
...
* Make quorum inclusive minimum in GovernorCompatibilityBravo
* add PR link
(cherry picked from commit a94cf0509f
2021-11-16 10:08:08 -03:00
a94cf0509f
Make quorum behavior match GovernorBravo ( #2974 )
...
* Make quorum inclusive minimum in GovernorCompatibilityBravo
* add PR link
2021-11-16 13:24:22 +01:00
70138680cf
Fix ERC1155 supply tracking ( #2956 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
(cherry picked from commit 4088540aef
2021-11-15 18:07:21 -03:00
3db4393b58
Fix link to #2849 in changelog
...
(cherry picked from commit 57630d2a64
2021-11-09 15:40:19 -03:00
57630d2a64
Fix link to #2849 in changelog
2021-11-09 15:39:58 -03:00
4088540aef
Fix ERC1155 supply tracking ( #2956 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-11-08 18:47:21 -03:00
6dab43c3a9
AccessControlEnumerable: Hook into the internal function ( #2946 )
...
* AccessControlEnumerable: Hook into the internal function
* add changelog entry
(cherry picked from commit 7579828180
2021-11-08 12:23:37 -03:00
7579828180
AccessControlEnumerable: Hook into the internal function ( #2946 )
...
* AccessControlEnumerable: Hook into the internal function
* add changelog entry
2021-11-08 12:22:13 -03:00
db58acead1
Fix changelog links
...
(cherry picked from commit 2b046d79e1
2021-10-27 18:19:35 -03:00
2b046d79e1
Fix changelog links
2021-10-27 18:14:06 -03:00
0a87a4e75b
4.4.0-rc.0
2021-10-20 17:21:04 -03:00
7fe5326c2d
Add changelog entries for #2849
2021-10-19 15:37:11 -03:00
b12af48a7d
Add Governor module for governance-settable parameters ( #2904 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-19 15:33:02 -03:00
88e4b69bfb
Add a VestingWallet ( #2748 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-18 12:47:37 -03:00
d244b81972
Add a MerkleProof.processProof utility function ( #2841 )
...
* Add a MerkleProof.processProof utility function
* Add changelog entry
* fix lint
* return index when processingProof
* fix lint
* fix test
* Apply suggestions from code review
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* improve documentation
* Apply suggestions from code review
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
* remove index - see discussion in the PR
* update changelog
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-14 11:50:35 +02:00
5b28259dac
#890 : Add ECDSA.toEthSignedMessageHash(bytes) for abritrary length message hashing ( #2865 )
...
* #890 : Add ECDSA#toEthSignedMessage for bytes type
* refactor
* add test, refactor
* select overloaded function explicitly
* use short test message string
* add changelog entry
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
2021-10-11 14:59:30 +02:00
efb5b0a28f
Extend PaymentSplitter to support ERC20 tokens ( #2858 )
...
* Add MultiPaymentSplitter
with ERC20 support on top of the existing PaymentSplitter
* consistency and linting
* Add MultiPaymentSplitter tests
* fix lint
* add changelog entry
* add MultiPaymentSplitter to documentation
* rework PaymentSplitter to include ERC20 support by default
* remove test file for MultiPaymentSplitter
* fix lint
* completelly split erc20 and token tracking
* address some PR comments
* add notice about rebasing tokens
* fix minor error in tests
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-07 16:17:10 +02:00
abeb0fbf5c
Delay the Pending state until strictly after proposal.voteStart ( #2892 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-06 19:29:57 -03:00
caba6b93ef
Add an internal _setApprovalForAll function (721 & 1155) ( #2834 )
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-06 13:48:18 +00:00
29eeb2828e
Fix EIP712 for delegatecalls ( #2852 )
...
Co-authored-by: Hadrien Croubois <hadrien.croubois@gmail.com >
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-10-06 10:24:46 -03:00
296223f876
Merge branch 'release-v4.3'
2021-09-15 10:41:50 -03:00
0c4de6721d
4.3.2
2021-09-14 18:06:39 -03:00
024cc50df4
Restrict upgrade to proxy context in UUPSUpgradeable
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
(cherry picked from commit 6241995ad3
2021-09-14 18:06:00 -03:00
6241995ad3
Restrict upgrade to proxy context in UUPSUpgradeable
...
Co-authored-by: Francisco Giordano <frangio.1@gmail.com >
2021-09-14 17:33:17 -03:00
