networkid in initialization of nodes

Author: TimDaub

cli.js

@@ -25,15 +25,15 @@ program
   .description("Run a Parity development node.")
   .action(cmd => {
     noAction = false;
-    run("parity", program.workdir);
+    run("parity", program.workdir, program.networkId);
   });
 
 program
   .command("geth")
   .description("Run a Geth development node.")
   .action(cmd => {
     noAction = false;
-    run("geth", program.workdir);
+    run("geth", program.workdir, program.networkId);
   });
 
 program.parse(process.argv);

main.js

@@ -27,9 +27,8 @@ function generateGenesis(client, balances, networkId) {
   const genesis = JSON.parse(
     JSON.stringify(require(`./genesis.${client}.json`))
   );
-  networkId = networkId || randomId();
   if (client === "geth") {
-    genesis.config.chainId = parseInt(networkId, 10);
+    genesis.config.chainId = networkId;
     genesis.extraData =
       "0x" +
       "0".repeat(64) +
@@ -71,7 +70,11 @@ function setup(client, workdir) {
 function provide(client, workdir, networkId) {
   const paths = getPaths(client, workdir);
   const keypairs = getKeypairs(KEYS_SOURCE, "password");
-  const genesis = generateGenesis(client, generateBalances(keypairs), networkId);
+  const genesis = generateGenesis(
+    client,
+    generateBalances(keypairs),
+    networkId
+  );
   let keysDest =
     client === "geth" ? paths.keys : path.join(paths.keys, genesis.name);
 
@@ -102,6 +105,7 @@ function provide(client, workdir, networkId) {
 }
 
 function run(client, workdir, networkId) {
+  networkId = parseInt(networkId, 10) || randomId();
   const paths = getPaths(client, workdir);
   setup(client, workdir);
   if (!fs.existsSync(paths.genesis)) {
@@ -150,7 +154,9 @@ function run(client, workdir, networkId) {
       "--unlock",
       keypairs.map(keypair => keypair.address).join(","),
       "--password",
-      paths.password
+      paths.password,
+      "--networkid",
+      networkId
     ];
   } else if (client === "parity") {
     args = [
@@ -160,7 +166,7 @@ function run(client, workdir, networkId) {
       paths.genesis,
       "--keys-path",
       paths.keys,
-      "--gasprice",
+      "--min-gas-price",
       "4000000000",
       "--jsonrpc-cors",
       "all",
@@ -170,7 +176,9 @@ function run(client, workdir, networkId) {
       "--unlock",
       keypairs.map(keypair => keypair.address).join(","),
       "--password",
-      paths.password
+      paths.password,
+      "--network-id",
+      networkId
     ];
   } else {
     throw `Client "${client}" is not supported`;