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.

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

feat: implement wonder votes #4

Merged
merged 6 commits into from
Dec 20, 2023
Merged

feat: implement wonder votes #4

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7719cd
feat: add smart and partial delegation
0xRaccoon Dec 18, 2023
d7d9aa0
fix: add proposalType validity check
0xRaccoon Dec 18, 2023
a041f0c
fix: use uint256 type for weights
0xRaccoon Dec 19, 2023
674f2f2
feat: implement WonderVotes in abstract WonderERC20Votes
0xRaccoon Dec 19, 2023
dcfa5f4
Merge branch 'dev' of github-defi:defi-wonderland/wonderland-governoo…
0xRaccoon Dec 20, 2023
7cbc6fd
fix: docs
0xRaccoon Dec 20, 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
20 changes: 12 additions & 8 deletions solidity/contracts/token/ERC20/extensions/WonderERC20Votes.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
pragma solidity ^0.8.20;

import {ERC20} from '@openzeppelin/contracts/token/ERC20/ERC20.sol';
import {Votes} from '@openzeppelin/contracts/governance/utils/Votes.sol';
import {Checkpoints} from '@openzeppelin/contracts/utils/structs/Checkpoints.sol';
import {WonderVotes} from 'contracts/governance/utils/WonderVotes.sol';

/**
* @dev Extension of ERC20 to support Compound-like voting and delegation. This version is more generic than Compound's,
Expand All @@ -20,7 +20,7 @@ import {Checkpoints} from '@openzeppelin/contracts/utils/structs/Checkpoints.sol
* By default, token balance does not account for voting power. This makes transfers cheaper. The downside is that it
* requires users to delegate to themselves in order to activate checkpoints and have their voting power tracked.
*/
abstract contract WonderERC20Votes is ERC20, Votes {
abstract contract WonderERC20Votes is ERC20, WonderVotes {
/**
* @dev Total supply cap has been exceeded, introducing a risk of votes overflowing.
*/
Expand Down Expand Up @@ -68,16 +68,20 @@ abstract contract WonderERC20Votes is ERC20, Votes {
}

/**
* @dev Get number of checkpoints for `account`.
* @dev Get number of checkpoints for `account` given a `proposalType`.
*/
function numCheckpoints(address account) public view virtual returns (uint32) {
return _numCheckpoints(account);
function numCheckpoints(address account, uint8 proposalType) public view virtual returns (uint32) {
return _numCheckpoints(account, proposalType);
}

/**
* @dev Get the `pos`-th checkpoint for `account`.
* @dev Get the `pos`-th checkpoint for `account` given a `proposalType`.
*/
function checkpoints(address account, uint32 pos) public view virtual returns (Checkpoints.Checkpoint208 memory) {
return _checkpoints(account, pos);
function checkpoints(
address account,
uint8 proposalType,
uint32 pos
) public view virtual returns (Checkpoints.Checkpoint208 memory) {
return _checkpoints(account, proposalType, pos);
}
}
Loading