Readme ganache

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-minimal

contracts/AbieFund.sol → contracts/Abie.sol

@@ -1,19 +1,21 @@
 /* Part of this contract is from the solidity documentation
-TODO: Set a license.
+MIT License: https://github.com/AbieFund/abie/blob/master/LICENSE
 */
 
 pragma solidity ^0.4.8;
 
-/// @title Fund for donations.
-contract AbieFund {
+/// @title The easy fund
+contract Abie {
 
-    uint public membershipFee = 0.1 ether;
-    uint public deposit = 1 ether;
+    bytes32 public name;
+    bytes32 public statement;
+    uint public fee = 0.1 ether;
     uint public nbMembers;
     uint public nbProposalsFund;
+    uint public nbMembershipReq;
     uint public registrationTime = 1 years;
-    uint[2] public voteLength = [1 weeks, 1 weeks];
-    uint MAX_DELEGATION_DEPTH=1000;
+    uint[2] public voteLength = [2 minutes, 2 minutes];
+    uint MAX_DELEGATION_DEPTH=10;
     address NOT_COUNTED=0;
     address COUNTED=1;
 
@@ -63,23 +65,25 @@ contract AbieFund {
 
     /// Require at least price to be paid.
     modifier costs(uint price) {
-        if (msg.value<price)
-            throw;
+        require(msg.value>=price);
         _;
     }
 
     /// Require the caller to be a member.
     modifier isMember() {
-        if(!isValidMember(msg.sender))
-            throw;
+        require(isValidMember(msg.sender));
         _;
     }
 
-
     /// @param initialMembers First members of the organization.
-    function AbieFund(address[] initialMembers) {
+    /// @param _name The name of the DAO
+    /// @param _statement The statement of intent of the DAO
+    function Abie(bytes32 _name, bytes32 _statement, address[] initialMembers) public {
+
+        name=_name;
+        statement=_statement;
         for (uint i;i<initialMembers.length;++i){
-            Member member=members[initialMembers[i]];
+            Member storage member=members[initialMembers[i]];
             member.registration=now;
             if (i==0) { // initialize the list with the first member
                 memberList.first=initialMembers[0];
@@ -89,11 +93,17 @@ contract AbieFund {
             }
         }
         nbMembers=initialMembers.length;
-    }
+        // Set default member.
+        if (nbMembers==0){
+        addMember(msg.sender);
+        }
+ }
 
     // Add the member m to the member list.
     // Assume that there is at least 1 member registrated.
     function addMember(address m) private {
+        members[m].registration=now;
+        ++nbMembers;
         members[memberList.last].succ=m;
         members[m].prev=memberList.last;
         memberList.last=m;
@@ -103,19 +113,19 @@ contract AbieFund {
       * @param proposalType 0 for AddMember, 1 for FundProject.
       * @param target account to delegate to.
       */
-    function setDelegate(uint8 proposalType, address target)
+    function setDelegate(uint8 proposalType, address target) public
     {
         members[msg.sender].delegate[proposalType] = target;
     }
 
     /// Receive funds.
-    function () payable {
+    function () payable public{
         Donated(msg.sender, msg.value);
     }
 
-    /// Ask membership of the fund.
-    function askMembership () payable costs(membershipFee) {
-        Donated(msg.sender,msg.value); // Register the donation.
+    /// Ask for membership.
+    function askMembership () payable public costs(fee) {
+         Donated(msg.sender,msg.value); // Register the donation.
 
         // Create a proposal to add the member.
         proposals.push(Proposal({
@@ -126,14 +136,17 @@ contract AbieFund {
           value: 0x0,
           data: 0x0,
           proposalType: ProposalType.AddMember,
-          endDate: now + voteLength[uint256(ProposalType.AddMember)],
+          endDate: now + 2 minutes,
+          //voteLength[uint256(ProposalType.AddMember)],
           lastMemberCounted: 0,
           executed: false
         }));
+
+        ++nbMembershipReq;
     }
 
     /// Add Proposal.
-    function addProposal (bytes32 _name, uint _value, bytes32 _data) payable costs(deposit) {
+    function addProposal (bytes32 _name, uint _value, bytes32 _data) payable public costs(fee) {
         Donated(msg.sender,msg.value); // Register the donation.
 
         // Create a proposal to add the member.
@@ -145,7 +158,7 @@ contract AbieFund {
           value: _value,
           data: _data,
           proposalType: ProposalType.FundProject,
-          endDate: now,
+          endDate: now + 2 minutes,
           lastMemberCounted: 0,
           executed: false
         }));
@@ -157,20 +170,17 @@ contract AbieFund {
      *  @param proposalID ID of the proposal to count votes from.
      *  @param voteType Yes or No.
      */
-    function vote (uint proposalID, VoteType voteType) isMember {
-        Proposal proposal = proposals[proposalID];
-        if (proposal.vote[msg.sender] != VoteType.Abstain) // Has already voted.
-            throw;
-        if (proposal.endDate < now) // Vote is over.
-            throw;
-
+    function vote (uint proposalID, VoteType voteType) public isMember {
+        Proposal storage proposal = proposals[proposalID];
+        require(proposal.vote[msg.sender] == VoteType.Abstain); // Has already voted.
+        require(proposal.endDate >= now); // Vote is over.
         proposals[proposalID].vote[msg.sender] = voteType;
     }
 
     /** Count all the votes. You can call this function if gas limit is not an issue.
      *  @param proposalID ID of the proposal to count votes from.
      */
-    function countAllVotes (uint proposalID) {
+    function countAllVotes (uint proposalID) public{
         countVotes (proposalID,uint(-1));
     }
 
@@ -181,28 +191,26 @@ contract AbieFund {
      *  @param proposalID ID of the proposal to count votes from.
      *  @param max maximum to count.
      */
-    function countVotes (uint proposalID, uint max) {
-        Proposal proposal = proposals[proposalID];
+    function countVotes (uint proposalID, uint max) public {
+        Proposal storage proposal = proposals[proposalID];
         address current;
-        if (proposal.endDate > now) // You can't count while the vote is not over.
-            throw;
-        if (proposal.lastMemberCounted == COUNTED) // The count is already over
-            throw;
+        require (proposal.endDate <= now); // You can't count while the vote is not over.
+        require (proposal.lastMemberCounted != COUNTED); // The count is already over
 
         if (proposal.lastMemberCounted == NOT_COUNTED)
             current = memberList.first;
         else
             current = proposal.lastMemberCounted;
 
         while (max-- != 0) {
-            Member member=members[current];
+            Member storage member = members[current];
             address delegate=current;
             if(isValidMember(current)) {
                 uint depth=0;
-                // Seach the final vote.
+                // Search the final vote.
                 while (true){
-                    VoteType vote=proposal.vote[delegate];
-                    if (vote==VoteType.Abstain) { // Look at the delegate
+                    VoteType voteNow = proposal.vote[delegate];
+                    if (voteNow==VoteType.Abstain) { // Look at the delegate
                         depth+=1;
                         delegate=members[delegate].delegate[uint(proposal.proposalType)]; // Find the delegate.
                         if (delegate==current // The delegation chain forms a circle.
@@ -211,10 +219,10 @@ contract AbieFund {
                            break;
                         }
                     }
-                    if (vote==VoteType.Yes) {
+                    if (voteNow==VoteType.Yes) {
                         proposal.voteYes+=1;
                         break;
-                    } else if (vote==VoteType.No) {
+                    } else if (voteNow==VoteType.No) {
                         proposal.voteNo+=1;
                         break;
                     }
@@ -228,19 +236,30 @@ contract AbieFund {
                 proposal.lastMemberCounted=COUNTED;
                 break;
             }
-
         }
-
     }
 
-    function executeAddMemberProposal(uint proposalID) {
-        Proposal proposal = proposals[proposalID];
-        if (proposal.proposalType != ProposalType.AddMember) // Not a proposal to add a member.
-            throw;
-        if (!isExecutable(proposalID)) // Proposal was not approved.
-            throw;
+    function executeAddMemberProposal(uint proposalID) public {
+        Proposal storage proposal = proposals[proposalID];
+        require (proposal.proposalType == ProposalType.AddMember); // Not a proposal to add a member.
+        require (isExecutable(proposalID)); // Proposal was not approved.
         proposal.executed=true; // The proposal will be executed.
         addMember(proposal.recipient);
+
+    }
+
+    // The following function has NOT been reviewed so far.
+    function claim(uint proposalID) public payable costs(fee) {
+        Proposal storage proposal = proposals[proposalID];
+        address beneficiary = proposal.recipient;
+        uint value = proposal.value;
+        uint check = fee*2+value;
+        require (isExecutable(proposalID)); // rejected if not executable
+        require(proposal.executed == false); // rejected if executed already
+        require (beneficiary == msg.sender); // rejected if caller is not the beneficiary
+        proposal.executed = true; // The proposal is flagged ‘executed’.
+        proposal.executed = true; // The proposal was executed.
+        beneficiary.transfer(check); // The beneficiary gets the requested amount.
     }
 
     /// CONSTANTS ///
@@ -249,31 +268,40 @@ contract AbieFund {
      *  @param member member to get the delegate from.
      *  @param proposalType 0 for AddMember, 1 for FundProject.
      */
-    function getDelegate(address member, uint8 proposalType) constant returns (address){
+    function getDelegate(address member, uint8 proposalType) public constant returns (address){
         return members[member].delegate[proposalType];
     }
 
     /** Return true if the proposal is validated, false otherwise.
      *  @param proposalID ID of the proposal to count votes from.
      */
-    function isExecutable(uint proposalID) constant returns (bool) {
-        Proposal proposal = proposals[proposalID];
+    function isExecutable(uint proposalID) public constant returns (bool) {
+        Proposal storage proposal = proposals[proposalID];
 
         if (proposal.lastMemberCounted != COUNTED) // Not counted yet.
             return false;
         if (proposal.executed) // The proposal has already been executed.
             return false;
-        if (proposal.value>this.balance) // Not enough to execute it.
+        if (proposal.value > address(this).balance) // Not enough to execute it.
             return false;
 
         return (proposal.voteYes>proposal.voteNo);
     }
 
-    function isValidMember(address m) constant returns(bool) {
+    function isValidMember(address m) public constant returns(bool) {
         if (members[m].registration==0) // Not a member.
             return false;
         if (members[m].registration+registrationTime<now) // Has expired.
             return false;
         return true;
     }
+
+    function contractBalance() public constant returns(uint256) {
+        return address(this).balance;
+    }
+
+ function timeLeft(uint proposalID) public constant returns(uint256) {
+        Proposal storage proposal = proposals[proposalID];
+        return proposal.endDate - now;
+    }
 }

migrations/2_deploy_contracts.js

@@ -1,10 +1,6 @@
-var AbieFund = artifacts.require("./AbieFund.sol");
-//var Web3 = require('../node_modules/web3');
-
+var Abie = artifacts.require("./Abie.sol");
 module.exports = function(deployer) {
-	//var web3RPC = new Web3(deployer.provider);
-	deployer.deploy(AbieFund);
-	/*web3RPC.eth.getAccounts((error, accounts) => {
-  		deployer.deploy(AbieFund,[accounts[0],accounts[1],accounts[2]]);
-  	});*/
+		web3.eth.getAccounts((error, accounts) => {
+		deployer.deploy(Abie,"0x596f","0x596f",[accounts[0],accounts[1]])
+	});
 };