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.
46 lines
1.8 KiB
Rust
46 lines
1.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 ethstore::{PresaleWallet, EthStore};
|
|
use ethstore::accounts_dir::RootDiskDirectory;
|
|
use ethcore::account_provider::{AccountProvider, AccountProviderSettings};
|
|
use helpers::{password_prompt, password_from_file};
|
|
use params::SpecType;
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
pub struct ImportWallet {
|
|
pub iterations: u32,
|
|
pub path: String,
|
|
pub spec: SpecType,
|
|
pub wallet_path: String,
|
|
pub password_file: Option<String>,
|
|
}
|
|
|
|
pub fn execute(cmd: ImportWallet) -> Result<String, String> {
|
|
let password = match cmd.password_file {
|
|
Some(file) => password_from_file(file)?,
|
|
None => password_prompt()?,
|
|
};
|
|
|
|
let dir = Box::new(RootDiskDirectory::create(cmd.path).unwrap());
|
|
let secret_store = Box::new(EthStore::open_with_iterations(dir, cmd.iterations).unwrap());
|
|
let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
|
|
let wallet = PresaleWallet::open(cmd.wallet_path).map_err(|_| "Unable to open presale wallet.")?;
|
|
let kp = wallet.decrypt(&password).map_err(|_| "Invalid password.")?;
|
|
let address = acc_provider.insert_account(kp.secret().clone(), &password).unwrap();
|
|
Ok(format!("{:?}", address))
|
|
}
|