6654d02163
* Trace precompiled contracts when the transfer value is not zero (#8486) * Trace precompiled contracts when the transfer value is not zero * Add tests for precompiled CALL tracing * Use byzantium test machine for the new test * Add notes in comments on why we don't trace all precompileds * Use is_transferred instead of transferred * Return error if RLP size of transaction exceeds the limit (#8473) * Return error if RLP size of transaction exceeds the limit * Review comments fixed * RLP check moved to verifier, corresponding pool test added * Don't block sync when importing old blocks (#8530) * Alter IO queueing. * Don't require IoMessages to be Clone * Ancient blocks imported via IoChannel. * Get rid of private transactions io message. * Get rid of deadlock and fix disconnected handler. * Revert to old disconnect condition. * Fix tests. * Fix deadlock. * Refactoring `ethcore-sync` - Fixing warp-sync barrier (#8543) * Start dividing sync chain : first supplier method * WIP - updated chain sync supplier * Finish refactoring the Chain Sync Supplier * Create Chain Sync Requester * Add Propagator for Chain Sync * Add the Chain Sync Handler * Move tests from mod -> handler * Move tests to propagator * Refactor SyncRequester arguments * Refactoring peer fork header handler * Fix wrong highest block number in snapshot sync * Small refactor... * Address PR grumbles * Retry failed CI job * Fix tests * PR Grumbles * Handle socket address parsing errors (#8545) Unpack errors and check for io::ErrorKind::InvalidInput and return our own AddressParse error. Remove the foreign link to std::net::AddrParseError and add an `impl From` for that error. Test parsing properly. * Fix packet count when talking with PAR2 peers (#8555) * Support diferent packet counts in different protocol versions. * Fix light timeouts and eclipse protection. * Fix devp2p tests. * Fix whisper-cli compilation. * Fix compilation. * Fix ethcore-sync tests. * Revert "Fix light timeouts and eclipse protection." This reverts commit 06285ea8c1d9d184d809f64b5507aece633da6cc. * Increase timeouts. * Add whisper CLI to the pipelines (#8578) * Add whisper CLI to the pipelines * Address todo, ref #8579 * Rename `whisper-cli binary` to `whisper` (#8579) * rename whisper-cli binary to whisper * fix tests * Remove manually added text to the errors (#8595) These messages were confusing for the users especially the help message. * Fix account list double 0x display (#8596) * Remove unused self import * Fix account list double 0x display * Fix BlockReward contract "arithmetic operation overflow" (#8611) * Fix BlockReward contract "arithmetic operation overflow" * Add docs on how execute_as_system works * Fix typo * Rlp decode returns Result (#8527) rlp::decode returns Result Make a best effort to handle decoding errors gracefully throughout the code, using `expect` where the value is guaranteed to be valid (and in other places where it makes sense). * Remove expect (#8536) * Remove expect and propagate rlp::DecoderErrors as TrieErrors * Decoding headers can fail (#8570) * rlp::decode returns Result * Fix journaldb to handle rlp::decode Result * Fix ethcore to work with rlp::decode returning Result * Light client handles rlp::decode returning Result * Fix tests in rlp_derive * Fix tests * Cleanup * cleanup * Allow panic rather than breaking out of iterator * Let decoding failures when reading from disk blow up * syntax * Fix the trivial grumbles * Fix failing tests * Make Account::from_rlp return Result * Syntx, sigh * Temp-fix for decoding failures * Header::decode returns Result Handle new return type throughout the code base. * Do not continue reading from the DB when a value could not be read * Fix tests * Handle header decoding in light_sync * Handling header decoding errors * Let the DecodeError bubble up unchanged * Remove redundant error conversion * fix compiler warning (#8590) * Attempt to fix intermittent test failures (#8584) Occasionally should_return_correct_nonces_when_dropped_because_of_limit fails, possibly because of multiple threads competing to finish. See CI logs here for an example: https://gitlab.parity.io/parity/parity/-/jobs/86738 * block_header can fail so return Result (#8581) * block_header can fail so return Result * Restore previous return type based on feedback * Fix failing doc tests running on non-code * Block::decode() returns Result (#8586) * Gitlab test script fixes (#8573) * Exclude /docs from modified files. * Ensure all references in the working tree are available * Remove duplicated line from test script
144 lines
4.8 KiB
Rust
144 lines
4.8 KiB
Rust
// Copyright 2015-2017 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 ethcore::ethstore::{EthStore, SecretStore, import_account, import_accounts, read_geth_accounts};
|
|
use ethcore::ethstore::accounts_dir::RootDiskDirectory;
|
|
use ethcore::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: String = 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 ethcore::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))
|
|
}
|
|
}
|