added ability to boot nodes via a list
This commit is contained in:
parent
e084b53dc1
commit
b3cec8287b
|
@ -23,6 +23,9 @@ staging:
|
||||||
network_id: 0
|
network_id: 0
|
||||||
max_peers: 4
|
max_peers: 4
|
||||||
console: true
|
console: true
|
||||||
|
bootnodes:
|
||||||
|
boot: false
|
||||||
|
enodes: [] #insert enode urls here.
|
||||||
account:
|
account:
|
||||||
init: false
|
init: false
|
||||||
address:
|
address:
|
||||||
|
@ -34,6 +37,9 @@ production:
|
||||||
network_id: 1
|
network_id: 1
|
||||||
max_peers: 4
|
max_peers: 4
|
||||||
console: true
|
console: true
|
||||||
|
bootnodes:
|
||||||
|
boot: false
|
||||||
|
enodes: []
|
||||||
account:
|
account:
|
||||||
init: false
|
init: false
|
||||||
address:
|
address:
|
||||||
|
|
|
@ -69,6 +69,12 @@ Blockchain.prototype.run_command = function(address, use_tmp) {
|
||||||
cmd += "--unlock " + address + " ";
|
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) {
|
if (config.console_toggle) {
|
||||||
cmd += "console";
|
cmd += "console";
|
||||||
}
|
}
|
||||||
|
@ -105,15 +111,12 @@ Blockchain.prototype.get_address = function() {
|
||||||
console.log("=== already initialized");
|
console.log("=== already initialized");
|
||||||
address = result.output.match(/{(\w+)}/)[1];
|
address = result.output.match(/{(\w+)}/)[1];
|
||||||
} else {
|
} else {
|
||||||
console.log("running: " + this.init_command() + " " + this.account.num + " time(s)");
|
console.log("running: " + this.init_command());
|
||||||
result = '';
|
result = exec(this.init_command());
|
||||||
for (var i = 0; i < this.account.num; i++){
|
address = result.output.match(/{(\w+)}/)[1];
|
||||||
result = exec(this.init_command()) + '\n';
|
|
||||||
address = result.output.match(/{(\w+)}/)[1]; //TODO: Write a proper reg expression to match multiple lines of output...not my forte
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (this.account.num > 1) return exec(this.list_command());
|
|
||||||
return address;
|
return address;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,7 @@ BlockchainConfig.prototype.config = function(env) {
|
||||||
networkId = config.network_id;
|
networkId = config.network_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
rpcHost: config.rpc_host,
|
rpcHost: config.rpc_host,
|
||||||
rpcPort: config.rpc_port,
|
rpcPort: config.rpc_port,
|
||||||
|
@ -41,9 +42,10 @@ BlockchainConfig.prototype.config = function(env) {
|
||||||
genesisBlock: config.genesis_block,
|
genesisBlock: config.genesis_block,
|
||||||
datadir: config.datadir,
|
datadir: config.datadir,
|
||||||
chains: config.chains,
|
chains: config.chains,
|
||||||
|
bootNodes: config.bootnodes,
|
||||||
deployTimeout: config.deploy_timeout || 20,
|
deployTimeout: config.deploy_timeout || 20,
|
||||||
networkId: networkId,
|
networkId: networkId,
|
||||||
maxPeers: 4,
|
maxPeers: config.max_peers || 4,
|
||||||
port: config.port || "30303",
|
port: config.port || "30303",
|
||||||
console_toggle: config.console || false,
|
console_toggle: config.console || false,
|
||||||
mine_when_needed: config.mine_when_needed || false,
|
mine_when_needed: config.mine_when_needed || false,
|
||||||
|
|
Loading…
Reference in New Issue