Merge be93462 into 74fff59

.solcover.js

@@ -1,3 +1,3 @@
 module.exports = {
-  skipFiles: ['FakeErc20.sol', 'Erc20.sol', 'SVDelegationV0101Aux.sol', 'SVDelegationV0102.sol', 'SVDelegationV0101.sol']
+  skipFiles: ['FakeErc20.sol', 'Erc20.sol', 'SVDelegationV0101Aux.sol', 'SVDelegationV0102.sol', 'SVDelegationV0101.sol', 'BBFarmAux.sol']
 }

_solDist/BBFarmAux.abi

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"bbFarm","type":"address"},{"name":"ballotId","type":"uint256"},{"name":"providedVoter","type":"address"}],"name":"getVotesFrom","outputs":[{"name":"ids","type":"uint256[]"},{"name":"votes","type":"bytes32[]"},{"name":"extras","type":"bytes[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"bbFarm","type":"address"},{"name":"ballotId","type":"uint256"}],"name":"getVotes","outputs":[{"name":"votes","type":"bytes32[]"},{"name":"voters","type":"address[]"},{"name":"extras","type":"bytes[]"}],"payable":false,"stateMutability":"view","type":"function"}]

_solDist/BBFarmAux.abi.json

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"bbFarm","type":"address"},{"name":"ballotId","type":"uint256"},{"name":"providedVoter","type":"address"}],"name":"getVotesFrom","outputs":[{"name":"ids","type":"uint256[]"},{"name":"votes","type":"bytes32[]"},{"name":"extras","type":"bytes[]"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"bbFarm","type":"address"},{"name":"ballotId","type":"uint256"}],"name":"getVotes","outputs":[{"name":"votes","type":"bytes32[]"},{"name":"voters","type":"address[]"},{"name":"extras","type":"bytes[]"}],"payable":false,"stateMutability":"view","type":"function"}]

_solDist/BBFarmAux.bin

@@ -0,0 +1 @@
+608060405234801561001057600080fd5b50610c01806100206000396000f3006080604052600436106100325763ffffffff60e060020a6000350416638f72630d8114610037578063eb9019d41461006f575b600080fd5b34801561004357600080fd5b50610057610052366004610868565b61009e565b60405161006693929190610a92565b60405180910390f35b34801561007b57600080fd5b5061008f61008a36600461082e565b61024e565b60405161006693929190610a50565b6060806060600080600080606060008b600160a060020a0316639115abf48c8c6040518363ffffffff1660e060020a0281526004016100de929190610ab7565b61014060405180830381600087803b1580156100f957600080fd5b505af115801561010d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525061013191908101906106f0565b50969d50969b505050891515945061014d93505050505761023f565b5060005b8581101561023f576040517f49330cb8000000000000000000000000000000000000000000000000000000008152600160a060020a038d16906349330cb8906101a0908e908590600401610ad2565b600060405180830381600087803b1580156101ba57600080fd5b505af11580156101ce573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101f691908101906107c9565b9095509093509150600160a060020a03808516908b1614156102375761021c89826103d7565b98506102288884610473565b975061023487836104ee565b96505b600101610151565b50505050505093509350939050565b606080606060008060006060600089600160a060020a0316639115abf48a60006040518363ffffffff1660e060020a02815260040161028e929190610ab7565b61014060405180830381600087803b1580156102a957600080fd5b505af11580156102bd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052506102e191908101906106f0565b50969c506000985050505050505050505b848110156103cb576040517f49330cb8000000000000000000000000000000000000000000000000000000008152600160a060020a038b16906349330cb890610341908c908590600401610ad2565b600060405180830381600087803b15801561035b57600080fd5b505af115801561036f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261039791908101906107c9565b90955090935091506103a98884610473565b97506103b58785610573565b96506103c186836104ee565b95506001016102f2565b50505050509250925092565b606060008351600101604051908082528060200260200182016040528015610409578160200160208202803883390190505b509150600090505b835181101561045257838181518110151561042857fe5b90602001906020020151828281518110151561044057fe5b60209081029091010152600101610411565b8282855181518110151561046257fe5b602090810290910101525092915050565b6060600083516001016040519080825280602002602001820160405280156104a5578160200160208202803883390190505b509150600090505b83518110156104525783818151811015156104c457fe5b9060200190602002015182828151811015156104dc57fe5b602090810290910101526001016104ad565b60606000835160010160405190808252806020026020018201604052801561052a57816020015b60608152602001906001900390816105155790505b509150600090505b835181101561045257838181518110151561054957fe5b90602001906020020151828281518110151561056157fe5b60209081029091010152600101610532565b6060600083516001016040519080825280602002602001820160405280156105a5578160200160208202803883390190505b509150600090505b83518110156105fb5783818151811015156105c457fe5b9060200190602002015182828151811015156105dc57fe5b600160a060020a039092166020928302909101909101526001016105ad565b8282855181518110151561060b57fe5b600160a060020a039092166020928302909101909101525092915050565b60006106358235610b46565b9392505050565b60006106358251610b46565b60006106358251610b55565b60006106358251610b5a565b60006106358251610b52565b6000601f8201831361067d57600080fd5b815161069061068b82610b14565b610aed565b915080825260208301602083018583830111156106ac57600080fd5b6106b7838284610b8d565b50505092915050565b60006106358235610b68565b60006106358251610b79565b60006106358235610b52565b60006106358251610b80565b6000806000806000806000806000806101408b8d03121561071057600080fd5b600061071c8d8d610648565b9a5050602061072d8d828e01610660565b995050604061073e8d828e01610660565b985050606061074f8d828e016106cc565b97505060806107608d828e016106e4565b96505060a06107718d828e016106e4565b95505060c06107828d828e01610660565b94505060e06107938d828e01610648565b9350506101006107a58d828e0161063c565b9250506101206107b78d828e01610654565b9150509295989b9194979a5092959850565b6000806000606084860312156107de57600080fd5b60006107ea8686610660565b93505060206107fb8682870161063c565b925050604084015167ffffffffffffffff81111561081857600080fd5b6108248682870161066c565b9150509250925092565b6000806040838503121561084157600080fd5b600061084d85856106c0565b925050602061085e858286016106d8565b9150509250929050565b60008060006060848603121561087d57600080fd5b600061088986866106c0565b935050602061089a868287016106d8565b925050604061082486828701610629565b6108b481610b46565b82525050565b60006108c582610b42565b8084526020840193506108d783610b3c565b60005b82811015610907576108ed8683516108ab565b6108f682610b3c565b6020969096019591506001016108da565b5093949350505050565b600061091c82610b42565b80845260208401935061092e83610b3c565b60005b8281101561090757610944868351610a12565b61094d82610b3c565b602096909601959150600101610931565b600061096982610b42565b8084526020840193508360208202850161098285610b3c565b60005b848110156109b957838303885261099d838351610a1b565b92506109a882610b3c565b602098909801979150600101610985565b50909695505050505050565b60006109d082610b42565b8084526020840193506109e283610b3c565b60005b82811015610907576109f8868351610a12565b610a0182610b3c565b6020969096019591506001016109e5565b6108b481610b52565b6000610a2682610b42565b808452610a3a816020860160208601610b8d565b610a4381610bbd565b9093016020019392505050565b60608082528101610a618186610911565b90508181036020830152610a7581856108ba565b90508181036040830152610a89818461095e565b95945050505050565b60608082528101610aa381866109c5565b90508181036020830152610a758185610911565b60408101610ac58285610a12565b61063560208301846108ab565b60408101610ae08285610a12565b6106356020830184610a12565b60405181810167ffffffffffffffff81118282101715610b0c57600080fd5b604052919050565b600067ffffffffffffffff821115610b2b57600080fd5b506020601f91909101601f19160190565b60200190565b5190565b600160a060020a031690565b90565b151590565b67ffffffffffffffff191690565b6000610b7382610b46565b92915050565b61ffff1690565b67ffffffffffffffff1690565b60005b83811015610ba8578181015183820152602001610b90565b83811115610bb7576000848401525b50505050565b601f01601f1916905600a265627a7a723058200e25817ac4922175a10a941d81553f24b8729012875c3760ac5e39dc1a89499a6c6578706572696d656e74616cf50037

_solDist/BBFarmIface.abi

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getCreationTs","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"vote","type":"bytes32"},{"name":"extra","type":"bytes"}],"name":"submitVote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"newOwner","type":"address"}],"name":"setBallotOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"setDeprecated","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getVersion","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getNBallots","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getNamespace","outputs":[{"name":"","type":"bytes4"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getSponsorsN","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"sponsorN","type":"uint256"}],"name":"getSponsor","outputs":[{"name":"sender","type":"address"},{"name":"amount","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voteData","type":"bytes32"},{"name":"extraWSig","type":"bytes"}],"name":"submitProxyVote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voteId","type":"uint256"}],"name":"getVote","outputs":[{"name":"voteData","type":"bytes32"},{"name":"sender","type":"address"},{"name":"extra","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newSC","type":"address"}],"name":"upgradeMe","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getTotalSponsorship","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voter","type":"address"}],"name":"getDetails","outputs":[{"name":"hasVoted","type":"bool"},{"name":"nVotesCast","type":"uint256"},{"name":"secKey","type":"bytes32"},{"name":"submissionBits","type":"uint16"},{"name":"startTime","type":"uint64"},{"name":"endTime","type":"uint64"},{"name":"specHash","type":"bytes32"},{"name":"deprecated","type":"bool"},{"name":"ballotOwner","type":"address"},{"name":"extraData","type":"bytes24"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"sk","type":"bytes32"}],"name":"revealSeckey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"newEndTime","type":"uint64"}],"name":"setEndTime","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"sponsor","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[],"name":"getBBLibVersion","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"specHash","type":"bytes32"},{"name":"packed","type":"uint256"},{"name":"ix","type":"address"},{"name":"bbAdmin","type":"address"},{"name":"extraData","type":"bytes24"}],"name":"initBallot","outputs":[{"name":"ballotIdWNamespace","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]

_solDist/BBFarmIface.abi.json

@@ -0,0 +1 @@
+[{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getCreationTs","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"vote","type":"bytes32"},{"name":"extra","type":"bytes"}],"name":"submitVote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"newOwner","type":"address"}],"name":"setBallotOwner","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"setDeprecated","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"getVersion","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getNBallots","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"getNamespace","outputs":[{"name":"","type":"bytes4"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getSponsorsN","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"sponsorN","type":"uint256"}],"name":"getSponsor","outputs":[{"name":"sender","type":"address"},{"name":"amount","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voteData","type":"bytes32"},{"name":"extraWSig","type":"bytes"}],"name":"submitProxyVote","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voteId","type":"uint256"}],"name":"getVote","outputs":[{"name":"voteData","type":"bytes32"},{"name":"sender","type":"address"},{"name":"extra","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newSC","type":"address"}],"name":"upgradeMe","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"getTotalSponsorship","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"voter","type":"address"}],"name":"getDetails","outputs":[{"name":"hasVoted","type":"bool"},{"name":"nVotesCast","type":"uint256"},{"name":"secKey","type":"bytes32"},{"name":"submissionBits","type":"uint16"},{"name":"startTime","type":"uint64"},{"name":"endTime","type":"uint64"},{"name":"specHash","type":"bytes32"},{"name":"deprecated","type":"bool"},{"name":"ballotOwner","type":"address"},{"name":"extraData","type":"bytes24"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"sk","type":"bytes32"}],"name":"revealSeckey","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"},{"name":"newEndTime","type":"uint64"}],"name":"setEndTime","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"ballotId","type":"uint256"}],"name":"sponsor","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":true,"inputs":[],"name":"getBBLibVersion","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"specHash","type":"bytes32"},{"name":"packed","type":"uint256"},{"name":"ix","type":"address"},{"name":"bbAdmin","type":"address"},{"name":"extraData","type":"bytes24"}],"name":"initBallot","outputs":[{"name":"ballotIdWNamespace","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"}]

_solDist/BBFarmProxy.abi

@@ -1 +1 @@
-[{"constant":true,"inputs":[{"name":"voter","type":"address"}],"name":"getDetails","outputs":[{"name":"hasVoted","type":"bool"},{"name":"nVotesCast","type":"uint256"},{"name":"secKey","type":"bytes32"},{"name":"submissionBits","type":"uint16"},{"name":"startTime","type":"uint64"},{"name":"endTime","type":"uint64"},{"name":"specHash","type":"bytes32"},{"name":"deprecated","type":"bool"},{"name":"ballotOwner","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"voteId","type":"uint256"}],"name":"getVote","outputs":[{"name":"","type":"bytes32"},{"name":"","type":"address"},{"name":"","type":"bytes32"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_farm","type":"address"},{"name":"_ballotId","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]
+[{"constant":true,"inputs":[{"name":"voter","type":"address"}],"name":"getDetails","outputs":[{"name":"hasVoted","type":"bool"},{"name":"nVotesCast","type":"uint256"},{"name":"secKey","type":"bytes32"},{"name":"submissionBits","type":"uint16"},{"name":"startTime","type":"uint64"},{"name":"endTime","type":"uint64"},{"name":"specHash","type":"bytes32"},{"name":"deprecated","type":"bool"},{"name":"ballotOwner","type":"address"},{"name":"extraData","type":"bytes24"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"voteId","type":"uint256"}],"name":"getVote","outputs":[{"name":"","type":"bytes32"},{"name":"","type":"address"},{"name":"","type":"bytes"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[{"name":"_farm","type":"address"},{"name":"_ballotId","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]