Update chain id arguments handling

.gitignore

@@ -1,5 +1,5 @@
 /target/
-**/*.rs.bk
+*.rs.bk
 .idea/
 *.iml
 Cargo.lock

README.md

@@ -43,7 +43,7 @@ FLAGS:
 
 OPTIONS:
     -p, --base-path <base-path>    Set path for chain storage
-    -c, --chain <chain>            Sets a chain name [default: mainnet]
+    -c, --chain <chain>            Sets a chain name [default: etc]
 
 SUBCOMMANDS:
     account        Account related commands

cli.bats

@@ -37,14 +37,14 @@ teardown() {
     [[ "$output" == *"SUBCOMMANDS"* ]]
 }
 
-@test "succeeds: --chain=morden account new [empty options]" {
-    run $EMERALD_VAULT --chain=morden account new <<< $'foo\n'
+@test "succeeds: --chain=etc-test account new [empty options]" {
+    run $EMERALD_CLI --chain=etc-test account new <<< $'foo\n'
     [ "$status" -eq 0 ]
     [[ "$output" == *"Created new account"* ]]
 }
 
-@test "succeeds: --chain=mainnet new --security=high --name='Test account' --description='Some description'" {
-    run $EMERALD_VAULT --chain=mainnet \
+@test "succeeds: --chain=etc-main new --security=high --name='Test account' --description='Some description'" {
+    run $EMERALD_CLI --chain=etc-main \
         account new \
         --security-level=high \
         --name="Test account" \
@@ -55,7 +55,7 @@ teardown() {
 }
 
 @test "succeeds: account list" {
-    run $EMERALD_VAULT --chain=morden \
+    run $EMERALD_CLI --chain=etc-test \
         account new \
         <<< $'foo\n'
     [ "$status" -eq 0 ]
@@ -69,7 +69,7 @@ teardown() {
     [[ "$address" != "" ]]
     [[ "$address" == *"0x"* ]]
 
-    run $EMERALD_VAULT --chain=morden account list
+    run $EMERALD_CLI --chain=etc-test account list
     echo "$output" # prints in case fails
     echo "$address"
 
@@ -78,7 +78,7 @@ teardown() {
 }
 
 @test "succeeds: account update" {
-    run $EMERALD_VAULT --chain=morden account new \
+    run $EMERALD_CLI --chain=etc-test account new \
         <<< $'foo\n'
     [ "$status" -eq 0 ]
     [[ "$output" == *"Created new account"* ]]
@@ -91,20 +91,20 @@ teardown() {
     [[ "$address" != "" ]]
     [[ "$address" == *"0x"* ]]
 
-    run $EMERALD_VAULT --chain=morden account update \
+    run $EMERALD_CLI --chain=etc-test account update \
         "$address" \
         --name="new name" \
         --description="new description"
     [ "$status" -eq 0 ]
 
-    run $EMERALD_VAULT --chain=morden account list
+    run $EMERALD_CLI --chain=etc-test account list
 
     [ "$status" -eq 0 ]
     [[ "$output" == *"new name"* ]]
 }
 
 @test "succeeds: account strip" {
-    run $EMERALD_VAULT --chain=morden account new \
+    run $EMERALD_CLI --chain=etc-test account new \
         <<< $'foo\n'
     [ "$status" -eq 0 ]
     [[ "$output" == *"Created new account"* ]]
@@ -117,7 +117,7 @@ teardown() {
     [[ "$address" != "" ]]
     [[ "$address" == *"0x"* ]]
 
-    run $EMERALD_VAULT --chain=morden account strip \
+    run $EMERALD_CLI --chain=etc-test account strip \
         "$address" \
         <<< $'foo\n'
 
@@ -126,7 +126,7 @@ teardown() {
 }
 
 @test "succeeds: account hide && unhide" {
-    run $EMERALD_VAULT --chain=morden account new \
+    run $EMERALD_CLI --chain=etc-test account new \
         <<< $'foo\n'
     [ "$status" -eq 0 ]
     [[ "$output" == *"Created new account"* ]]
@@ -140,22 +140,22 @@ teardown() {
     [[ "$address" == *"0x"* ]]
 
     # Hide account.
-    run $EMERALD_VAULT --chain=morden account hide \
+    run $EMERALD_CLI --chain=etc-test account hide \
         "$address"
     [ "$status" -eq 0 ]
 
     # Ensure is hidden; doesn't show up in list.
-    run $EMERALD_VAULT --chain=morden account list \
+    run $EMERALD_CLI --chain=etc-test account list \
 
     [ "$status" -eq 0 ]
     [[ "$output" != *"$address"* ]]
 
     # Unhide account.
-    run $EMERALD_VAULT --chain=morden account unhide \
+    run $EMERALD_CLI --chain=etc-test account unhide \
         "$address"
 
     # Ensure is not hidden; shows up in list.
-    run $EMERALD_VAULT --chain=morden account list
+    run $EMERALD_CLI --chain=etc-test account list
 
     [ "$status" -eq 0 ]
     [[ "$output" == *"$address"* ]]

cli.yml

@@ -22,9 +22,11 @@ args:
         short: c
         long: chain
         help: Sets a chain name
-        default_value: mainnet
+        default_value: etc-main
         takes_value: true
 subcommands:
+    - migrate:
+        about: Migrate to a new storage  structure
     - server:
         about: Start local RPC server
         args:

docs/usage.adoc

@@ -19,7 +19,7 @@ FLAGS:
 
 OPTIONS:
     -p, --base-path <base-path>    Set path for chain storage
-    -c, --chain <chain>            Sets a chain name [default: mainnet]
+    -c, --chain <chain>            Sets a chain name [default: etc-main]
 
 SUBCOMMANDS:
     account        Account related commands
@@ -64,13 +64,25 @@ Environment variables allow you to redefine the default settings:
 
 * `EMERALD_HOST` - RPC server listen host
 * `EMERALD_PORT` - RPC server listen port
-* `EMERALD_CHAIN` - chain name (`mainnet` | `morden`), has a higher priority relative to `EMERALD_CHAIN_ID`
+* `EMERALD_CHAIN` - chain name (see Table.1, `CLI argument` column), has a higher priority relative to `EMERALD_CHAIN_ID`
 * `EMERALD_CHAIN_ID` - chain id number, has a lower priority relative to `EMERALD_CHAIN`
 * `EMERALD_GAS` - maximum gas limit to use by transaction
 * `EMERALD_GAS_PRICE` - gas cost to use by transaction (in Gwei)
 * `EMERALD_SECURITY_LEVEL` - security level (`normal` | `high` | `ultra`)
 * `EMERALD_NODE` - url to upstream node. Used for sign and send of transactions
 
+| Chain id  | Description                       | CLI argument   |
+|-----------|-----------------------------------|----------------|
+| 1         | Ethereum mainnet                  | eth            |
+| 2         | Morden (disused), Expanse mainnet | morden         |
+| 3         | Ropsten                           | ropsten        |
+| 4         | Rinkeby                           | rinkeby        |
+| 30        | Rootstock mainnet                 | rootstock-main |
+| 31        | Rootstock testnet                 | rootstock-test |
+| 42        | Kovan                             | kovan          |
+| 61        | Ethereum Classic mainnet          | etc-main       |
+| 62        | Ethereum Classic testnet          | etc-test       |
+                Table 1. Chain id and name
 
 ## Output details level
 
@@ -82,4 +94,4 @@ Will set verbose level to 1 - only info messages.
 
 # emerald-vault -vv
 
-Will set verbose level to 2 - info and debug messages.
+Will set verbose level to 2 - info and debug messages.

src/cmd/migrate.rs

@@ -0,0 +1,33 @@
+//! # Storage migration related commands
+
+use super::ExecResult;
+use std::path::Path;
+
+/// Migrate storage from old scheme to new
+///
+/// # Arguments:
+///
+/// *
+///
+// /home/k2/.emerald
+// ├── [4.0K]  mainnet
+// │   ├── [4.0K]  addressbook
+// │   ├── [4.0K]  contracts
+// │   │   ├── [1.8K]  0x0047201aed0b69875b24b614dda0270bcd9f11cc.json
+// │   │   └── [  78]  0x085fb4f24031eaedbc2b611aa528f22343eb52db.json
+// │   └── [4.0K]  keystore
+// ├── [4.0K]  morden
+// │   ├── [4.0K]  addressbook
+// │   ├── [4.0K]  contracts
+// │   └── [4.0K]  keystore
+// └── [4.0K]  testnet
+//     ├── [4.0K]  contracts
+//     └── [4.0K]  keystore
+
+pub fn migrate_cmd() -> ExecResult {
+    println!("{}", Path::new("/home/.emerald/mainnet").exists());
+    println!("{}", Path::new("/home/.emerald/morden").exists());
+    println!("{}", Path::new("/home/.emerald/testnet").exists());
+
+    Ok(())
+}

src/cmd/mod.rs

@@ -2,13 +2,15 @@
 
 mod account;
 mod error;
+mod migrate;
 mod transaction;
 #[macro_use]
 mod arg_handlers;
 
 use self::account::account_cmd;
 pub use self::arg_handlers::*;
 pub use self::error::Error;
+use self::migrate::migrate_cmd;
 use self::transaction::transaction_cmd;
 use super::emerald::keystore::{KdfDepthLevel, KeyFile};
 use super::emerald::mnemonic::{gen_entropy, Language, Mnemonic, ENTROPY_BYTE_LENGTH};
@@ -23,7 +25,7 @@ use std::sync::Arc;
 
 type ExecResult = Result<(), Error>;
 
-const DEFAULT_CHAIN_NAME: &str = "mainnet";
+const DEFAULT_CHAIN_NAME: &str = "etc-main";
 const DEFAULT_UPSTREAM: &str = "127.0.0.1:8545";
 
 /// Create new command executor
@@ -46,6 +48,7 @@ pub fn execute(matches: &ArgMatches) -> ExecResult {
     let keystore = storage_ctrl.get_keystore(chain)?;
 
     match matches.subcommand() {
+        ("migrate", Some(sub_m)) => migrate_cmd(),
         ("server", Some(sub_m)) => server_cmd(sub_m, storage_ctrl.clone(), chain),
         ("account", Some(sub_m)) => account_cmd(sub_m, keystore, &env),
         ("transaction", Some(sub_m)) => transaction_cmd(sub_m, keystore, &env, chain),