merge 000-instance-factory

README.md

@@ -14,4 +14,6 @@ Usage:
 | Contract                               | Deploy | Test | UI  |
 | -------------------------------------- | ------ | ---- | --- |
 | token/TestToken                        | Yes    | Yes  | Yes |
-| token/ERC20Token                       | No     | Yes  | Yes |
+| token/ERC20Token                       | No     | Yes  | Yes |
+| deploy/Instance                        | No     | No   | No  |
+| deploy/Factory                         | No     | No   | No  |

config/contracts.json

@@ -23,7 +23,16 @@
       },
       "MiniMeTokenFactory": {
         "deploy": true
-      }
+      },
+      "Factory": {
+        "deploy": false
+      },
+      "Instance": { 
+        "deploy": false
+      },
+      "UpdatableInstance": { 
+        "deploy": false
+      } 
     }
   }
 }

contracts/deploy/DelegatedCall.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.23;
 
 
 /**
@@ -8,6 +8,10 @@ pragma solidity ^0.4.21;
  *      Important to avoid overwriting wrong storage pointers is that never define storage to this contract
  */
 contract DelegatedCall {
+
+    constructor() internal {
+
+    }
     /**
      * @dev delegates the call of this function
      */

contracts/deploy/Factory.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.23;
 
 import "../common/Controlled.sol";
 
@@ -19,7 +19,7 @@ contract Factory is Controlled {
     uint256 latestUpdate;
     address latestKernel;
 
-    function Factory(address _kernel)
+    constructor(address _kernel)
         public 
     {
         _setKernel(_kernel);

contracts/deploy/Instance.sol

@@ -10,7 +10,7 @@ import "./DelegatedCall.sol";
  */
 contract Instance is InstanceStorage, DelegatedCall {
 
-    function Instance(address _kernel) public {
+    constructor(address _kernel) public {
         kernel = _kernel;
     }
 

contracts/deploy/InstanceStorage.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.23;
 
 
 /**
@@ -12,4 +12,5 @@ contract InstanceStorage {
     // protected zone start (InstanceStorage vars)
     address public kernel;
     // protected zone end
+    constructor() internal { }
 }

contracts/deploy/UpdatableInstance.sol

@@ -1,4 +1,4 @@
-pragma solidity ^0.4.17;
+pragma solidity ^0.4.23;
 
 import "./Instance.sol";
 
@@ -12,7 +12,7 @@ contract UpdatableInstance is Instance {
 
     event InstanceUpdated(address oldKernel, address newKernel);
 
-    function UpdatableInstance(address _kernel) 
+    constructor(address _kernel) 
         Instance(_kernel) 
         public
     {
@@ -21,7 +21,7 @@ contract UpdatableInstance is Instance {
     
     function updateUpdatableInstance(address _kernel) external {
         require(msg.sender == address(this));
-        InstanceUpdated(kernel, _kernel);
+        emit InstanceUpdated(kernel, _kernel);
         kernel = _kernel;
     }