fix daobounty (#87)

* fix daobounty * lint * more test coverage * test coverage * comment
daostack · Jul 30, 2020 · e9a0fb3 · e9a0fb3
1 parent 2fa97ab
commit e9a0fb3
Show file tree

Hide file tree

Showing 8 changed files with 2,014 additions and 1,292 deletions.
diff --git a/contracts/test/GenesisProtocolCallbacksMock.sol b/contracts/test/GenesisProtocolCallbacksMock.sol
@@ -10,7 +10,7 @@ import "./Debug.sol";
 
 
 contract GenesisProtocolCallbacksMock is Debug, VotingMachineCallbacksInterface,
-                                             ProposalExecuteInterface, OwnableUpgradeSafe {
+                                            ProposalExecuteInterface, OwnableUpgradeSafe {
 
     Reputation public reputation;
     IERC20 public stakingToken;

diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol
@@ -42,8 +42,8 @@ contract ERC827Token is ERC20UpgradeSafe, ERC827 {
 
         super.approve(_spender, _value);
 
-        // solhint-disable-next-line avoid-call-value
-        (bool success,) = _spender.call{value: msg.value}(_data);
+        // solhint-disable-next-line avoid-call-value,indent
+        (bool success,) = _spender.call {value: msg.value}(_data);
         require(success);
 
         return true;
@@ -71,8 +71,8 @@ contract ERC827Token is ERC20UpgradeSafe, ERC827 {
 
         super.transfer(_to, _value);
 
-        // solhint-disable-next-line avoid-call-value
-        (bool success,) = _to.call{value: msg.value}(_data);
+        // solhint-disable-next-line avoid-call-value,indent
+        (bool success,) = _to.call {value: msg.value}(_data);
         require(success);
         return true;
     }
@@ -98,8 +98,8 @@ contract ERC827Token is ERC20UpgradeSafe, ERC827 {
 
         super.transferFrom(_from, _to, _value);
 
-        // solhint-disable-next-line avoid-call-value
-        (bool success,) = _to.call{value: msg.value}(_data);
+        // solhint-disable-next-line avoid-call-value,indent
+        (bool success,) = _to.call {value: msg.value}(_data);
         require(success);
         return true;
     }
@@ -128,8 +128,8 @@ contract ERC827Token is ERC20UpgradeSafe, ERC827 {
 
         super.increaseAllowance(_spender, _addedValue);
 
-        // solhint-disable-next-line avoid-call-value
-        (bool success,) = _spender.call{value: msg.value}(_data);
+        // solhint-disable-next-line avoid-call-value,indent
+        (bool success,) = _spender.call {value: msg.value}(_data);
         require(success);
 
         return true;
@@ -159,8 +159,8 @@ contract ERC827Token is ERC20UpgradeSafe, ERC827 {
 
         super.decreaseAllowance(_spender, _subtractedValue);
 
-        // solhint-disable-next-line avoid-call-value
-        (bool success,) = _spender.call{value: msg.value}(_data);
+        // solhint-disable-next-line avoid-call-value,indent
+        (bool success,) = _spender.call {value: msg.value}(_data);
         require(success);
 
         return true;

diff --git a/contracts/votingMachines/GenesisProtocol.sol b/contracts/votingMachines/GenesisProtocol.sol
@@ -34,7 +34,6 @@ contract GenesisProtocol is IntVoteInterface, GenesisProtocolLogic {
     GenesisProtocolLogic(_stakingToken) {
     }
 
-
   /**
    * @dev Check that the proposal is votable
    * a proposal is votable if it is in one of the following states:
@@ -157,9 +156,12 @@ contract GenesisProtocol is IntVoteInterface, GenesisProtocolLogic {
       * generated by calculating keccak256 of a incremented counter.
       * @param _proposer address
       */
-     function propose(uint256, bytes32 _paramsHash, address _proposer, address _organization) external override returns(bytes32) {
-         return _propose(_paramsHash, _proposer, _organization);
-     }
+    function propose(uint256, bytes32 _paramsHash, address _proposer, address _organization)
+    external
+    override
+    returns(bytes32) {
+        return _propose(_paramsHash, _proposer, _organization);
+    }
 
     /**
       * @dev execute check if the proposal has been decided, and if so, execute the proposal

diff --git a/contracts/votingMachines/GenesisProtocolLogic.sol b/contracts/votingMachines/GenesisProtocolLogic.sol
@@ -369,7 +369,7 @@ contract GenesisProtocolLogic is IntVoteInterfaceEvents {
             proposal.daoBountyRemain = proposal.daoBountyRemain.sub(potentialAmount);
             require(
             VotingMachineCallbacksInterface(proposal.callbacks)
-            .stakingTokenTransfer(stakingToken, _beneficiary, potentialAmount, _proposalId));
+            .stakingTokenTransfer(stakingToken, _beneficiary, potentialAmount, _proposalId), "transfer token failed");
             redeemedAmount = potentialAmount;
             emit RedeemDaoBounty(_proposalId, organizations[proposal.organizationId], _beneficiary, redeemedAmount);
         }
@@ -560,9 +560,9 @@ contract GenesisProtocolLogic is IntVoteInterfaceEvents {
             proposal.winningVote,
             totalReputation
             );
+            proposal.daoBounty = proposal.daoBountyRemain;
             emit GPExecuteProposal(_proposalId, executionState);
             ProposalExecuteInterface(proposal.callbacks).executeProposal(_proposalId, int(proposal.winningVote));
-            proposal.daoBounty = proposal.daoBountyRemain;
         }
         if (tmpProposal.state != proposal.state) {
             emit StateChange(_proposalId, proposal.state);
@@ -610,8 +610,9 @@ contract GenesisProtocolLogic is IntVoteInterfaceEvents {
                 "total stakes is too high");
 
         if (_vote == YES) {
-            staker.amount4BountyAndVote = uint256(uint248(staker.amount4BountyAndVote)).add(amount) |
-                                        (_vote<<VOTE_BIT_INDEX);
+            uint256 amount4Bounty = uint256(uint248(staker.amount4BountyAndVote)).add(amount);
+            require(amount4Bounty < PREBOOSTED_BIT_SET, "total stake for staker is too large");
+            staker.amount4BountyAndVote = amount4Bounty | (_vote<<VOTE_BIT_INDEX);
         } else {
             staker.amount4BountyAndVote |= (_vote<<VOTE_BIT_INDEX);
         }

diff --git a/contracts/votingMachines/IntVoteInterface.sol b/contracts/votingMachines/IntVoteInterface.sol
@@ -4,7 +4,7 @@ pragma solidity 0.6.10;
 interface IntVoteInterface {
     //When implementing this interface please do not only override function and modifier,
     //but also to keep the modifiers on the overridden functions.
-    modifier votable(bytes32 _proposalId) virtual {revert(); _;}
+    modifier votable(bytes32 _proposalId) virtual {revert("proposal is not votable"); _;}
 
     event CancelProposal(bytes32 indexed _proposalId, address indexed _organization );
     event CancelVoting(bytes32 indexed _proposalId, address indexed _organization, address indexed _voter);