Add build files

build/LPVault_all.sol

@@ -163,10 +163,10 @@ contract LPVault is Owned {
         require(p.state == PaymentStatus.Pending);
 
         p.state = PaymentStatus.Paid;
-        p.dest.transfer(p.amount);  // only ETH denominated in wei
-
         liquidPledging.confirmPayment(uint64(p.ref), p.amount);
 
+        p.dest.transfer(p.amount);  // only ETH denominated in wei
+
         ConfirmPayment(_idPayment);
     }
 

build/LiquidPledgingBase_all.sol

@@ -409,14 +409,14 @@ contract LiquidPledgingBase {
     ///  and the delegate ID.
     /// @param idPledge The ID internally representing the pledge.
     /// @param idxDelegate The ID internally representing the delegate.
-    function getPledgeDelegate(uint64 idPledge, uint _idxDelegate) constant returns(
-        uint64 idxDelegate,
+    function getPledgeDelegate(uint64 idPledge, uint idxDelegate) constant returns(
+        uint64 idDelegate,
         address addr,
         string name
     ) {
         Pledge storage n = findPledge(idPledge);
-        idxDelegate = n.delegationChain[_idxDelegate - 1];
-        PledgeAdmin storage delegate = findAdmin(idxDelegate);
+        idDelegate = n.delegationChain[idxDelegate - 1];
+        PledgeAdmin storage delegate = findAdmin(idDelegate);
         addr = delegate.addr;
         name = delegate.name;
     }

build/LiquidPledgingMock_all.sol

@@ -409,14 +409,14 @@ contract LiquidPledgingBase {
     ///  and the delegate ID.
     /// @param idPledge The ID internally representing the pledge.
     /// @param idxDelegate The ID internally representing the delegate.
-    function getPledgeDelegate(uint64 idPledge, uint _idxDelegate) constant returns(
-        uint64 idxDelegate,
+    function getPledgeDelegate(uint64 idPledge, uint idxDelegate) constant returns(
+        uint64 idDelegate,
         address addr,
         string name
     ) {
         Pledge storage n = findPledge(idPledge);
-        idxDelegate = n.delegationChain[_idxDelegate - 1];
-        PledgeAdmin storage delegate = findAdmin(idxDelegate);
+        idDelegate = n.delegationChain[idxDelegate - 1];
+        PledgeAdmin storage delegate = findAdmin(idDelegate);
         addr = delegate.addr;
         name = delegate.name;
     }
@@ -829,7 +829,7 @@ contract LiquidPledging is LiquidPledgingBase {
         require(n.paymentState == PaymentState.Paying);
 
         // Check the project is not canceled in the while.
-        require(getOldestPledgeNotCanceled(idPledge) == idPledge);
+        require(!isProjectCanceled(n.owner));
 
         uint64 idNewPledge = findOrCreatePledge(
             n.owner,
@@ -970,11 +970,9 @@ contract LiquidPledging is LiquidPledgingBase {
     ///  normalized efficiently
     /// @param pledges An array of pledge IDs which are extrapolated using
     ///  the D64 bitmask
-    function mNormalizePledge(uint[] pledges) returns(uint64) {
+    function mNormalizePledge(uint64[] pledges) {
         for (uint i = 0; i < pledges.length; i++ ) {
-            uint64 idPledge = uint64( pledges[i] & (D64-1) );
-
-            normalizePledge(idPledge);
+            normalizePledge( pledges[i] );
         }
     }
 

build/LiquidPledging_all.sol

@@ -409,14 +409,14 @@ contract LiquidPledgingBase {
     ///  and the delegate ID.
     /// @param idPledge The ID internally representing the pledge.
     /// @param idxDelegate The ID internally representing the delegate.
-    function getPledgeDelegate(uint64 idPledge, uint _idxDelegate) constant returns(
-        uint64 idxDelegate,
+    function getPledgeDelegate(uint64 idPledge, uint idxDelegate) constant returns(
+        uint64 idDelegate,
         address addr,
         string name
     ) {
         Pledge storage n = findPledge(idPledge);
-        idxDelegate = n.delegationChain[_idxDelegate - 1];
-        PledgeAdmin storage delegate = findAdmin(idxDelegate);
+        idDelegate = n.delegationChain[idxDelegate - 1];
+        PledgeAdmin storage delegate = findAdmin(idDelegate);
         addr = delegate.addr;
         name = delegate.name;
     }
@@ -829,7 +829,7 @@ contract LiquidPledging is LiquidPledgingBase {
         require(n.paymentState == PaymentState.Paying);
 
         // Check the project is not canceled in the while.
-        require(getOldestPledgeNotCanceled(idPledge) == idPledge);
+        require(!isProjectCanceled(n.owner));
 
         uint64 idNewPledge = findOrCreatePledge(
             n.owner,
@@ -970,11 +970,9 @@ contract LiquidPledging is LiquidPledgingBase {
     ///  normalized efficiently
     /// @param pledges An array of pledge IDs which are extrapolated using
     ///  the D64 bitmask
-    function mNormalizePledge(uint[] pledges) returns(uint64) {
+    function mNormalizePledge(uint64[] pledges) {
         for (uint i = 0; i < pledges.length; i++ ) {
-            uint64 idPledge = uint64( pledges[i] & (D64-1) );
-
-            normalizePledge(idPledge);
+            normalizePledge( pledges[i] );
         }
     }
 

build/Vault_all.sol

@@ -1,227 +0,0 @@
-
-//File: contracts\Owned.sol
-pragma solidity ^0.4.11;
-
-
-/// @dev `Owned` is a base level contract that assigns an `owner` that can be
-///  later changed
-contract Owned {
-
-    /// @dev `owner` is the only address that can call a function with this
-    /// modifier
-    modifier onlyOwner() {
-        require(msg.sender == owner);
-        _;
-    }
-
-    address public owner;
-
-    /// @notice The Constructor assigns the account deploying the contract to be
-    ///  the `owner`
-    function Owned() {
-        owner = msg.sender;
-    }
-
-    address public newOwner;
-
-    /// @notice `owner` can step down and assign some other address to this role
-    ///  but after this function is called the current owner still has ownership
-    ///  powers in this contract; change of ownership is a 2 step process
-    /// @param _newOwner The address of the new owner. A simple contract with
-    ///  the ability to accept ownership but the inability to do anything else
-    ///  can be used to create an unowned contract to achieve decentralization
-    function changeOwner(address _newOwner) onlyOwner {
-        newOwner = _newOwner;
-    }
-
-    /// @notice `newOwner` can accept ownership over this contract
-    function acceptOwnership() {
-        require(msg.sender == newOwner);
-        owner = newOwner;
-    }
-}
-
-//File: ./contracts/Vault.sol
-pragma solidity ^0.4.11;
-
-/// @title Vault
-/// @author Jordi Baylina
-/// @notice This contract holds ether securely for liquid pledging systems. For
-///  this iteration the funds will come straight from the Giveth Multisig as a
-///  safety precaution, but once fully tested and optimized this contract will
-///  be a safe place to store funds equipped with optional variable time delays
-///  to allow for an optional escape hatch to be implemented
-
-
-/// @dev `LiquidPledging` is a basic interface to allow the `Vault` contract
-///  to confirm and cancel payments in the `LiquidPledging` contract.
-contract LiquidPledging {
-    function confirmPayment(uint64 idNote, uint amount);
-    function cancelPayment(uint64 idNote, uint amount);
-}
-
-
-/// @dev `Vault` is a higher level contract built off of the `Owned`
-///  contract that holds funds for the liquid pledging system.
-contract LPVault is Owned {
-
-    LiquidPledging public liquidPledging; // liquidPledging contract's address
-    bool public autoPay; // if false, payments will take 2 txs to be completed
-
-    enum PaymentStatus {
-        Pending, // means the payment is awaiting confirmation
-        Paid,    // means the payment has been sent
-        Canceled // means the payment will never be sent
-    }
-    /// @dev `Payment` is a public structure that describes the details of
-    ///  each payment the `ref` param makes it easy to track the movements of
-    ///  funds transparently by its connection to other `Payment` structs
-    struct Payment {
-        PaymentStatus state; //
-        bytes32 ref; // an input that references details from other contracts
-        address dest; // recipient of the ETH
-        uint amount; // amount of ETH (in wei) to be sent
-    }
-
-    // @dev An array that contains all the payments for this Vault
-    Payment[] public payments;
-
-    // @dev `liquidPledging` is the only address that can call a function with
-    /// this modifier
-    modifier onlyLiquidPledging() {
-        require(msg.sender == address(liquidPledging));
-        _;
-    }
-    /// @dev USED FOR TESTING???
-    function VaultMock() {
-
-    }
-
-    function () payable {
-
-    }
-
-    /// @notice `setLiquidPledging` is used to attach a specific liquid pledging
-    ///  instance to this vault. Keep in mind this isn't a single pledge but
-    ///  instead an entire liquid pledging contract.
-    /// @param _newLiquidPledging A full liquid pledging contract
-    function setLiquidPledging(address _newLiquidPledging) onlyOwner {
-        require(address(liquidPledging) == 0x0);
-        liquidPledging = LiquidPledging(_newLiquidPledging);
-    }
-
-    /// @notice `setAutopay` is used to toggle whether the vault will
-    ///  automatically confirm a payment after the payment has been authorized.
-    /// @param _automatic If true payments will confirm automatically
-    function setAutopay(bool _automatic) onlyOwner {
-        autoPay = _automatic;
-    }
-
-    /// @notice `authorizePayment` is used in order to approve a payment 
-    ///  from the liquid pledging contract. Whenever a project or other address
-    ///  needs to receive a payment it needs to be authorized with this contract.
-    /// @param _ref This parameter is used to reference details about the
-    ///  payment from another contract.
-    /// @param _dest This is the address that payments will end up being sent to
-    /// @param _amount This is the amount that the payment is being authorized
-    ///  for.
-    function authorizePayment(
-        bytes32 _ref,
-        address _dest,
-        uint _amount ) onlyLiquidPledging returns (uint) {
-        uint idPayment = payments.length;
-        payments.length ++;
-        payments[idPayment].state = PaymentStatus.Pending;
-        payments[idPayment].ref = _ref;
-        payments[idPayment].dest = _dest;
-        payments[idPayment].amount = _amount;
-
-        AuthorizePayment(idPayment, _ref, _dest,  _amount);
-
-        if (autoPay) doConfirmPayment(idPayment);
-
-        return idPayment;
-    }
-
-
-    
-
-    /// @notice `confirmPayment` is a basic function used to allow the
-    ///  owner of the vault to initiate a payment confirmation. Since 
-    ///  `authorizePayment` is the only pay to populate the `payments` array
-    ///  this is generally used when `autopay` is `false` after a payment has
-    ///  has been authorized.
-    /// @param _idPayment Array lookup for the payment.
-    function confirmPayment(uint _idPayment) onlyOwner {
-        doConfirmPayment(_idPayment);
-    }
-
-    /// @notice `doConfirmPayment` is used to actually initiate a payment
-    ///  to the final destination. All of the payment information should be
-    ///  set before calling this function.
-    /// @param _idPayment Array lookup for the payment.
-    function doConfirmPayment(uint _idPayment) internal {
-        require(_idPayment < payments.length);
-        Payment storage p = payments[_idPayment];
-        require(p.state == PaymentStatus.Pending);
-
-        p.state = PaymentStatus.Paid;
-        p.dest.transfer(p.amount);  // only ETH denominated in wei
-
-        liquidPledging.confirmPayment(uint64(p.ref), p.amount);
-
-        ConfirmPayment(_idPayment);
-    }
-
-    /// @notice `cancelPayment` is used when `autopay` is `false` in order
-    ///  to allow the owner to cancel a payment instead of confirming it.
-    /// @param _idPayment Array lookup for the payment.
-    function cancelPayment(uint _idPayment) onlyOwner {
-        doCancelPayment(_idPayment);
-    }
-
-    /// @notice `doCancelPayment` This carries out the task of actually
-    ///  canceling a payment instead of confirming it.
-    /// @param _idPayment Array lookup for the payment.    
-    function doCancelPayment(uint _idPayment) internal {
-        require(_idPayment < payments.length);
-        Payment storage p = payments[_idPayment];
-        require(p.state == PaymentStatus.Pending);
-
-        p.state = PaymentStatus.Canceled;
-
-        liquidPledging.cancelPayment(uint64(p.ref), p.amount);
-
-        CancelPayment(_idPayment);
-
-    }
-
-    /// @notice `multiConfirm` allows for more efficient confirmation of
-    ///  multiple payments.
-    /// @param _idPayments An array of multiple payment ids
-    function multiConfirm(uint[] _idPayments) onlyOwner {
-        for (uint i=0; i < _idPayments.length; i++) {
-            doConfirmPayment(_idPayments[i]);
-        }
-    }
-
-    /// @notice `multiCancel` allows for more efficient cancellation of
-    ///  multiple payments.
-    /// @param _idPayments An array of multiple payment ids
-    function multiCancel(uint[] _idPayments) onlyOwner {
-        for (uint i=0; i < _idPayments.length; i++) {
-            doCancelPayment(_idPayments[i]);
-        }
-    }
-
-    /// @notice `nPayments` Basic getter to return the number of payments
-    ///  currently held in the system. Since payments are not removed from
-    ///  the array this represents all payments over all time.
-    function nPayments() constant returns (uint) {
-        return payments.length;
-    }
-
-    event ConfirmPayment(uint indexed idPayment);
-    event CancelPayment(uint indexed idPayment);
-    event AuthorizePayment(uint indexed idPayment, bytes32 indexed ref, address indexed dest, uint amount);
-}

contracts/LiquidPledging.sol

@@ -379,7 +379,7 @@ contract LiquidPledging is LiquidPledgingBase {
     ///  normalized efficiently
     /// @param pledges An array of pledge IDs which are extrapolated using
     ///  the D64 bitmask
-    function mNormalizePledge(uint[] pledges) {
+    function mNormalizePledge(uint64[] pledges) {
         for (uint i = 0; i < pledges.length; i++ ) {
             normalizePledge( pledges[i] );
         }

contracts/LiquidPledgingBase.sol

@@ -325,14 +325,14 @@ contract LiquidPledgingBase {
     ///  and the delegate ID.
     /// @param idPledge The ID internally representing the pledge.
     /// @param idxDelegate The ID internally representing the delegate.
-    function getPledgeDelegate(uint64 idPledge, uint _idxDelegate) constant returns(
-        uint64 idxDelegate,
+    function getPledgeDelegate(uint64 idPledge, uint idxDelegate) constant returns(
+        uint64 idDelegate,
         address addr,
         string name
     ) {
         Pledge storage n = findPledge(idPledge);
-        idxDelegate = n.delegationChain[_idxDelegate - 1];
-        PledgeAdmin storage delegate = findAdmin(idxDelegate);
+        idDelegate = n.delegationChain[idxDelegate - 1];
+        PledgeAdmin storage delegate = findAdmin(idDelegate);
         addr = delegate.addr;
         name = delegate.name;
     }

solidfuzz

@@ -0,0 +1 @@
+Subproject commit 04dd6ef8ea3fecae86ba32bd27d591551b2751a7

test/CancelPledge.js

@@ -8,7 +8,7 @@ const assertFail = require('./helpers/assertFail');
 
 const LiquidPledging = liquidpledging.LiquidPledgingMock;
 const LiquidPledgingState = liquidpledging.LiquidPledgingState;
-const Vault = liquidpledging.Vault;
+const Vault = liquidpledging.LPVault;
 const assert = chai.assert;
 
 const printState = async (liquidPledgingState) => {

test/DelegationChain.js

@@ -7,7 +7,7 @@ const liquidpledging = require('../index.js');
 
 const LiquidPledging = liquidpledging.LiquidPledgingMock;
 const LiquidPledgingState = liquidpledging.LiquidPledgingState;
-const Vault = liquidpledging.Vault;
+const Vault = liquidpledging.LPVault;
 const assertFail = require('./helpers/assertFail');
 const assert = chai.assert;
 

test/NormalizePledge.js

@@ -7,7 +7,7 @@ const liquidpledging = require('../index.js');
 
 const LiquidPledging = liquidpledging.LiquidPledgingMock;
 const LiquidPledgingState = liquidpledging.LiquidPledgingState;
-const Vault = liquidpledging.Vault;
+const Vault = liquidpledging.LPVault;
 const assertFail = require('./helpers/assertFail');
 const assert = chai.assert;