Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp

This commit is contained in:
Richard Ramos 2018-06-22 16:26:47 -04:00
commit da4306b5e1
1 changed files with 8 additions and 1 deletions

View File

@ -51,7 +51,7 @@ contract ProposalManager is Controlled {
{
trustNet = _trustNet;
token = _token;
tabulationBlockDelay = 7 days;
quorumPercentage = 50;
}
@ -154,6 +154,13 @@ contract ProposalManager is Controlled {
require(_percentage > 0 && _percentage <= 100);
quorumPercentage = _percentage;
}
function setTabulationBlockDelay(uint256 _tabulationBlockDelay)
public
onlyController
{
tabulationBlockDelay = _tabulationBlockDelay;
}
function hasVotesRecorded(uint256 _proposalId)
external