Don't hardcode the network id for the account CLI

Author: joojis

Cargo.lock

@@ -10,6 +10,7 @@ clap = { version = "2", features = ["yaml"] }
 codechain-core = { path = "core" }
 codechain-discovery = { path = "discovery" }
 codechain-finally = { path = "util/finally" }
+codechain-json = { path = "json" }
 codechain-logger = { path = "util/logger" }
 codechain-key = { path = "key" }
 codechain-keystore = { path = "keystore" }

Cargo.toml

@@ -200,6 +200,11 @@ subcommands:
                 value_name: PATH
                 help: Specify the path for JSON key files to be found
                 takes_value: true
+            - chain:
+                short: c
+                long: chain
+                help: Set the blockchain type out of solo, solo_authority, tendermint, cuckoo, blake_pow, husky or a path to chain scheme file.
+                takes_value: true
         subcommands:
             - create:
                 about: create account

codechain/codechain.yml

@@ -30,6 +30,7 @@ extern crate serde_json;
 extern crate app_dirs;
 extern crate codechain_core as ccore;
 extern crate codechain_discovery as cdiscovery;
+extern crate codechain_json as cjson;
 extern crate codechain_key as ckey;
 extern crate codechain_keystore as ckeystore;
 #[macro_use]

codechain/main.rs

@@ -15,11 +15,13 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use std::fs;
+use std::io::Read;
 use std::str::FromStr;
 
 use rpassword;
 
 use ccore::AccountProvider;
+use cjson::scheme::Scheme;
 use ckey::{NetworkId, Password, PlatformAddress, Private};
 use ckeystore::accounts_dir::RootDiskDirectory;
 use ckeystore::KeyStore;
@@ -41,8 +43,8 @@ pub fn run_account_command(matches: ArgMatches) -> Result<(), String> {
     let dir = RootDiskDirectory::create(keys_path).expect("Cannot read key path directory");
     let keystore = KeyStore::open(Box::new(dir)).unwrap();
     let ap = AccountProvider::new(keystore);
-    // FIXME: Don't hardcode network_id.
-    let network_id: NetworkId = "tc".into();
+    let chain = matches.value_of("chain").unwrap_or("solo");
+    let network_id: NetworkId = read_network_id(chain).expect("Cannot read a network id");
 
     match matches.subcommand() {
         ("create", _) => create(&ap, network_id),
@@ -163,3 +165,22 @@ fn read_password_and_confirm() -> Option<Password> {
         None
     }
 }
+
+fn read_network_id(chain: &str) -> Result<NetworkId, String> {
+    let mut contents = String::new();
+    let reader: &[u8] = match chain {
+        "solo" => include_bytes!("../../core/res/solo.json"),
+        "soloAuthority" => include_bytes!("../../core/res/solo_authority.json"),
+        "tendermint" => include_bytes!("../../core/res/tendermint.json"),
+        "cuckoo" => include_bytes!("../../core/res/cuckoo.json"),
+        "blake_pow" => include_bytes!("../../core/res/blake_pow.json"),
+        "husky" => include_bytes!("../../core/res/husky.json"),
+        filename => {
+            fs::File::open(filename)
+                .and_then(|mut file| file.read_to_string(&mut contents))
+                .map_err(|e| format!("Failed to load the scheme file at {}: {}", filename, e))?;
+            contents.as_ref()
+        }
+    };
+    Ok(Scheme::load(reader).map_err(|e| format!("Failed to load the scheme file: {}", e))?.params.network_id)
+}