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.

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

Use the inherited EIP712 name in the Governor contract #4741

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions contracts/governance/Governor.sol
Expand Up @@ -44,7 +44,6 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
}

bytes32 private constant ALL_PROPOSAL_STATES_BITMAP = bytes32((2 ** (uint8(type(ProposalState).max) + 1)) - 1);
string private _name;

mapping(uint256 proposalId => ProposalCore) private _proposals;

Expand Down Expand Up @@ -72,9 +71,7 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
/**
* @dev Sets the value for {name} and {version}
*/
constructor(string memory name_) EIP712(name_, version()) {
_name = name_;
}
constructor(string memory name_) EIP712(name_, version()) {}

/**
* @dev Function to receive ETH that will be handled by the governor (disabled if executor is a third party contract)
Expand All @@ -99,7 +96,7 @@ abstract contract Governor is Context, ERC165, EIP712, Nonces, IGovernor, IERC72
* @dev See {IGovernor-name}.
*/
function name() public view virtual returns (string memory) {
return _name;
return _EIP712Name();
}

/**
Expand Down