diff --git a/boilerplate/config/blockchain.yml b/boilerplate/config/blockchain.yml index 49fb0add49..af51680041 100644 --- a/boilerplate/config/blockchain.yml +++ b/boilerplate/config/blockchain.yml @@ -14,6 +14,7 @@ development: account: init: true password: config/password + num: 1 staging: rpc_host: localhost rpc_port: 8101 @@ -22,6 +23,9 @@ staging: network_id: 0 max_peers: 4 console: true + bootnodes: + boot: false + enodes: [] #insert enode urls here. account: init: false address: @@ -33,6 +37,9 @@ production: network_id: 1 max_peers: 4 console: true + bootnodes: + boot: false + enodes: [] account: init: false address: diff --git a/lib/blockchain.js b/lib/blockchain.js index 9ab37a5c9a..3b03788a0f 100644 --- a/lib/blockchain.js +++ b/lib/blockchain.js @@ -69,6 +69,12 @@ Blockchain.prototype.run_command = function(address, use_tmp) { cmd += "--unlock " + address + " "; } + if (config.bootNodes.init == true){ + cmd += "--bootnodes "; + for (var i = 0; i < config.bootNodes.enodes.length; i++){ + cmd += config.bootNodes.enodes[i] + " "; + } + } if (config.console_toggle) { cmd += "console"; } diff --git a/lib/compiler.js b/lib/compiler.js index 89d9bf4c80..2006fd57a0 100644 --- a/lib/compiler.js +++ b/lib/compiler.js @@ -40,7 +40,9 @@ Compiler.prototype.compile_solidity = function(contractFile) { output = result.output; if (result.code === 1) { - throw new Error(result.output); + if (version == '0.1.1' || version == '0.1.0'){ + throw new Error(result.output); + } } json = JSON.parse(output).contracts; diff --git a/lib/config/blockchain.js b/lib/config/blockchain.js index d0dcdd50fb..33624bad17 100644 --- a/lib/config/blockchain.js +++ b/lib/config/blockchain.js @@ -30,6 +30,7 @@ BlockchainConfig.prototype.config = function(env) { else { networkId = config.network_id; } + config = { rpcHost: config.rpc_host, @@ -41,9 +42,10 @@ BlockchainConfig.prototype.config = function(env) { genesisBlock: config.genesis_block, datadir: config.datadir, chains: config.chains, + bootNodes: config.bootnodes, deployTimeout: config.deploy_timeout || 20, networkId: networkId, - maxPeers: 4, + maxPeers: config.max_peers || 4, port: config.port || "30303", console_toggle: config.console || false, mine_when_needed: config.mine_when_needed || false,