Add networkId to options

Author: TimDaub

cli.js

@@ -16,6 +16,10 @@ program
   .version(packageJson.version)
   .option("-w, --workdir <dir>", "Specify a working dir.", "ethnode-data");
 
+program
+  .version(packageJson.version)
+  .option("-n, --networkId <number>", "Specify a network ID.");
+
 program
   .command("parity")
   .description("Run a Parity development node.")
@@ -35,5 +39,5 @@ program
 program.parse(process.argv);
 
 if (noAction) {
-  run("geth", program.workdir);
+  run("geth", program.workdir, program.networkId);
 }

main.js

@@ -23,20 +23,21 @@ function getPaths(client, workdir) {
   };
 }
 
-function generateGenesis(client, balances) {
+function generateGenesis(client, balances, networkId) {
   const genesis = JSON.parse(
     JSON.stringify(require(`./genesis.${client}.json`))
   );
+  networkId = networkId || randomId();
   if (client === "geth") {
-    genesis.chainId = randomId();
+    genesis.config.chainId = parseInt(networkId, 10);
     genesis.extraData =
       "0x" +
       "0".repeat(64) +
       Object.keys(balances)[0].substr(2) +
       "0".repeat(130);
     genesis.alloc = { ...genesis.alloc, ...balances };
   } else if (client === "parity") {
-    genesis.params.networkID = randomId();
+    genesis.params.networkID = networkId;
     genesis.accounts = { ...genesis.accounts, ...balances };
   }
   return genesis;
@@ -67,10 +68,10 @@ function setup(client, workdir) {
   }
 }
 
-function provide(client, workdir) {
+function provide(client, workdir, networkId) {
   const paths = getPaths(client, workdir);
   const keypairs = getKeypairs(KEYS_SOURCE, "password");
-  const genesis = generateGenesis(client, generateBalances(keypairs));
+  const genesis = generateGenesis(client, generateBalances(keypairs), networkId);
   let keysDest =
     client === "geth" ? paths.keys : path.join(paths.keys, genesis.name);
 
@@ -100,11 +101,11 @@ function provide(client, workdir) {
   }
 }
 
-function run(client, workdir) {
+function run(client, workdir, networkId) {
   const paths = getPaths(client, workdir);
   setup(client, workdir);
   if (!fs.existsSync(paths.genesis)) {
-    provide(client, workdir);
+    provide(client, workdir, networkId);
   }
 
   const genesis = JSON.parse(fs.readFileSync(paths.genesis));