9584faee55
* [whisper] Move needed aes_gcm crypto in-crate
In the latest `parity-crypto` release (upcoming 0.4), the aes GCM features were removed (done to remove the dependency on `ring`).
This PR adds the bare minimum crypto needed for Whisper directly to the crate itself and as those were the only features needed from `parity-crypto`, removes the dependency on that crate altogether.
* Upgrade to parity-crypto 0.4
Reverts using NonZeroU32 (introduced [here](b347599cf7)).
* Check for 0 in `args.arg_keys_iteration`
* Use beta.4
* parity-crypto 0.4.0 is released
59 lines
2.2 KiB
Rust
59 lines
2.2 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum 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 Ethereum 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 Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
use ethkey::Password;
|
|
use ethstore::PresaleWallet;
|
|
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.clone() {
|
|
Some(file) => password_from_file(file)?,
|
|
None => password_prompt()?,
|
|
};
|
|
|
|
let wallet = PresaleWallet::open(cmd.wallet_path.clone()).map_err(|_| "Unable to open presale wallet.")?;
|
|
let kp = wallet.decrypt(&password).map_err(|_| "Invalid password.")?;
|
|
let address = kp.address();
|
|
import_account(&cmd, kp, password);
|
|
Ok(format!("{:?}", address))
|
|
}
|
|
|
|
#[cfg(feature = "accounts")]
|
|
pub fn import_account(cmd: &ImportWallet, kp: ethkey::KeyPair, password: Password) {
|
|
use accounts::{AccountProvider, AccountProviderSettings};
|
|
use ethstore::EthStore;
|
|
use ethstore::accounts_dir::RootDiskDirectory;
|
|
|
|
let dir = Box::new(RootDiskDirectory::create(cmd.path.clone()).unwrap());
|
|
let secret_store = Box::new(EthStore::open_with_iterations(dir, cmd.iterations).unwrap());
|
|
let acc_provider = AccountProvider::new(secret_store, AccountProviderSettings::default());
|
|
acc_provider.insert_account(kp.secret().clone(), &password).unwrap();
|
|
}
|
|
|
|
#[cfg(not(feature = "accounts"))]
|
|
pub fn import_account(_cmd: &ImportWallet, _kp: ethkey::KeyPair, _password: Password) {}
|