Merge pull request #221 from ekpyron/updateDAO

Update DAO contracts.

Author: axic

test/DAO/DAO.sol

@@ -221,7 +221,7 @@ contract DAOInterface {
         address _recipient,
         uint _amount,
         bytes _transactionData
-    ) constant returns (bool _codeChecksOut);
+    ) view returns (bool _codeChecksOut);
 
     /// @notice Vote on proposal `_proposalID` with `_supportsProposal`
     /// @param _proposalID The proposal ID
@@ -320,11 +320,11 @@ contract DAOInterface {
     function halveMinQuorum() returns (bool _success);
 
     /// @return total number of proposals ever created
-    function numberOfProposals() constant returns (uint _numberOfProposals);
+    function numberOfProposals() view returns (uint _numberOfProposals);
 
     /// @param _proposalID Id of the new curator proposal
     /// @return Address of the new DAO
-    function getNewDAOAddress(uint _proposalID) constant returns (address _newDAO);
+    function getNewDAOAddress(uint _proposalID) view returns (address _newDAO);
 
     /// @param _account The address of the account which is checked.
     /// @return Whether the account is blocked (not allowed to transfer tokens) or not.
@@ -455,7 +455,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
         p.recipient = _recipient;
         p.amount = _amount;
         p.description = _description;
-        p.proposalHash = sha3(_recipient, _amount, _transactionData);
+        p.proposalHash = keccak256(_recipient, _amount, _transactionData);
         p.votingDeadline = now + _debatingPeriod;
         p.open = true;
         //p.proposalPassed = False; // that's default
@@ -482,9 +482,9 @@ contract DAO is DAOInterface, Token, TokenCreation {
         address _recipient,
         uint _amount,
         bytes _transactionData
-    ) noEther constant returns (bool _codeChecksOut) {
+    ) noEther view returns (bool _codeChecksOut) {
         Proposal p = proposals[_proposalID];
-        return p.proposalHash == sha3(_recipient, _amount, _transactionData);
+        return p.proposalHash == keccak256(_recipient, _amount, _transactionData);
     }
 
 
@@ -543,7 +543,7 @@ contract DAO is DAOInterface, Token, TokenCreation {
             || !p.open
             || p.proposalPassed // anyone trying to call us recursively?
             // Does the transaction code match the proposal?
-            || p.proposalHash != sha3(p.recipient, p.amount, _transactionData)) {
+            || p.proposalHash != keccak256(p.recipient, p.amount, _transactionData)) {
 
             revert();
         }
@@ -851,12 +851,12 @@ contract DAO is DAOInterface, Token, TokenCreation {
             return false;
     }
 
-    function actualBalance() constant returns (uint _actualBalance) {
+    function actualBalance() view returns (uint _actualBalance) {
         return this.balance - sumOfProposalDeposits;
     }
 
 
-    function minQuorum(uint _value) internal constant returns (uint _minQuorum) {
+    function minQuorum(uint _value) internal view returns (uint _minQuorum) {
         // minimum of 20% and maximum of 53.33%
         return totalSupply / minQuorumDivisor +
             (_value * totalSupply) / (3 * (actualBalance() + rewardToken[address(this)]));
@@ -892,12 +892,12 @@ contract DAO is DAOInterface, Token, TokenCreation {
         );
     }
 
-    function numberOfProposals() constant returns (uint _numberOfProposals) {
+    function numberOfProposals() view returns (uint _numberOfProposals) {
         // Don't count index 0. It's used by isBlocked() and exists from start
         return proposals.length - 1;
     }
 
-    function getNewDAOAddress(uint _proposalID) constant returns (address _newDAO) {
+    function getNewDAOAddress(uint _proposalID) view returns (address _newDAO) {
         return proposals[_proposalID].splitData[0].newDAO;
     }
 

test/DAO/Token.sol

@@ -47,7 +47,7 @@ contract TokenInterface {
 
     /// @param _owner The address from which the balance will be retrieved
     /// @return The balance
-    function balanceOf(address _owner) public constant returns (uint256 balance);
+    function balanceOf(address _owner) public view returns (uint256 balance);
 
     /// @notice Send `_amount` tokens to `_to` from `msg.sender`
     /// @param _to The address of the recipient
@@ -77,7 +77,7 @@ contract TokenInterface {
     function allowance(
         address _owner,
         address _spender
-    ) public constant returns (uint256 remaining);
+    ) public view returns (uint256 remaining);
 
     event Transfer(address indexed _from, address indexed _to, uint256 _amount);
     event Approval(
@@ -96,7 +96,7 @@ contract Token is TokenInterface {
     // inadvertently also transferred ether
     modifier noEther() {if (msg.value > 0) revert(); _; }
 
-    function balanceOf(address _owner) public constant returns (uint256 balance) {
+    function balanceOf(address _owner) public view returns (uint256 balance) {
         return balances[_owner];
     }
 
@@ -146,7 +146,7 @@ contract Token is TokenInterface {
         return true;
     }
 
-    function allowance(address _owner, address _spender) public constant returns (uint256 remaining) {
+    function allowance(address _owner, address _spender) public view returns (uint256 remaining) {
         return allowed[_owner][_spender];
     }
 }

test/DAO/TokenCreation.sol

@@ -73,7 +73,7 @@ contract TokenCreationInterface {
 
     /// @return The divisor used to calculate the token creation rate during
     /// the creation phase
-    function divisor() constant returns (uint divisor);
+    function divisor() view returns (uint divisor);
 
     event FuelingToDate(uint value);
     event CreatedToken(address indexed to, uint amount);
@@ -135,7 +135,7 @@ contract TokenCreation is TokenCreationInterface, Token {
         }
     }
 
-    function divisor() constant returns (uint divisor) {
+    function divisor() view returns (uint divisor) {
         // The number of (base unit) tokens per wei is calculated
         // as `msg.value` * 20 / `divisor`
         // The fueling period starts with a 1:1 ratio