From 24d661a65e3d54c5c887aa32ab3b792690c4067a Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Fri, 28 Sep 2018 16:32:37 -0400
Subject: [PATCH] fix blockchain defaults for config-less dapps

---
 lib/core/config.js                           |  2 +-
 lib/modules/blockchain_process/blockchain.js | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/core/config.js b/lib/core/config.js
index ae45b6905..869f5fb75 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -195,7 +195,7 @@ Config.prototype.loadBlockchainConfigFile = function() {
 Config.prototype.loadContractsConfigFile = function() {
   var defaultVersions = {
     "web3": "1.0.0-beta",
-    "solc": "0.4.17"
+    "solc": "0.4.25"
   };
   var versions = utils.recursiveMerge(defaultVersions, this.embarkConfig.versions || {});
 
diff --git a/lib/modules/blockchain_process/blockchain.js b/lib/modules/blockchain_process/blockchain.js
index a6e993a4e..5aab89aeb 100644
--- a/lib/modules/blockchain_process/blockchain.js
+++ b/lib/modules/blockchain_process/blockchain.js
@@ -59,11 +59,18 @@ var Blockchain = function(options) {
     verbosity: this.blockchainConfig.verbosity
   };
 
-  if (this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') {
+  if (this.blockchainConfig === {} || this.blockchainConfig.default) {
     this.config.account = {};
-    this.config.account.password = fs.embarkPath("templates/boilerplate/config/development/password");
-    this.config.genesisBlock = fs.embarkPath("templates/boilerplate/config/development/genesis.json");
+    if (this.env === 'development') {
+      this.isDev = true;
+    } else {
+      this.config.account.password = fs.embarkPath("templates/boilerplate/config/privatenet/password");
+      this.config.genesisBlock = fs.embarkPath("templates/boilerplate/config/privatenet/genesis.json");
+    }
     this.config.datadir = fs.dappPath(".embark/development/datadir");
+    this.config.wsOrigins = "http://localhost:8000";
+    this.config.rpcCorsDomain = "http://localhost:8000";
+    this.config.targetGasLimit = 8000000;
   }
 
   const spaceMessage = 'The path for %s in blockchain config contains spaces, please remove them';