Skip to content

feat(Governance): Restrict Core Governance To Humans #4

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

Open
JayWelsh wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

feat(Governance): Restrict Core Governance To Humans #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 12 additions & 1 deletion contracts/Governance.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ pragma experimental ABIEncoderV2;
import { IERC20 } from "openzeppelin-solidity/contracts/token/ERC20/IERC20.sol";
import { SafeMath } from "openzeppelin-solidity/contracts/math/SafeMath.sol";

import { HumanityRegistry } from "./HumanityRegistry.sol";
import { Void } from "./Void.sol";

/**
Expand Down Expand Up @@ -39,6 +40,7 @@ contract Governance {

uint public proposalFee;
IERC20 public token;
HumanityRegistry public HumanityRegistry;
Void public void;

Proposal[] public proposals;
Expand All @@ -55,13 +57,15 @@ contract Governance {
// Voter => Withdraw timestamp
mapping (address => uint) public withdrawTimes;

constructor(IERC20 _token, uint _initialProposalFee) public {
constructor(IERC20 _token, uint _initialProposalFee, HumanityRegistry _humanityRegistry) public {
token = _token;
proposalFee = _initialProposalFee;
HumanityRegistry = _humanityRegistry;
void = new Void();
}

function deposit(uint amount) public {
require(HumanityRegistry.isHuman(msg.sender), "Governance::deposit: You must be a Human to make deposits to Governance");
require(token.transferFrom(msg.sender, address(this), amount), "Governance::deposit: Transfer failed");
deposits[msg.sender] = deposits[msg.sender].add(amount);
}
Expand All @@ -73,10 +77,12 @@ contract Governance {
}

function propose(address target, bytes memory data) public returns (uint) {
require(HumanityRegistry.isHuman(msg.sender), "Governance::propose: You must be a Human to make a Governance proposal");
return proposeWithFeeRecipient(msg.sender, target, data);
}

function proposeWithFeeRecipient(address feeRecipient, address target, bytes memory data) public returns (uint) {
require(HumanityRegistry.isHuman(msg.sender), "Governance::proposeWithFeeRecipient: You must be a Human to make a Governance proposal");
require(msg.sender != address(this) && target != address(token), "Governance::proposeWithFeeRecipient: Invalid proposal");
require(token.transferFrom(msg.sender, address(this), proposalFee), "Governance::proposeWithFeeRecipient: Transfer failed");

Expand All @@ -100,8 +106,10 @@ contract Governance {
}

function voteYes(uint proposalId) public {
require(HumanityRegistry.isHuman(msg.sender), "Governance::voteYes: You must be a Human to vote");
Proposal storage proposal = proposals[proposalId];
require(time() <= proposal.startTime.add(OPEN_VOTE_PERIOD), "Governance::voteYes: Proposal is no longer accepting yes votes");
require(noVotes[proposalId][msg.sender] == 0, "Governance::voteYes: Human has already voted on the opposite position");

uint proposalEndTime = proposal.startTime.add(TOTAL_VOTE_PERIOD);
if (proposalEndTime > withdrawTimes[msg.sender]) withdrawTimes[msg.sender] = proposalEndTime;
Expand All @@ -114,8 +122,10 @@ contract Governance {
}

function voteNo(uint proposalId) public {
require(HumanityRegistry.isHuman(msg.sender), "Governance::voteNo: You must be a Human to vote");
Proposal storage proposal = proposals[proposalId];
require(proposal.result == Result.Pending, "Governance::voteNo: Proposal is already finalized");
require(yesVotes[proposalId][msg.sender] == 0, "Governance::voteNo: Human has already voted on the opposite position");

uint proposalEndTime = proposal.startTime.add(TOTAL_VOTE_PERIOD);
uint _time = time();
Expand Down Expand Up @@ -153,6 +163,7 @@ contract Governance {
}

function finalize(uint proposalId) public {
require(HumanityRegistry.isHuman(msg.sender), "Governance::vote: You need to be a Human to finalise a proposal");
Proposal storage proposal = proposals[proposalId];
require(proposal.result == Result.Pending, "Governance::finalize: Proposal is already finalized");
uint _time = time();
Expand Down