Use infra 08 (#552)

* use infra 07

* fix genericshcme test

* solc v 0.4.25

* add return at balanceOfStakingToken

contracts/Migrations.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 
 contract Migrations {

contracts/VotingMachines/GenesisProtocolCallbacks.sol → contracts/VotingMachines/VotingMachineCallbacks.sol

@@ -1,10 +1,10 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../universalSchemes/UniversalScheme.sol";
 import "@daostack/infra/contracts/VotingMachines/GenesisProtocol.sol";
 
 
-contract GenesisProtocolCallbacks is GenesisProtocolCallbacksInterface {
+contract VotingMachineCallbacks is VotingMachineCallbacksInterface {
 
     struct ProposalInfo {
         uint blockNumber; // the proposal's block number
@@ -67,4 +67,8 @@ contract GenesisProtocolCallbacks is GenesisProtocolCallbacksInterface {
         return ControllerInterface(avatar.owner()).externalTokenTransfer(_stakingToken,_beneficiary,_amount,address(avatar));
     }
 
+    function balanceOfStakingToken(StandardToken _stakingToken,bytes32 _proposalId) external view returns(uint) {
+        Avatar avatar = proposalsInfo[_proposalId].avatar;
+        return _stakingToken.balanceOf(address(avatar));
+    }
 }

contracts/controller/Avatar.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/Reputation.sol";
 import "./DAOToken.sol";

contracts/controller/Controller.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Avatar.sol";
 import "../globalConstraints/GlobalConstraintInterface.sol";

contracts/controller/ControllerInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Avatar.sol";
 import "../globalConstraints/GlobalConstraintInterface.sol";

contracts/controller/DAOToken.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "openzeppelin-solidity/contracts/token/ERC20/MintableToken.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/BurnableToken.sol";

contracts/controller/UController.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Avatar.sol";
 import "../globalConstraints/GlobalConstraintInterface.sol";

contracts/globalConstraints/GlobalConstraintInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 
 contract GlobalConstraintInterface {

contracts/globalConstraints/TokenCapGC.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "openzeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
 import "./GlobalConstraintInterface.sol";

contracts/libs/RealMath.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 /**
  * RealMath: fixed-point math library, based on fractional and integer parts.

contracts/schemes/Auction4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "openzeppelin-solidity/contracts/math/SafeMath.sol";
 import { RealMath } from "../libs/RealMath.sol";

contracts/schemes/ExternalLocking4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Locking4Reputation.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";

contracts/schemes/FixReputationAllocation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../controller/ControllerInterface.sol";
 import { RealMath } from "../libs/RealMath.sol";

contracts/schemes/Locking4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../controller/ControllerInterface.sol";
 import { RealMath } from "../libs/RealMath.sol";

contracts/schemes/LockingEth4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Locking4Reputation.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";

contracts/schemes/LockingToken4Reputation.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./Locking4Reputation.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";

contracts/test/ARCDebug.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/GenesisProtocol.sol";
 import "@daostack/infra/contracts/VotingMachines/AbsoluteVote.sol";

contracts/test/ARCGenesisProtocolCallbacksMock.sol

@@ -1,9 +1,9 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
-contract ARCGenesisProtocolCallbacksMock is GenesisProtocolCallbacks {
+contract ARCVotingMachineCallbacksMock is VotingMachineCallbacks {
 
     function propose(bytes32 _proposalId,Avatar _avatar,address _votingMachine) public {
         proposalsInfo[_proposalId] = ProposalInfo(

contracts/test/ActionMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../controller/Avatar.sol";
 

contracts/test/ExternalTokenLockerMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 
 contract ExternalTokenLockerMock {

contracts/test/GlobalConstraintMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../globalConstraints/GlobalConstraintInterface.sol";
 

contracts/test/StandardTokenMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "openzeppelin-solidity/contracts/token/ERC20/StandardToken.sol";
 

contracts/test/UniversalSchemeMock.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../universalSchemes/UniversalScheme.sol";
 import "../controller/ControllerInterface.sol";

contracts/token/ERC827/ERC827.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "openzeppelin-solidity/contracts/token/ERC20/ERC20.sol";
 

contracts/token/ERC827/ERC827Token.sol

@@ -1,6 +1,6 @@
 /* solium-disable security/no-low-level-calls */
 
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./ERC827.sol";
 import "openzeppelin-solidity/contracts/token/ERC20/StandardToken.sol";

contracts/universalSchemes/ContributionReward.sol

@@ -1,9 +1,9 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/IntVoteInterface.sol";
-import "@daostack/infra/contracts/VotingMachines/GenesisProtocolCallbacksInterface.sol";
+import "@daostack/infra/contracts/VotingMachines/VotingMachineCallbacksInterface.sol";
 import "./UniversalScheme.sol";
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
 /**
@@ -12,7 +12,7 @@ import "../VotingMachines/GenesisProtocolCallbacks.sol";
  * him with token, reputation, ether or any combination.
  */
 
-contract ContributionReward is UniversalScheme,GenesisProtocolCallbacks,GenesisProtocolExecuteInterface {
+contract ContributionReward is UniversalScheme,VotingMachineCallbacks,ProposalExecuteInterface {
     using SafeMath for uint;
 
     event NewContributionProposal(
@@ -148,7 +148,8 @@ contract ContributionReward is UniversalScheme,GenesisProtocolCallbacks,GenesisP
         bytes32 contributionId = controllerParams.intVote.propose(
             2,
            controllerParams.voteApproveParams,
-           msg.sender
+           msg.sender,
+           _avatar
         );
 
         // Check beneficiary is not null:

contracts/universalSchemes/DaoCreator.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./UniversalScheme.sol";
 import "../controller/UController.sol";

contracts/universalSchemes/GenericScheme.sol

@@ -1,17 +1,17 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/IntVoteInterface.sol";
-import "@daostack/infra/contracts/VotingMachines/GenesisProtocolCallbacksInterface.sol";
+import "@daostack/infra/contracts/VotingMachines/VotingMachineCallbacksInterface.sol";
 import "./UniversalScheme.sol";
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
 /**
  * @title GenericScheme.
  * @dev  A scheme for proposing and executing calls to an arbitrary function
  * on a specific contract on behalf of the organization avatar.
  */
-contract GenericScheme is UniversalScheme,GenesisProtocolCallbacks,GenesisProtocolExecuteInterface {
+contract GenericScheme is UniversalScheme,VotingMachineCallbacks,ProposalExecuteInterface {
     event NewCallProposal(
         address indexed _avatar,
         bytes32 indexed _proposalId,
@@ -116,7 +116,7 @@ contract GenericScheme is UniversalScheme,GenesisProtocolCallbacks,GenesisProtoc
         Parameters memory params = parameters[getParametersFromController(_avatar)];
         IntVoteInterface intVote = params.intVote;
 
-        bytes32 proposalId = intVote.propose(2, params.voteParams,msg.sender);
+        bytes32 proposalId = intVote.propose(2, params.voteParams,msg.sender,_avatar);
 
         organizationsProposals[_avatar][proposalId] = CallProposal({
             callData: _callData,

contracts/universalSchemes/GlobalConstraintRegistrar.sol

@@ -1,17 +1,17 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/IntVoteInterface.sol";
-import "@daostack/infra/contracts/VotingMachines/GenesisProtocolCallbacksInterface.sol";
+import "@daostack/infra/contracts/VotingMachines/VotingMachineCallbacksInterface.sol";
 import "./UniversalScheme.sol";
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
 
 /**
  * @title A scheme to manage global constraint for organizations
  * @dev The scheme is used to register or remove new global constraints
  */
-contract GlobalConstraintRegistrar is UniversalScheme,GenesisProtocolCallbacks,GenesisProtocolExecuteInterface {
+contract GlobalConstraintRegistrar is UniversalScheme,VotingMachineCallbacks,ProposalExecuteInterface {
     event NewGlobalConstraintsProposal(
         address indexed _avatar,
         bytes32 indexed _proposalId,
@@ -132,7 +132,7 @@ contract GlobalConstraintRegistrar is UniversalScheme,GenesisProtocolCallbacks,G
         Parameters memory votingParams = parameters[getParametersFromController(_avatar)];
 
         IntVoteInterface intVote = votingParams.intVote;
-        bytes32 proposalId = intVote.propose(2, votingParams.voteRegisterParams,msg.sender);
+        bytes32 proposalId = intVote.propose(2, votingParams.voteRegisterParams,msg.sender,_avatar);
 
         GCProposal memory proposal = GCProposal({
             gc: _gc,
@@ -169,7 +169,7 @@ contract GlobalConstraintRegistrar is UniversalScheme,GenesisProtocolCallbacks,G
         require(controller.isGlobalConstraintRegistered(_gc,address(_avatar)));
         Parameters memory params = parameters[getParametersFromController(_avatar)];
         IntVoteInterface intVote = params.intVote;
-        bytes32 proposalId = intVote.propose(2, voteToRemoveParams[_avatar][_gc],msg.sender);
+        bytes32 proposalId = intVote.propose(2, voteToRemoveParams[_avatar][_gc],msg.sender,_avatar);
 
         GCProposal memory proposal = GCProposal({
             gc: _gc,

contracts/universalSchemes/OrganizationRegister.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./UniversalScheme.sol";
 

contracts/universalSchemes/SchemeRegistrar.sol

@@ -1,17 +1,17 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/IntVoteInterface.sol";
-import "@daostack/infra/contracts/VotingMachines/GenesisProtocolCallbacksInterface.sol";
+import "@daostack/infra/contracts/VotingMachines/VotingMachineCallbacksInterface.sol";
 import "./UniversalScheme.sol";
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
 /**
  * @title A registrar for Schemes for organizations
  * @dev The SchemeRegistrar is used for registering and unregistering schemes at organizations
  */
 
-contract SchemeRegistrar is UniversalScheme,GenesisProtocolCallbacks,GenesisProtocolExecuteInterface {
+contract SchemeRegistrar is UniversalScheme,VotingMachineCallbacks,ProposalExecuteInterface {
     event NewSchemeProposal(
         address indexed _avatar,
         bytes32 indexed _proposalId,
@@ -126,7 +126,8 @@ contract SchemeRegistrar is UniversalScheme,GenesisProtocolCallbacks,GenesisProt
         bytes32 proposalId = controllerParams.intVote.propose(
             2,
             controllerParams.voteRegisterParams,
-            msg.sender
+            msg.sender,
+            _avatar
         );
 
         SchemeProposal memory proposal = SchemeProposal({
@@ -168,7 +169,7 @@ contract SchemeRegistrar is UniversalScheme,GenesisProtocolCallbacks,GenesisProt
         Parameters memory params = parameters[paramsHash];
 
         IntVoteInterface intVote = params.intVote;
-        bytes32 proposalId = intVote.propose(2, params.voteRemoveParams,msg.sender);
+        bytes32 proposalId = intVote.propose(2, params.voteRemoveParams,msg.sender,_avatar);
 
         organizationsProposals[_avatar][proposalId].proposalType = 2;
         organizationsProposals[_avatar][proposalId].scheme = _scheme;

contracts/universalSchemes/SimpleICO.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./UniversalScheme.sol";
 import "openzeppelin-solidity/contracts/ownership/Ownable.sol";

contracts/universalSchemes/UniversalScheme.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "./UniversalSchemeInterface.sol";
 import "../controller/ControllerInterface.sol";

contracts/universalSchemes/UniversalSchemeInterface.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "../controller/Controller.sol";
 import "../controller/Avatar.sol";

contracts/universalSchemes/UpgradeScheme.sol

@@ -1,17 +1,17 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.4.25;
 
 import "@daostack/infra/contracts/VotingMachines/IntVoteInterface.sol";
-import "@daostack/infra/contracts/VotingMachines/GenesisProtocolExecuteInterface.sol";
+import "@daostack/infra/contracts/VotingMachines/ProposalExecuteInterface.sol";
 import "./UniversalScheme.sol";
-import "../VotingMachines/GenesisProtocolCallbacks.sol";
+import "../VotingMachines/VotingMachineCallbacks.sol";
 
 
 /**
  * @title A scheme to manage the upgrade of an organization.
  * @dev The scheme is used to upgrade the controller of an organization to a new controller.
  */
 
-contract UpgradeScheme is UniversalScheme,GenesisProtocolCallbacks,GenesisProtocolExecuteInterface {
+contract UpgradeScheme is UniversalScheme,VotingMachineCallbacks,ProposalExecuteInterface {
     event NewUpgradeProposal(
         address indexed _avatar,
         bytes32 indexed _proposalId,
@@ -117,7 +117,7 @@ contract UpgradeScheme is UniversalScheme,GenesisProtocolCallbacks,GenesisProtoc
         returns(bytes32)
     {
         Parameters memory params = parameters[getParametersFromController(_avatar)];
-        bytes32 proposalId = params.intVote.propose(2, params.voteParams,msg.sender);
+        bytes32 proposalId = params.intVote.propose(2, params.voteParams,msg.sender,_avatar);
         UpgradeProposal memory proposal = UpgradeProposal({
             proposalType: 1,
             upgradeContract: _newController,
@@ -150,7 +150,7 @@ contract UpgradeScheme is UniversalScheme,GenesisProtocolCallbacks,GenesisProtoc
     {
         Parameters memory params = parameters[getParametersFromController(_avatar)];
         IntVoteInterface intVote = params.intVote;
-        bytes32 proposalId = intVote.propose(2, params.voteParams,msg.sender);
+        bytes32 proposalId = intVote.propose(2, params.voteParams,msg.sender,_avatar);
         require(organizationsProposals[_avatar][proposalId].proposalType == 0);
 
         UpgradeProposal memory proposal = UpgradeProposal({