From a09ae900cd35d8b8b861a93f6f6458e2af425746 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Fri, 11 May 2018 10:23:52 -0400
Subject: [PATCH] update default dev networkid to be the same as --dev option
 chainId

---
 lib/cmds/blockchain/blockchain.js            | 2 +-
 templates/boilerplate/config/blockchain.json | 3 ++-
 templates/demo/config/blockchain.json        | 3 ++-
 test_apps/contracts_app/blockchain.json      | 3 ++-
 test_apps/test_app/config/blockchain.json    | 3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/cmds/blockchain/blockchain.js b/lib/cmds/blockchain/blockchain.js
index d0fa21372..8726d2b4c 100644
--- a/lib/cmds/blockchain/blockchain.js
+++ b/lib/cmds/blockchain/blockchain.js
@@ -23,7 +23,7 @@ var Blockchain = function(options) {
     rpcHost: this.blockchainConfig.rpcHost || 'localhost',
     rpcPort: this.blockchainConfig.rpcPort || 8545,
     rpcCorsDomain: this.blockchainConfig.rpcCorsDomain || false,
-    networkId: this.blockchainConfig.networkId || 12301,
+    networkId: this.blockchainConfig.networkId || 1337,
     port: this.blockchainConfig.port || 30303,
     nodiscover: this.blockchainConfig.nodiscover || false,
     mine: this.blockchainConfig.mine || false,
diff --git a/templates/boilerplate/config/blockchain.json b/templates/boilerplate/config/blockchain.json
index a7f318786..b72f107a1 100644
--- a/templates/boilerplate/config/blockchain.json
+++ b/templates/boilerplate/config/blockchain.json
@@ -2,9 +2,10 @@
   "development": {
     "enabled": true,
     "networkType": "custom",
+    "networkId": "1337",
+    "isDev": true,
     "genesisBlock": "config/development/genesis.json",
     "datadir": ".embark/development/datadir",
-    "isDev": true,
     "mineWhenNeeded": true,
     "nodiscover": true,
     "maxpeers": 0,
diff --git a/templates/demo/config/blockchain.json b/templates/demo/config/blockchain.json
index 5743c38dd..8e299188a 100644
--- a/templates/demo/config/blockchain.json
+++ b/templates/demo/config/blockchain.json
@@ -2,9 +2,10 @@
   "development": {
     "enabled": true,
     "networkType": "custom",
+    "networkId": "1337",
+    "isDev": true,
     "genesisBlock": "config/development/genesis.json",
     "datadir": ".embark/development/datadir",
-    "isDev": true,
     "mineWhenNeeded": true,
     "nodiscover": true,
     "maxpeers": 0,
diff --git a/test_apps/contracts_app/blockchain.json b/test_apps/contracts_app/blockchain.json
index a574d4006..ee5b1b968 100644
--- a/test_apps/contracts_app/blockchain.json
+++ b/test_apps/contracts_app/blockchain.json
@@ -2,9 +2,10 @@
   "development": {
     "enabled": true,
     "networkType": "custom",
+    "networkId": "1337",
+    "isDev": true,
     "genesisBlock": "development/genesis.json",
     "datadir": ".embark/development/datadir",
-    "isDev": true,
     "mineWhenNeeded": true,
     "nodiscover": true,
     "maxpeers": 0,
diff --git a/test_apps/test_app/config/blockchain.json b/test_apps/test_app/config/blockchain.json
index 2b9baa50d..d86d2c768 100644
--- a/test_apps/test_app/config/blockchain.json
+++ b/test_apps/test_app/config/blockchain.json
@@ -2,9 +2,10 @@
   "development": {
     "enabled": true,
     "networkType": "custom",
+    "networkId": "1337",
+    "isDev": true,
     "genesisBlock": "config/development/genesis.json",
     "datadir": ".embark/development/datadir",
-    "isDev": true,
     "mineWhenNeeded": true,
     "nodiscover": true,
     "maxpeers": 0,