Make to compile

MiniMeToken.sol

@@ -177,10 +177,10 @@ contract MiniMeToken is Controlled {
     function transferFrom(address _from, address _to, uint256 _amount
     ) returns (bool success) {
 
-        /// @dev The controller of this contract can move tokens around at will,
-        ///  this is important to recognize! Confirm that you trust the
-        ///  controller of this contract, which in most situations should be
-        ///  another open source smart contract or 0x0
+        // The controller of this contract can move tokens around at will,
+        //  this is important to recognize! Confirm that you trust the
+        //  controller of this contract, which in most situations should be
+        //  another open source smart contract or 0x0
         if (msg.sender != controller) {
             if (!transfersEnabled) throw;
 
@@ -516,6 +516,7 @@ contract MiniMeToken is Controlled {
     /// @return True if `_addr` is a contract
     function isContract(address _addr) constant internal returns(bool) {
         uint size;
+        if (_addr == 0) return false;
         assembly {
             size := extcodesize(_addr)
         }
@@ -531,6 +532,8 @@ contract MiniMeToken is Controlled {
                 throw;
         } else {
             throw;
+        }
+    }
 
 
 ////////////////

README.md

@@ -58,3 +58,13 @@ If this token contract is used as the base token, then clones of itself can be e
 8. Lots of other applications including all the applications the standard ERC 20 token can be used for.
 
 All these applications and more are enabled by the MiniMe Token Contract. The most amazing part being that anyone that wants to add these features can, in a permissionless yet safe manner without affecting the parent token's intended functionality.
+
+# How to deploy a campaign
+
+1. Deploy the MinimeTokenFactory
+2. Deploy the MinimeToken
+3. Deploy the campaig
+4. Assign the controller of the MinimeToken to the campaign.
+
+
+

SampleCampaign-TokenController.sol

@@ -78,7 +78,8 @@ contract Campaign is TokenController, Owned {
         uint _endFundingTime,
         uint _maximumFunding,
         address _vaultAddress,
-        address _tokenAddress
+        address _tokenAddress,
+
     ) {
         if ((_endFundingTime < now) ||                // Cannot end in the past
             (_endFundingTime <= _startFundingTime) ||

TokenControllerABI.json

@@ -1 +0,0 @@
-[ { "constant": true, "inputs": [], "name": "vaultContract", "outputs": [ { "name": "", "type": "address", "value": "0x8bb119f1557685fd6c8fb89dc4bf5a9550050ed6" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [], "name": "seal", "outputs": [], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_from", "type": "address" }, { "name": "_to", "type": "address" }, { "name": "_amount", "type": "uint256" } ], "name": "onTransfer", "outputs": [ { "name": "", "type": "bool" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "tokenContract", "outputs": [ { "name": "", "type": "address", "value": "0x19f7f6292595ca137f4a743527e3e773d663b161" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "data", "type": "uint256[]" } ], "name": "fill", "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "getOwner", "outputs": [ { "name": "", "type": "address", "value": "0xc6bd0efffa610c2bea8449c86c975a477eae9699" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "maximumFunding", "outputs": [ { "name": "", "type": "uint256", "value": "1e+22" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [], "name": "finalizeFunding", "outputs": [], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_newOwner", "type": "address" } ], "name": "changeOwner", "outputs": [], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "startFundingTime", "outputs": [ { "name": "", "type": "uint256", "value": "1478640923" } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_owner", "type": "address" }, { "name": "_spender", "type": "address" }, { "name": "_amount", "type": "uint256" } ], "name": "onApprove", "outputs": [ { "name": "", "type": "bool" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "totalCollected", "outputs": [ { "name": "", "type": "uint256", "value": "302100000000000000000" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "endFundingTime", "outputs": [ { "name": "", "type": "uint256", "value": "1489009223" } ], "payable": false, "type": "function" }, { "constant": true, "inputs": [], "name": "sealed", "outputs": [ { "name": "", "type": "bool", "value": false } ], "payable": false, "type": "function" }, { "constant": false, "inputs": [ { "name": "_owner", "type": "address" } ], "name": "proxyPayment", "outputs": [ { "name": "", "type": "bool" } ], "payable": true, "type": "function" }, { "inputs": [ { "name": "_startFundingTime", "type": "uint256" }, { "name": "_endFundingTime", "type": "uint256" }, { "name": "_maximumFunding", "type": "uint256" }, { "name": "_vaultContract", "type": "address" }, { "name": "_tokenContract", "type": "address" } ], "payable": false, "type": "constructor" }, { "payable": true, "type": "fallback" } ]

TokenFactoryABI.json

@@ -1 +0,0 @@
-[ { "constant": false, "inputs": [ { "name": "_parentToken", "type": "address" }, { "name": "_snapshotBlock", "type": "uint256" }, { "name": "_tokenName", "type": "string" }, { "name": "_decimalUnits", "type": "uint8" }, { "name": "_tokenSymbol", "type": "string" }, { "name": "_transfersEnabled", "type": "bool" } ], "name": "createCloneToken", "outputs": [ { "name": "", "type": "address" } ], "payable": false, "type": "function" } ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minime",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "MiniMe contract",
   "main": "index.js",
   "directories": {
@@ -31,6 +31,6 @@
   },
   "homepage": "https://github.com/Giveth/minime",
   "dependencies": {
-    "ethconnector": "0.0.19"
+    "ethconnector": "0.0.21"
   }
 }