status-im
/
contracts
mirror of https://github.com/status-im/contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compile errors

This commit is contained in:
Ricardo Guilherme Schmidt 2018-03-17 13:50:33 -03:00
parent 5747049b9c
commit 3c40812a52
4 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/democracy/DelegationProxy.sol
View File

@ -1,7 +1,7 @@
pragma solidity ^0.4.17;
import "../token/MiniMeTokenInterface.sol";
import "./DelegateProxyInterface.sol";
import "./DelegationProxyInterface.sol";
/**
@ -9,7 +9,7 @@ import "./DelegateProxyInterface.sol";
* @author Ricardo Guilherme Schmidt (Status Research & Development GmbH)
* @dev Creates a delegation proxy layer for MiniMeTokenInterface.
*/
contract DelegationProxy is DelegateProxyInterface {
contract DelegationProxy is DelegationProxyInterface {
//default delegation proxy, being used when user didn't set any delegation at this level.
address public parentProxy;

35
contracts/democracy/ProposalManager.sol
View File

@ -1,11 +1,10 @@
pragma solidity ^0.4.17;
import "./TrustNetwork.sol";
import "./DelegationProxy.sol";
import "./ProposalExecutor.sol";
import "../token/MiniMeToken.sol";
import "./TrustNetworkInterface.sol";
import "./DelegationProxyInterface.sol";
import "../token/MiniMeTokenInterface.sol";
import "../common/Controlled.sol";
import "./ProposalExecutor.sol";
/**
* @title ProposalManager
@ -14,8 +13,8 @@ import "../common/Controlled.sol";
*/
contract ProposalManager is Controlled {
TrustNetwork public trustNet;
MiniMeToken public SNT;
TrustNetworkInterface public trustNet;
MiniMeTokenInterface public token;
uint256 public tabulationBlockDelay = 10000;
Proposal[] proposals;
@ -54,14 +53,14 @@ contract ProposalManager is Controlled {
Veto
}
function ProposalManager(MiniMeToken _SNT, TrustNetwork _trustNet) public {
function ProposalManager(MiniMeTokenInterface _SNT, TrustNetworkInterface _trustNet) public {
trustNet = _trustNet;
SNT = _SNT;
token = _SNT;
}
function addProposal(bytes32 _topic, bytes32 _txHash, uint _stake) public returns (uint) {
require(_stake > 1000);
require(SNT.transferFrom(msg.sender, address(this), _stake));
require(token.transferFrom(msg.sender, address(this), _stake));
uint pos = proposals.length++;
Proposal storage p = proposals[pos];
@ -114,15 +113,15 @@ contract ProposalManager is Controlled {
proposal.tabulated[_delegator].vote = true;
Vote _vote = proposal.voteMap[_delegator];
if(_vote == Vote.Null) {
DelegationProxy voteDelegation;
DelegationProxy vetoDelegation;
DelegationProxyInterface voteDelegation;
DelegationProxyInterface vetoDelegation;
(voteDelegation, vetoDelegation) = trustNet.getTopic(proposal.topic);
address delegate = voteDelegation.delegationOfAt(_delegator, proposal.vetoBlockEnd);
_vote = proposal.voteMap[delegate];
}
if (_vote == Vote.Reject || _vote == Vote.Approve) {
proposal.results[uint8(_vote)] += MiniMeToken(SNT).balanceOfAt(_delegator, proposal.voteBlockEnd);
proposal.results[uint8(_vote)] += token.balanceOfAt(_delegator, proposal.voteBlockEnd);
}
}
@ -133,15 +132,15 @@ contract ProposalManager is Controlled {
proposal.tabulated[_delegator].veto = true;
Vote _vote = proposal.voteMap[_delegator];
if (_vote == Vote.Null) {
DelegationProxy voteDelegation;
DelegationProxy vetoDelegation;
DelegationProxyInterface voteDelegation;
DelegationProxyInterface vetoDelegation;
(voteDelegation, vetoDelegation) = trustNet.getTopic(proposal.topic);
address delegate = vetoDelegation.delegationOfAt(_delegator, proposal.vetoBlockEnd);
_vote = proposal.voteMap[delegate];
}
if (_vote == Vote.Veto) {
proposal.results[uint8(Vote.Veto)] += MiniMeToken(SNT).balanceOfAt(_delegator, proposal.vetoBlockEnd);
proposal.results[uint8(Vote.Veto)] += token.balanceOfAt(_delegator, proposal.vetoBlockEnd);
}
}
@ -150,7 +149,7 @@ contract ProposalManager is Controlled {
Proposal storage proposal = proposals[_proposal];
require(proposal.vetoBlockEnd + tabulationBlockDelay > block.number);
require(!proposal.approved);
uint256 totalTokens = MiniMeToken(SNT).totalSupplyAt(proposal.vetoBlockEnd);
uint256 totalTokens = token.totalSupplyAt(proposal.vetoBlockEnd);
uint256 approvals = proposal.results[uint8(Vote.Approve)];
uint256 veto = proposal.results[uint8(Vote.Veto)];
uint256 approvalQuorum = (totalTokens / 2);
@ -158,6 +157,6 @@ contract ProposalManager is Controlled {
require(veto < vetoQuorum);
require(approvals >= approvalQuorum);
proposal.approved = true;
require(SNT.transferFrom(address(this), proposal.staker, proposal.stake));
require(token.transferFrom(address(this), proposal.staker, proposal.stake));
}
}

9
contracts/democracy/TrustNetwork.sol
View File

@ -1,8 +1,9 @@
pragma solidity ^0.4.10;
import "../common/Controlled.sol";
import "./TrustNetworkInterface.sol";
import "./DelegationProxyFactory.sol";
import "./DelegationProxy.sol";
/**
* @title TrustNetwork
@ -10,7 +11,7 @@ import "./DelegationProxy.sol";
* Defines two contolled DelegationProxy chains: vote and veto chains.
* New layers need to be defined under a unique topic address topic, and all fall back to root topic (topic 0x0)
*/
contract TrustNetwork is Controlled {
contract TrustNetwork is TrustNetworkInterface, Controlled {
mapping (bytes32 => Topic) topics;
DelegationProxyFactory delegationFactory;
@ -39,7 +40,7 @@ contract TrustNetwork is Controlled {
topics[topicId] = newTopic(vote, veto);
}
function getTopic(bytes32 _topicId) public constant returns (DelegationProxy vote, DelegationProxy veto) {
function getTopic(bytes32 _topicId) public constant returns (DelegationProxyInterface vote, DelegationProxyInterface veto) {
Topic memory topic = topics[_topicId];
vote = topic.voteProxy;
veto = topic.vetoProxy;
@ -54,5 +55,7 @@ contract TrustNetwork is Controlled {
}

10
contracts/democracy/TrustNetworkInterface.sol Normal file
View File

@ -0,0 +1,10 @@
pragma solidity ^0.4.17;
import "./DelegationProxyInterface.sol";
contract TrustNetworkInterface {
function addTopic(bytes32 topicId, bytes32 parentTopic) public;
function getTopic(bytes32 _topicId) public constant returns (DelegationProxyInterface vote, DelegationProxyInterface veto);
}