-
Notifications
You must be signed in to change notification settings - Fork 11.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix doc MyGovernor example doesn't compile (#4282)
Co-authored-by: Francisco Giordano <fg@frang.io>
- Loading branch information
Showing
9 changed files
with
196 additions
and
208 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.2; | ||
|
||
import "../../../governance/Governor.sol"; | ||
import "../../../governance/compatibility/GovernorCompatibilityBravo.sol"; | ||
import "../../../governance/extensions/GovernorVotes.sol"; | ||
import "../../../governance/extensions/GovernorVotesQuorumFraction.sol"; | ||
import "../../../governance/extensions/GovernorTimelockControl.sol"; | ||
|
||
contract MyGovernor is | ||
Governor, | ||
GovernorCompatibilityBravo, | ||
GovernorVotes, | ||
GovernorVotesQuorumFraction, | ||
GovernorTimelockControl | ||
{ | ||
constructor( | ||
IVotes _token, | ||
TimelockController _timelock | ||
) Governor("MyGovernor") GovernorVotes(_token) GovernorVotesQuorumFraction(4) GovernorTimelockControl(_timelock) {} | ||
|
||
function votingDelay() public pure override returns (uint256) { | ||
return 7200; // 1 day | ||
} | ||
|
||
function votingPeriod() public pure override returns (uint256) { | ||
return 50400; // 1 week | ||
} | ||
|
||
function proposalThreshold() public pure override returns (uint256) { | ||
return 0; | ||
} | ||
|
||
// The functions below are overrides required by Solidity. | ||
|
||
function state( | ||
uint256 proposalId | ||
) public view override(Governor, IGovernor, GovernorTimelockControl) returns (ProposalState) { | ||
return super.state(proposalId); | ||
} | ||
|
||
function propose( | ||
address[] memory targets, | ||
uint256[] memory values, | ||
bytes[] memory calldatas, | ||
string memory description | ||
) public override(Governor, GovernorCompatibilityBravo, IGovernor) returns (uint256) { | ||
return super.propose(targets, values, calldatas, description); | ||
} | ||
|
||
function cancel( | ||
address[] memory targets, | ||
uint256[] memory values, | ||
bytes[] memory calldatas, | ||
bytes32 descriptionHash | ||
) public override(Governor, GovernorCompatibilityBravo, IGovernor) returns (uint256) { | ||
return super.cancel(targets, values, calldatas, descriptionHash); | ||
} | ||
|
||
function _execute( | ||
uint256 proposalId, | ||
address[] memory targets, | ||
uint256[] memory values, | ||
bytes[] memory calldatas, | ||
bytes32 descriptionHash | ||
) internal override(Governor, GovernorTimelockControl) { | ||
super._execute(proposalId, targets, values, calldatas, descriptionHash); | ||
} | ||
|
||
function _cancel( | ||
address[] memory targets, | ||
uint256[] memory values, | ||
bytes[] memory calldatas, | ||
bytes32 descriptionHash | ||
) internal override(Governor, GovernorTimelockControl) returns (uint256) { | ||
return super._cancel(targets, values, calldatas, descriptionHash); | ||
} | ||
|
||
function _executor() internal view override(Governor, GovernorTimelockControl) returns (address) { | ||
return super._executor(); | ||
} | ||
|
||
function supportsInterface( | ||
bytes4 interfaceId | ||
) public view override(Governor, IERC165, GovernorTimelockControl) returns (bool) { | ||
return super.supportsInterface(interfaceId); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.2; | ||
|
||
import "../../../token/ERC20/ERC20.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Permit.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Votes.sol"; | ||
|
||
contract MyToken is ERC20, ERC20Permit, ERC20Votes { | ||
constructor() ERC20("MyToken", "MTK") ERC20Permit("MyToken") {} | ||
|
||
// The functions below are overrides required by Solidity. | ||
|
||
function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._afterTokenTransfer(from, to, amount); | ||
} | ||
|
||
function _mint(address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._mint(to, amount); | ||
} | ||
|
||
function _burn(address account, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._burn(account, amount); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.2; | ||
|
||
import "../../../token/ERC20/ERC20.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Permit.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Votes.sol"; | ||
|
||
contract MyTokenTimestampBased is ERC20, ERC20Permit, ERC20Votes { | ||
constructor() ERC20("MyTokenTimestampBased", "MTK") ERC20Permit("MyTokenTimestampBased") {} | ||
|
||
// Overrides IERC6372 functions to make the token & governor timestamp-based | ||
|
||
function clock() public view override returns (uint48) { | ||
return uint48(block.timestamp); | ||
} | ||
|
||
// solhint-disable-next-line func-name-mixedcase | ||
function CLOCK_MODE() public pure override returns (string memory) { | ||
return "mode=timestamp"; | ||
} | ||
|
||
// The functions below are overrides required by Solidity. | ||
|
||
function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._afterTokenTransfer(from, to, amount); | ||
} | ||
|
||
function _mint(address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._mint(to, amount); | ||
} | ||
|
||
function _burn(address account, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._burn(account, amount); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
// SPDX-License-Identifier: MIT | ||
pragma solidity ^0.8.2; | ||
|
||
import "../../../token/ERC20/ERC20.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Permit.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Votes.sol"; | ||
import "../../../token/ERC20/extensions/ERC20Wrapper.sol"; | ||
|
||
contract MyTokenWrapped is ERC20, ERC20Permit, ERC20Votes, ERC20Wrapper { | ||
constructor( | ||
IERC20 wrappedToken | ||
) ERC20("MyTokenWrapped", "MTK") ERC20Permit("MyTokenWrapped") ERC20Wrapper(wrappedToken) {} | ||
|
||
// The functions below are overrides required by Solidity. | ||
|
||
function decimals() public pure override(ERC20, ERC20Wrapper) returns (uint8) { | ||
return 18; | ||
} | ||
|
||
function _afterTokenTransfer(address from, address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._afterTokenTransfer(from, to, amount); | ||
} | ||
|
||
function _mint(address to, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._mint(to, amount); | ||
} | ||
|
||
function _burn(address account, uint256 amount) internal override(ERC20, ERC20Votes) { | ||
super._burn(account, amount); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.