3650f2d51c
* Split blockchain & db from ethcore. * Clean up blockchain deps. * Missing docs. * Fix blockchain tests. * Make other crates compile. * Remove some re-exports. * Remove types re-export from ethcore. * Remove EVM dependency from transaction. * Merge ethcore-transaction with common-types. * Clean-up ethcore deps a bit. * remove ethcore from cargo.toml * Update ethcore/blockchain/src/lib.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Address review comments. * Update DB comment. * Add tracking issue to the TODO and fix typo. * Common naming for common types. * Update ethcore/db/src/keys.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Update ethcore/blockchain/src/generator.rs Co-Authored-By: tomusdrw <tomusdrw@users.noreply.github.com> * Try to fix beta tests.
144 lines
4.8 KiB
Rust
144 lines
4.8 KiB
Rust
// Copyright 2015-2018 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
use std::path::PathBuf;
|
|
use ethstore::{EthStore, SecretStore, import_account, import_accounts, read_geth_accounts};
|
|
use ethstore::accounts_dir::RootDiskDirectory;
|
|
use ethstore::SecretVaultRef;
|
|
use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
|
|
use helpers::{password_prompt, password_from_file};
|
|
use params::SpecType;
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub enum AccountCmd {
|
|
New(NewAccount),
|
|
List(ListAccounts),
|
|
Import(ImportAccounts),
|
|
ImportFromGeth(ImportFromGethAccounts)
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ListAccounts {
|
|
pub path: String,
|
|
pub spec: SpecType,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct NewAccount {
|
|
pub iterations: u32,
|
|
pub path: String,
|
|
pub spec: SpecType,
|
|
pub password_file: Option<String>,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ImportAccounts {
|
|
pub from: Vec<String>,
|
|
pub to: String,
|
|
pub spec: SpecType,
|
|
}
|
|
|
|
/// Parameters for geth accounts' import
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ImportFromGethAccounts {
|
|
/// import mainnet (false) or testnet (true) accounts
|
|
pub testnet: bool,
|
|
/// directory to import accounts to
|
|
pub to: String,
|
|
pub spec: SpecType,
|
|
}
|
|
|
|
pub fn execute(cmd: AccountCmd) -> Result<String, String> {
|
|
match cmd {
|
|
AccountCmd::New(new_cmd) => new(new_cmd),
|
|
AccountCmd::List(list_cmd) => list(list_cmd),
|
|
AccountCmd::Import(import_cmd) => import(import_cmd),
|
|
AccountCmd::ImportFromGeth(import_geth_cmd) => import_geth(import_geth_cmd)
|
|
}
|
|
}
|
|
|
|
fn keys_dir(path: String, spec: SpecType) -> Result<RootDiskDirectory, String> {
|
|
let spec = spec.spec(&::std::env::temp_dir())?;
|
|
let mut path = PathBuf::from(&path);
|
|
path.push(spec.data_dir);
|
|
RootDiskDirectory::create(path).map_err(|e| format!("Could not open keys directory: {}", e))
|
|
}
|
|
|
|
fn secret_store(dir: Box<RootDiskDirectory>, iterations: Option<u32>) -> Result<EthStore, String> {
|
|
match iterations {
|
|
Some(i) => EthStore::open_with_iterations(dir, i),
|
|
_ => EthStore::open(dir)
|
|
}.map_err(|e| format!("Could not open keys store: {}", e))
|
|
}
|
|
|
|
fn new(n: NewAccount) -> Result<String, String> {
|
|
let password = match n.password_file {
|
|
Some(file) => password_from_file(file)?,
|
|
None => password_prompt()?,
|
|
};
|
|
|
|
let dir = Box::new(keys_dir(n.path, n.spec)?);
|
|
let secret_store = Box::new(secret_store(dir, Some(n.iterations))?);
|
|
let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
|
|
let new_account = acc_provider.new_account(&password).map_err(|e| format!("Could not create new account: {}", e))?;
|
|
Ok(format!("0x{:x}", new_account))
|
|
}
|
|
|
|
fn list(list_cmd: ListAccounts) -> Result<String, String> {
|
|
let dir = Box::new(keys_dir(list_cmd.path, list_cmd.spec)?);
|
|
let secret_store = Box::new(secret_store(dir, None)?);
|
|
let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
|
|
let accounts = acc_provider.accounts().map_err(|e| format!("{}", e))?;
|
|
let result = accounts.into_iter()
|
|
.map(|a| format!("0x{:x}", a))
|
|
.collect::<Vec<String>>()
|
|
.join("\n");
|
|
|
|
Ok(result)
|
|
}
|
|
|
|
fn import(i: ImportAccounts) -> Result<String, String> {
|
|
let to = keys_dir(i.to, i.spec)?;
|
|
let mut imported = 0;
|
|
|
|
for path in &i.from {
|
|
let path = PathBuf::from(path);
|
|
if path.is_dir() {
|
|
let from = RootDiskDirectory::at(&path);
|
|
imported += import_accounts(&from, &to).map_err(|e| format!("Importing accounts from {:?} failed: {}", path, e))?.len();
|
|
} else if path.is_file() {
|
|
import_account(&path, &to).map_err(|e| format!("Importing account from {:?} failed: {}", path, e))?;
|
|
imported += 1;
|
|
}
|
|
}
|
|
|
|
Ok(format!("{} account(s) imported", imported))
|
|
}
|
|
|
|
fn import_geth(i: ImportFromGethAccounts) -> Result<String, String> {
|
|
use std::io::ErrorKind;
|
|
use ethstore::Error;
|
|
|
|
let dir = Box::new(keys_dir(i.to, i.spec)?);
|
|
let secret_store = Box::new(secret_store(dir, None)?);
|
|
let geth_accounts = read_geth_accounts(i.testnet);
|
|
match secret_store.import_geth_accounts(SecretVaultRef::Root, geth_accounts, i.testnet) {
|
|
Ok(v) => Ok(format!("Successfully imported {} account(s) from geth.", v.len())),
|
|
Err(Error::Io(ref io_err)) if io_err.kind() == ErrorKind::NotFound => Err("Failed to find geth keys folder.".into()),
|
|
Err(err) => Err(format!("Import geth accounts failed. {}", err))
|
|
}
|
|
}
|