Builder refactored; Added security report link into Builder

airalab · Aug 17, 2016 · ae22cfb · ae22cfb
1 parent a660c5d
commit ae22cfb
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 107 deletions.
diff --git a/sol/builder/Builder.sol b/sol/builder/Builder.sol
@@ -7,64 +7,50 @@ import './BuilderBase.sol';
  * @title Builder based contract
  */
 contract Builder is BuilderBase {
-    /* Proposal */
-    Proposal proposal;
+    /* Building beneficiary */
+    address public beneficiary;
 
-    /* The DAO cashflow */
-    CashFlow cashflow;
+    /**
+     * @dev Set beneficiary
+     * @param _beneficiary is address of beneficiary
+     */
+    function setBeneficiary(address _beneficiary) onlyOwner
+    { beneficiary = _beneficiary; }
 
     /* Building cost  */
     uint public buildingCostWei;
 
-    /**
-     * @dev Builder constructor
-     * @param _buildingCostWei is module name
-     * @param _cashflow is address cashflow
-     * @param _proposal is address proposal
-     */
-    function Builder(uint _buildingCostWei, address _cashflow, address _proposal) {
-        buildingCostWei = _buildingCostWei;
-        proposal = Proposal(_proposal);
-        cashflow = CashFlow(_cashflow);
-    }
-
-    /**
-     * @dev Set cashflow
-     * @param _cashflow is address cashflow
-     */
-    function setCashflow(address _cashflow) onlyOwner {
-        cashflow = CashFlow(_cashflow);
-    }
-
-    /**
-     * @dev Set proposal
-     * @param _proposal is address proposal
-     */
-    function setProposal(address _proposal) onlyOwner {
-        proposal = Proposal(_proposal);
-    }
-
     /**
      * @dev Set building cost
      * @param _buildingCostWei is cost
      */
-    function setCost(uint _buildingCostWei) onlyOwner {
-        buildingCostWei = _buildingCostWei;
-    }
-
+    function setCost(uint _buildingCostWei) onlyOwner
+    { buildingCostWei = _buildingCostWei; }
+
+    /* Security check report */
+    string public securityCheckURI;
+
+    /**
+     * @dev Set security check report URI
+     * @param _uri is an URI to report
+     */
+    function setSecurityCheck(string _uri) onlyOwner
+    { securityCheckURI = _uri; }
+
     /**
      * @dev Payment for builded contract and a request for release of shares
      * @param _contract is address contract
      * @notice Called after builded contract
      */
     function deal(address _contract) internal {
-        if (msg.value < buildingCostWei)                   throw;
-        if (!msg.sender.send(msg.value - buildingCostWei)) throw;
-
-        TokenEther(cashflow.credits()).refill.value(buildingCostWei)();
-        cashflow.credits().approve(cashflow, buildingCostWei);
-        cashflow.fundback(proposal, buildingCostWei);
-        getContractsOf[msg.sender].push(_contract);
         Builded(msg.sender, _contract);
+        getContractsOf[msg.sender].push(_contract);
+
+        if (buildingCostWei > 0 && beneficiary != 0) {
+            if (   msg.value < buildingCostWei
+               || !msg.sender.send(msg.value - buildingCostWei)
+               || !beneficiary.send(buildingCostWei)
+               ) throw;
+        }
     }
 }
diff --git a/sol/builder/BuilderACLStorage.sol b/sol/builder/BuilderACLStorage.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderACLStorage contract
  */
 contract BuilderACLStorage is Builder {
-    function BuilderACLStorage(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @return address new contract

diff --git a/sol/builder/BuilderBase.sol b/sol/builder/BuilderBase.sol
@@ -1,9 +1,9 @@
-import 'common/Owned.sol';
+import 'common/Mortal.sol';
 
 /**
  * @title Builder based contract
  */
-contract BuilderBase is Owned {
+contract BuilderBase is Mortal {
     /* Addresses builded contracts at sender */
     mapping(address => address[]) public getContractsOf;
 

diff --git a/sol/builder/BuilderBoardOfDirectors.sol b/sol/builder/BuilderBoardOfDirectors.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderBoardOfDirectors contract
  */
 contract BuilderBoardOfDirectors is Builder {
-    function BuilderBoardOfDirectors(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _dao_core is a DAO core register

diff --git a/sol/builder/BuilderCashFlow.sol b/sol/builder/BuilderCashFlow.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderCashFlow contract
  */
 contract BuilderCashFlow is Builder {
-    function BuilderCashFlow(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _credits is address credits token

diff --git a/sol/builder/BuilderCore.sol b/sol/builder/BuilderCore.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderCore contract
  */
 contract BuilderCore is Builder {
-    function BuilderCore(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _name is DAO name

diff --git a/sol/builder/BuilderCrowdSale.sol b/sol/builder/BuilderCrowdSale.sol
@@ -11,10 +11,6 @@ import './Builder.sol';
  * @title BuilderStart contract
  */
 contract BuilderCrowdSale is Builder {
-    function BuilderCrowdSale(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _target is a target address for send given credits of success end

diff --git a/sol/builder/BuilderDAO.sol b/sol/builder/BuilderDAO.sol
@@ -10,10 +10,6 @@ import 'creator/CreatorCore.sol';
 import './Builder.sol';
 
 contract BuilderDAO is Builder {
-    function BuilderDAO(uint _price, address _cashflow, address _proposal)
-             Builder(_price, _cashflow, _proposal)
-    {}
-
     function create(string _dao_name, string _dao_description,
                     string _shares_name, string _shares_symbol, uint _shares_count) {
         // DAO core

diff --git a/sol/builder/BuilderDAOMarketRegulator.sol b/sol/builder/BuilderDAOMarketRegulator.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderDAOMarketRegulator contract
  */
 contract BuilderDAOMarketRegulator is Builder {
-    function BuilderDAOMarketRegulator(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _shares is address shares token

diff --git a/sol/builder/BuilderMarket.sol b/sol/builder/BuilderMarket.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderMarket contract
  */
 contract BuilderMarket is Builder {
-    function BuilderMarket(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @return address new contract

diff --git a/sol/builder/BuilderMarketRuleConstant.sol b/sol/builder/BuilderMarketRuleConstant.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderMarketRuleConstant contract
  */
 contract BuilderMarketRuleConstant is Builder {
-    function BuilderMarketRuleConstant(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _emission is how amount of tokens should be emissed

diff --git a/sol/builder/BuilderOffer.sol b/sol/builder/BuilderOffer.sol
@@ -6,12 +6,12 @@
 //
 
 import 'creator/CreatorOffer.sol';
-import './BuilderBase.sol';
+import './Builder.sol';
 
 /**
  * @title BuilderOffer contract
  */
-contract BuilderOffer is BuilderBase {
+contract BuilderOffer is Builder {
     /**
      * @dev Run script creation contract
      * @param _description is a short description

diff --git a/sol/builder/BuilderShareSale.sol b/sol/builder/BuilderShareSale.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title ShareSale contract builder
  */
 contract BuilderShareSale is Builder {
-    function BuilderShareSale(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _target is a target of funds

diff --git a/sol/builder/BuilderShareholder.sol b/sol/builder/BuilderShareholder.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderShareholder contract
  */
 contract BuilderShareholder is Builder {
-    function BuilderShareholder(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _shares is a shares token address

diff --git a/sol/builder/BuilderToken.sol b/sol/builder/BuilderToken.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderToken contract
  */
 contract BuilderToken is Builder {
-    function BuilderToken(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _name is name token

diff --git a/sol/builder/BuilderTokenEmission.sol b/sol/builder/BuilderTokenEmission.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderTokenEmission contract
  */
 contract BuilderTokenEmission is Builder {
-    function BuilderTokenEmission(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _name is name token

diff --git a/sol/builder/BuilderTokenEmissionACL.sol b/sol/builder/BuilderTokenEmissionACL.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderTokenEmissionACL contract
  */
 contract BuilderTokenEmissionACL is Builder {
-    function BuilderTokenEmissionACL(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _name is name token

diff --git a/sol/builder/BuilderTokenEther.sol b/sol/builder/BuilderTokenEther.sol
@@ -12,10 +12,6 @@ import './Builder.sol';
  * @title BuilderTokenEther contract
  */
 contract BuilderTokenEther is Builder {
-    function BuilderTokenEther(uint _buildingCost, address _cashflow, address _proposal)
-             Builder(_buildingCost, _cashflow, _proposal)
-    {}
-
     /**
      * @dev Run script creation contract
      * @param _name is name token