Skip to content

[next-v5.0] Refactor voting, adding a Nonce contract #3638

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

Closed
Amxx wants to merge 12 commits into from
Closed

[next-v5.0] Refactor voting, adding a Nonce contract #3638

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3bf5a53
refactor voting, adding a Nonce contract
Amxx Jun 13, 2022
ceca7a5
fix lint
Amxx Jun 13, 2022
40f414b
use EIP5805
Amxx Oct 31, 2022
f819402
Solve rebase conflicts
JulissaDantes Nov 8, 2022
3c3512a
fix lint
JulissaDantes Nov 8, 2022
b866bcc
fix codespell check
JulissaDantes Nov 8, 2022
5c9bcf0
Update imported file name
JulissaDantes Nov 9, 2022
74ba556
update test
JulissaDantes Nov 10, 2022
d5b561c
update test
JulissaDantes Nov 10, 2022
16d8e49
Update changelog
JulissaDantes Nov 11, 2022
918eeb9
Merge branch 'next-v5.0' into refactor/ERC20Votes
JulissaDantes Nov 11, 2022
c6c052f
Add tests for nonces contract
JulissaDantes Nov 11, 2022
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
fix codespell check
  • Loading branch information
@JulissaDantes
JulissaDantes committed Nov 10, 2022
commit b866bcc63fc4f1e73dcd0d6c409ac3beea9d37df
4 changes: 2 additions & 2 deletions contracts/governance/utils/EIP5805.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ abstract contract EIP5805 is IEIP5805, Context, EIP712 {
mapping(address => Counters.Counter) private _nonces;

/**
* @dev Return the current timestamp, this can be overriden to use `block.timestamp` or any other mechanism
* @dev Return the current timestamp, this can be overridden to use `block.timestamp` or any other mechanism
*/
function clock() public view virtual override returns (uint256) {
return block.number;
Expand All @@ -62,7 +62,7 @@ abstract contract EIP5805 is IEIP5805, Context, EIP712 {
*/
function getPastVotes(address account, uint256 timepoint) public view virtual override returns (uint256) {
require(timepoint < clock(), "Checkpoints: invalid past lookup");
// TODO: optimisitc lookup
// TODO: optimistic lookup
return _delegateCheckpoints[account].upperLookup(SafeCast.toUint32(timepoint));
}

Expand Down
15 changes: 12 additions & 3 deletions contracts/token/ERC20/extensions/ERC20Votes.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

pragma solidity ^0.8.0;

import "../ERC20.sol";
import "../../../governance/utils/EIP5805.sol";
import "./draft-ERC20Permit.sol";
import "../../../governance/utils/Votes.sol";

/**
* @dev Extension of ERC20 to support Compound-like voting and delegation. This version is more generic than Compound's,
Expand All @@ -21,7 +21,16 @@ import "../../../governance/utils/EIP5805.sol";
*
* _Available since v4.2._
*/
abstract contract ERC20Votes is ERC20, EIP5805 {
abstract contract ERC20Votes is Votes, ERC20Permit {
// solhint-disable-next-line func-name-mixedcase
function DOMAIN_SEPARATOR() public view virtual override(ERC20Permit, EIP712) returns (bytes32) {
return super.DOMAIN_SEPARATOR();
}

function nonces(address owner) public view virtual override(ERC20Permit, Nonces) returns (uint256) {
return super.nonces(owner);
}

function _mint(address account, uint256 amount) internal virtual override {
require(totalSupply() + amount <= _maxSupply(), "ERC20Votes: total supply risks overflowing votes");
super._mint(account, amount);
Expand Down