Skip to content

Use ERC721Holder & ERC1155Holder in the TimelockController #4284

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

Merged
frangio merged 7 commits into from
Jun 15, 2023
Merged

Use ERC721Holder & ERC1155Holder in the TimelockController #4284

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
239dbf9
use ERC721Receiver and ERC1155Receiver in TimelockController
Amxx May 26, 2023
9c06590
use ERC721Receiver and ERC1155Receiver in Governor
Amxx May 26, 2023
64ad8cd
Apply suggestions from code review
Amxx May 26, 2023
f147673
revert changes to the governor
Amxx Jun 14, 2023
96525c1
lint
frangio Jun 14, 2023
e0611a7
Merge branch 'next-v5.0' into refactro/governor-is-erc721-holder
Amxx Jun 15, 2023
e2cf54a
Merge branch 'master' into refactro/governor-is-erc721-holder
Amxx Jun 15, 2023
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
Merge branch 'master' into refactro/governor-is-erc721-holder
  • Loading branch information
@Amxx
Amxx authored Jun 15, 2023
commit e2cf54af6c20b5f457e4a5e688e28cd4d94368d2
1 change: 1 addition & 0 deletions contracts/governance/TimelockController.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pragma solidity ^0.8.19;
import "../access/AccessControl.sol";
import "../token/ERC721/utils/ERC721Holder.sol";
import "../token/ERC1155/utils/ERC1155Holder.sol";
import "../utils/Address.sol";

/**
* @dev Contract module which acts as a timelocked controller. When set as the
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.