embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

update default dev networkid to be the same as --dev option chainId

This commit is contained in:
Iuri Matias 2018-05-11 10:23:52 -04:00
parent 81e0c9ce77
commit a09ae900cd
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cmds/blockchain/blockchain.js
View File

@ -23,7 +23,7 @@ var Blockchain = function(options) {
rpcHost: this.blockchainConfig.rpcHost || 'localhost', rpcHost: this.blockchainConfig.rpcHost || 'localhost',
rpcPort: this.blockchainConfig.rpcPort || 8545, rpcPort: this.blockchainConfig.rpcPort || 8545,
rpcCorsDomain: this.blockchainConfig.rpcCorsDomain || false, rpcCorsDomain: this.blockchainConfig.rpcCorsDomain || false,
networkId: this.blockchainConfig.networkId || 12301, networkId: this.blockchainConfig.networkId || 1337,
port: this.blockchainConfig.port || 30303, port: this.blockchainConfig.port || 30303,
nodiscover: this.blockchainConfig.nodiscover || false, nodiscover: this.blockchainConfig.nodiscover || false,
mine: this.blockchainConfig.mine || false, mine: this.blockchainConfig.mine || false,

3
templates/boilerplate/config/blockchain.json
View File

@ -2,9 +2,10 @@
"development": { "development": {
"enabled": true, "enabled": true,
"networkType": "custom", "networkType": "custom",
"networkId": "1337",
"isDev": true,
"genesisBlock": "config/development/genesis.json", "genesisBlock": "config/development/genesis.json",
"datadir": ".embark/development/datadir", "datadir": ".embark/development/datadir",
"isDev": true,
"mineWhenNeeded": true, "mineWhenNeeded": true,
"nodiscover": true, "nodiscover": true,
"maxpeers": 0, "maxpeers": 0,

3
templates/demo/config/blockchain.json
View File

@ -2,9 +2,10 @@
"development": { "development": {
"enabled": true, "enabled": true,
"networkType": "custom", "networkType": "custom",
"networkId": "1337",
"isDev": true,
"genesisBlock": "config/development/genesis.json", "genesisBlock": "config/development/genesis.json",
"datadir": ".embark/development/datadir", "datadir": ".embark/development/datadir",
"isDev": true,
"mineWhenNeeded": true, "mineWhenNeeded": true,
"nodiscover": true, "nodiscover": true,
"maxpeers": 0, "maxpeers": 0,

3
test_apps/contracts_app/blockchain.json
View File

@ -2,9 +2,10 @@
"development": { "development": {
"enabled": true, "enabled": true,
"networkType": "custom", "networkType": "custom",
"networkId": "1337",
"isDev": true,
"genesisBlock": "development/genesis.json", "genesisBlock": "development/genesis.json",
"datadir": ".embark/development/datadir", "datadir": ".embark/development/datadir",
"isDev": true,
"mineWhenNeeded": true, "mineWhenNeeded": true,
"nodiscover": true, "nodiscover": true,
"maxpeers": 0, "maxpeers": 0,

3
test_apps/test_app/config/blockchain.json
View File

@ -2,9 +2,10 @@
"development": { "development": {
"enabled": true, "enabled": true,
"networkType": "custom", "networkType": "custom",
"networkId": "1337",
"isDev": true,
"genesisBlock": "config/development/genesis.json", "genesisBlock": "config/development/genesis.json",
"datadir": ".embark/development/datadir", "datadir": ".embark/development/datadir",
"isDev": true,
"mineWhenNeeded": true, "mineWhenNeeded": true,
"nodiscover": true, "nodiscover": true,
"maxpeers": 0, "maxpeers": 0,