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

Show file tree
Hide file tree
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
Next Next commit
Apply suggestions from code review 
Co-authored-by: Francisco <[email protected]>
  • Loading branch information
@Amxx @frangio
Amxx and frangio authored May 26, 2023
commit 64ad8cde4cba8c0f67e25497c4257e1bb6d59770
2 changes: 1 addition & 1 deletion contracts/governance/Governor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import "./IGovernor.sol";
*
* _Available since v4.3._
*/
abstract contract Governor is Context, ERC165, EIP712, IGovernor, ERC721Holder, ERC1155Holder {
abstract contract Governor is Context, ERC165, EIP712, ERC721Holder, ERC1155Holder, IGovernor {
using DoubleEndedQueue for DoubleEndedQueue.Bytes32Deque;

bytes32 public constant BALLOT_TYPEHASH = keccak256("Ballot(uint256 proposalId,uint8 support)");
Expand Down
2 changes: 1 addition & 1 deletion scripts/checks/inheritance-ordering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ for (const artifact of artifacts) {
const linearized = [];

for (const source in solcOutput.contracts) {
if (['contracts-exposed', 'contracts/mocks'].some(pattern => source.match(pattern))) {
if (['contracts-exposed/', 'contracts/mocks/'].some(pattern => source.startsWith(pattern))) {
continue;
}

Expand Down