fix - totalDonation decrease order (#776)

* fix - totalDonation decrease order

* more updates

* require acceptance at ragequit

* tests coverage

* remove member accepted

* use infra 21

* solc 0.6.12

.solhint.json

@@ -8,6 +8,6 @@
       "two-lines-top-level-separator": "off",
       "mark-callable-contracts": "off",
       "reason-string": "off",
-      "compiler-version": ["error","^0.6.10"]
+      "compiler-version": ["error","^0.6.12"]
     }
   }

buidler.config.js

@@ -124,7 +124,7 @@ module.exports = {
   }
 },
   solc: {
-    version: "0.6.10",    // Fetch exact version from solc-bin (default: truffle's version)
+    version: "0.6.12",    // Fetch exact version from solc-bin (default: truffle's version)
     optimizer: {
       enabled: true,
       runs: 200

contracts/controller/Avatar.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/Reputation.sol";

contracts/controller/Controller.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./Avatar.sol";

contracts/controller/DAOToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20Burnable.sol";

contracts/controller/Vault.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";

contracts/globalConstraints/GlobalConstraintInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 // solhint-disable-next-line indent

contracts/globalConstraints/TokenCapGC.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";

contracts/libs/Bytes32ToStr.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 library Bytes32ToStr {

contracts/libs/BytesLib.sol

@@ -6,7 +6,7 @@
  *      The library lets you concatenate, slice and type cast bytes arrays both in memory and storage.
  */
 
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 

contracts/libs/StringUtil.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 

contracts/misc/CommonToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";

contracts/misc/NFTManager.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC721/IERC721.sol";

contracts/misc/NectarRepAllocation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";

contracts/misc/PolkaCurve.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../schemes/CurveInterface.sol";

contracts/registry/App.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./ImplementationProvider.sol";

contracts/registry/ImplementationDirectory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./ImplementationProvider.sol";

contracts/registry/ImplementationProvider.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 

contracts/registry/Package.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/upgrades/contracts/ownership/Ownable.sol";

contracts/schemes/Agreement.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 /**

contracts/schemes/ArcScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Avatar.sol";

contracts/schemes/Auction4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";

contracts/schemes/CommonInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 

contracts/schemes/Competition.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./ContributionRewardExt.sol";

contracts/schemes/ContinuousLocking4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";

contracts/schemes/ContributionReward.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/schemes/ContributionRewardExt.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/schemes/ControllerUpgradeScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/CurveInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 interface CurveInterface {

contracts/schemes/Dictator.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Avatar.sol";

contracts/schemes/ExternalLocking4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./Locking4Reputation.sol";

contracts/schemes/FixedReputationAllocation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Controller.sol";

contracts/schemes/FundingRequest.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/schemes/GenericScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/GlobalConstraintRegistrar.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/JoinAndQuit.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";
@@ -53,9 +53,10 @@ contract JoinAndQuit is
     event ProposalExecuted(address indexed _avatar, bytes32 indexed _proposalId, int256 _decision);
 
     struct Proposal {
-        bool accepted;
         address proposedMember;
         uint256 funding;
+        bool executed;
+        bool accepted;
     }
 
     struct MemberFund {
@@ -124,22 +125,25 @@ contract JoinAndQuit is
     onlyVotingMachine(_proposalId)
     override
     returns(bool) {
-        require(proposals[_proposalId].accepted == false);
-        require(proposals[_proposalId].proposedMember != address(0));
         Proposal memory proposal = proposals[_proposalId];
+        require(proposal.proposedMember != address(0), "not a valid proposal");
+        require(proposal.executed == false, "proposal already been executed");
+        proposals[_proposalId].executed = true;
+
         bool success;
         // Check if vote was successful:
         if ((_decision == 1) && (avatar.nativeReputation().balanceOf(proposal.proposedMember) == 0)) {
             proposals[_proposalId].accepted = true;
+            fundings[proposal.proposedMember].funding = proposal.funding;
+            totalDonation = totalDonation.add(proposal.funding);
             if (fundingToken == IERC20(0)) {
                 // solhint-disable-next-line
                 (success, ) = address(avatar).call{value:proposal.funding}("");
                 require(success, "sendEther to avatar failed");
             } else {
                 fundingToken.safeTransfer(address(avatar), proposal.funding);
             }
-            fundings[proposal.proposedMember].funding = proposal.funding;
-            totalDonation = totalDonation.add(proposal.funding);
+            //this should be called/check after the transfer to the avatar.
             setFundingGoalReachedFlag();
         } else {
             if (fundingToken == IERC20(0)) {
@@ -182,9 +186,10 @@ contract JoinAndQuit is
         bytes32 proposalId = votingMachine.propose(2, voteParamsHash, proposer, address(avatar));
 
         Proposal memory proposal = Proposal({
-            accepted: false,
+            executed: false,
             proposedMember: proposer,
-            funding : _feeAmount
+            funding : _feeAmount,
+            accepted: false
         });
         proposals[proposalId] = proposal;
 
@@ -210,9 +215,9 @@ contract JoinAndQuit is
         Proposal storage proposal = proposals[_proposalId];
         require(proposal.proposedMember != address(0), "no member to redeem");
         require(!fundings[proposal.proposedMember].rageQuit, "member already rageQuit");
+        require(proposal.accepted == true, " proposal not accepted");
         //set proposal proposedMember to zero to prevent reentrancy attack.
         proposal.proposedMember = address(0);
-        require(proposal.accepted == true, " proposal not accepted");
         if (memberReputation == 0) {
             reputation = _proposal.funding;
         } else {
@@ -258,12 +263,12 @@ contract JoinAndQuit is
         } else {
             refundAmount = userDonation.mul(fundingToken.balanceOf(address(avatar))).div(totalDonation);
         }
+        totalDonation = totalDonation.sub(userDonation);
         sendToBeneficiary(refundAmount, msg.sender);
         uint256 msgSenderReputation = avatar.nativeReputation().balanceOf(msg.sender);
         require(
         Controller(
         avatar.owner()).burnReputation(msgSenderReputation, msg.sender));
-        totalDonation = totalDonation.sub(userDonation);
         emit RageQuit(address(avatar), msg.sender, refundAmount);
     }
 

contracts/schemes/Locking4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Controller.sol";

contracts/schemes/LockingEth4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./Locking4Reputation.sol";

contracts/schemes/LockingToken4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "./Locking4Reputation.sol";

contracts/schemes/PriceOracleInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 interface PriceOracleInterface {

contracts/schemes/ReputationAdmin.sol

@@ -1,4 +1,4 @@
-pragma solidity 0.6.10;
+pragma solidity 0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@openzeppelin/contracts-ethereum-package/contracts/access/Ownable.sol";

contracts/schemes/ReputationFromToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Controller.sol";

contracts/schemes/SchemeFactory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/SchemeRegistrar.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/VotingMachineCallbacksInterface.sol";

contracts/schemes/SignalScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/TokenTrade.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/schemes/UpgradeScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/IntVoteInterface.sol";

contracts/schemes/VoteInOrganizationScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/test/ARCDebug.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "@daostack/infra-experimental/contracts/votingMachines/GenesisProtocol.sol";

contracts/test/ARCGenesisProtocolCallbacksMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../votingMachines/VotingMachineCallbacks.sol";

contracts/test/ActionMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../controller/Avatar.sol";

contracts/test/AgreementMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.6.10;
+pragma solidity ^0.6.12;
 // SPDX-License-Identifier: GPL-3.0
 
 import "../schemes/Agreement.sol";