Merge branch '000-snt-voting-dapp' of https://github.com/status-im/contracts into 000-snt-voting-dapp
This commit is contained in:
commit
da4306b5e1
|
@ -51,7 +51,7 @@ contract ProposalManager is Controlled {
|
||||||
{
|
{
|
||||||
trustNet = _trustNet;
|
trustNet = _trustNet;
|
||||||
token = _token;
|
token = _token;
|
||||||
|
tabulationBlockDelay = 7 days;
|
||||||
quorumPercentage = 50;
|
quorumPercentage = 50;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -155,6 +155,13 @@ contract ProposalManager is Controlled {
|
||||||
quorumPercentage = _percentage;
|
quorumPercentage = _percentage;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setTabulationBlockDelay(uint256 _tabulationBlockDelay)
|
||||||
|
public
|
||||||
|
onlyController
|
||||||
|
{
|
||||||
|
tabulationBlockDelay = _tabulationBlockDelay;
|
||||||
|
}
|
||||||
|
|
||||||
function hasVotesRecorded(uint256 _proposalId)
|
function hasVotesRecorded(uint256 _proposalId)
|
||||||
external
|
external
|
||||||
view
|
view
|
||||||
|
|
Loading…
Reference in New Issue