Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable immutable forwarder in ERC2771Context #2917

Merged
merged 10 commits into from
Dec 28, 2021
Merged

Re-enable immutable forwarder in ERC2771Context #2917

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca4ceae
Re-enable immutable forwarder in ERC2771Context
Amxx Oct 18, 2021
1e53bba
0.8.8 → 0.8.9
Amxx Nov 8, 2021
c27c67f
Update contracts/metatx/ERC2771Context.sol
Amxx Nov 16, 2021
3ce2ad9
add changelog entry
Amxx Nov 17, 2021
fdd09db
Merge branch 'master' into feature/erc2771ForwarderImmutable
Amxx Nov 17, 2021
3af81da
fix merge
Amxx Nov 17, 2021
9b09f7c
Update CHANGELOG.md
frangio Nov 18, 2021
a4e175e
Merge branch 'master' into feature/erc2771ForwarderImmutable
Amxx Dec 14, 2021
ad98a24
use 0.8.9
frangio Dec 22, 2021
cf8972a
add unsafe-allow constructor
frangio Dec 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into feature/erc2771ForwarderImmutable
  • Loading branch information
@Amxx
Amxx committed Nov 17, 2021
commit fdd09db171fff0f26c8733c2f0125c8a65291ca2
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* `Ownable`: add an internal `_transferOwnership(address)`. ([#2568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2568))
* `AccessControl`: add internal `_grantRole(bytes32,address)` and `_revokeRole(bytes32,address)`. ([#2568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2568))
* `AccessControl`: mark `_setupRole(bytes32,address)` as deprecated in favor of `_grantRole(bytes32,address)`. ([#2568](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2568))
* `AccessControlEnumerable`: hook into `_grantRole(bytes32,address)` and `_revokeRole(bytes32,address)`. ([#2946](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2946))
* `EIP712`: cache `address(this)` to immutable storage to avoid potential issues if a vanilla contract is used in a delegatecall context. ([#2852](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/#2852))
* Add internal `_setApprovalForAll` to `ERC721` and `ERC1155`. ([#2834](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2834))
* `Governor`: shift vote start and end by one block to better match Compound's GovernorBravo and prevent voting at the Governor level if the voting snapshot is not ready. ([#2892](https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2892))
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.