Merge pull request #735 from embark-framework/bugfix/allow-zero-config-blockchain

Allow zero config in blockchain

lib/core/config.js

@@ -187,6 +187,12 @@ Config.prototype.loadBlockchainConfigFile = function() {
   if (!configFilePath) {
     this.blockchainConfig.default = true;
   }
+  if(!this.blockchainConfig.account && !this.blockchainConfig.isDev) {
+    this.logger.warn(
+      __('Account settings are needed for this chain.' +
+         ' Please put a valid address and possibly a password in your blockchain config or use a dev chain.')
+    );
+  }
 };
 
 Config.prototype.loadContractsConfigFile = function() {

lib/core/processes/processLauncher.js

@@ -3,6 +3,7 @@ const constants = require('../../constants');
 const path = require('path');
 const utils = require('../../utils/utils');
 
+let processCount = 1;
 class ProcessLauncher {
 
   /**
@@ -15,7 +16,14 @@ class ProcessLauncher {
    */
   constructor(options) {
     this.name = path.basename(options.modulePath);
-    this.process = child_process.fork(options.modulePath);
+
+    if (this._isDebug()) {
+      const childOptions = {stdio: 'pipe', execArgv: ['--inspect-brk=' + (60000 + processCount)]};
+      processCount++;
+      this.process = child_process.fork(options.modulePath, [], childOptions);
+    } else {
+      this.process = child_process.fork(options.modulePath);
+    }
     this.logger = options.logger;
     this.events = options.events;
     this.silent = options.silent;
@@ -25,6 +33,11 @@ class ProcessLauncher {
     this._subscribeToMessages();
   }
 
+  _isDebug() {
+    const argvString= process.execArgv.join();
+    return argvString.includes('--debug') || argvString.includes('--inspect');
+  }
+
   // Subscribes to messages from the child process and delegates to the right methods
   _subscribeToMessages() {
     const self = this;

lib/modules/blockchain_connector/index.js

@@ -82,7 +82,7 @@ class BlockchainConnector {
             if (!networkId && constants.blockchain.networkIds[self.blockchainConfig.networkType]) {
               networkId = constants.blockchain.networkIds[self.blockchainConfig.networkType];
             }
-            if (id.toString() !== networkId.toString()) {
+            if (networkId && id.toString() !== networkId.toString()) {
               self.logger.warn(__('Connected to a blockchain node on network {{realId}} while your config specifies {{configId}}', {realId: id, configId: networkId}));
               self.logger.warn(__('Make sure you started the right blockchain node'));
             }

lib/modules/blockchain_process/blockchain.js

@@ -155,7 +155,7 @@ Blockchain.prototype.run = function() {
     }
   ], function (err, cmd, args) {
     if (err) {
-      console.error(err);
+      console.error(err.message);
       return;
     }
     args = utils.compact(args);

lib/modules/ens/index.js

@@ -217,11 +217,7 @@ class ENS {
           "ENS": {
             "deploy": false,
             "silent": true
-          }
+          },
-        }
-      },
-      "development": {
-        "contracts": {
           "ENSRegistry": {
             "deploy": true,
             "silent": true,
@@ -285,7 +281,7 @@ class ENS {
     if (this.registration && this.registration.rootDomain) {
       // Register root domain if it is defined
       const rootNode = namehash.hash(this.registration.rootDomain);
-      config.development.contracts['FIFSRegistrar'] = {
+      config.default.contracts['FIFSRegistrar'] = {
         "deploy": true,
         "silent": true,
         "args": ["$ENSRegistry", rootNode],