2017-01-25 18:51:41 +01:00
|
|
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
2016-04-21 16:45:04 +02:00
|
|
|
// 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/>.
|
|
|
|
|
2016-06-29 16:26:19 +02:00
|
|
|
use std::time::Duration;
|
2017-10-10 17:42:20 +02:00
|
|
|
use std::io::Read;
|
2016-07-25 16:09:47 +02:00
|
|
|
use std::net::SocketAddr;
|
2017-01-06 16:05:58 +01:00
|
|
|
use std::path::{Path, PathBuf};
|
2017-04-08 11:26:16 +02:00
|
|
|
use std::collections::BTreeMap;
|
2016-07-29 17:30:02 +02:00
|
|
|
use std::cmp::max;
|
2017-08-10 18:32:10 +02:00
|
|
|
use std::str::FromStr;
|
2016-09-11 11:52:12 +02:00
|
|
|
use cli::{Args, ArgsError};
|
2017-08-31 11:35:41 +02:00
|
|
|
use hash::keccak;
|
2017-09-04 16:36:49 +02:00
|
|
|
use bigint::prelude::U256;
|
|
|
|
use bigint::hash::H256;
|
2017-09-06 20:47:45 +02:00
|
|
|
use util::{version_data, Address};
|
|
|
|
use bytes::Bytes;
|
2017-09-01 16:57:57 +02:00
|
|
|
use ansi_term::Colour;
|
2017-07-28 19:06:39 +02:00
|
|
|
use ethsync::{NetworkConfiguration, is_valid_node_url};
|
2017-04-08 11:26:16 +02:00
|
|
|
use ethcore::ethstore::ethkey::{Secret, Public};
|
2016-12-11 02:02:40 +01:00
|
|
|
use ethcore::client::{VMType};
|
2017-01-25 11:03:36 +01:00
|
|
|
use ethcore::miner::{MinerOptions, Banning, StratumOptions};
|
2016-12-02 18:21:54 +01:00
|
|
|
use ethcore::verification::queue::VerifierSettings;
|
2016-07-25 16:09:47 +02:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
use rpc::{IpcConfiguration, HttpConfiguration, WsConfiguration, UiConfiguration};
|
2017-04-06 19:38:33 +02:00
|
|
|
use rpc_apis::ApiSet;
|
2017-04-13 16:32:07 +02:00
|
|
|
use parity_rpc::NetworkSettings;
|
2016-07-25 16:09:47 +02:00
|
|
|
use cache::CacheConfig;
|
2017-07-10 12:57:40 +02:00
|
|
|
use helpers::{to_duration, to_mode, to_block_id, to_u256, to_pending_set, to_price, replace_home, replace_home_and_local,
|
2016-10-15 14:46:33 +02:00
|
|
|
geth_ipc_path, parity_ipc_path, to_bootnodes, to_addresses, to_address, to_gas_limit, to_queue_strategy};
|
2017-10-25 13:13:11 +02:00
|
|
|
use params::{ResealPolicy, AccountsConfig, GasPricerConfig, MinerExtras, SpecType};
|
2016-07-25 16:09:47 +02:00
|
|
|
use ethcore_logger::Config as LogConfig;
|
2017-01-18 18:45:30 +01:00
|
|
|
use dir::{self, Directories, default_hypervisor_path, default_local_path, default_data_path};
|
2016-07-25 16:09:47 +02:00
|
|
|
use dapps::Configuration as DappsConfiguration;
|
2017-02-16 14:41:33 +01:00
|
|
|
use ipfs::Configuration as IpfsConfiguration;
|
2017-08-09 11:09:40 +02:00
|
|
|
use secretstore::{Configuration as SecretStoreConfiguration, NodeSecretKey};
|
2016-12-15 18:51:59 +01:00
|
|
|
use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
|
2016-07-25 16:09:47 +02:00
|
|
|
use run::RunCmd;
|
2016-12-12 17:19:41 +01:00
|
|
|
use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, KillBlockchain, ExportState, DataFormat};
|
2016-07-25 16:09:47 +02:00
|
|
|
use presale::ImportWallet;
|
2016-12-12 16:51:07 +01:00
|
|
|
use account::{AccountCmd, NewAccount, ListAccounts, ImportAccounts, ImportFromGethAccounts};
|
2016-08-05 17:00:46 +02:00
|
|
|
use snapshot::{self, SnapshotCommand};
|
2017-07-28 19:06:39 +02:00
|
|
|
use network::{IpFilter};
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
pub enum Cmd {
|
|
|
|
Run(RunCmd),
|
|
|
|
Version,
|
|
|
|
Account(AccountCmd),
|
|
|
|
ImportPresaleWallet(ImportWallet),
|
|
|
|
Blockchain(BlockchainCmd),
|
2017-07-28 19:07:38 +02:00
|
|
|
SignerToken(WsConfiguration, UiConfiguration, LogConfig),
|
2016-09-20 12:19:07 +02:00
|
|
|
SignerSign {
|
|
|
|
id: Option<usize>,
|
|
|
|
pwfile: Option<PathBuf>,
|
|
|
|
port: u16,
|
|
|
|
authfile: PathBuf,
|
|
|
|
},
|
|
|
|
SignerList {
|
|
|
|
port: u16,
|
|
|
|
authfile: PathBuf
|
|
|
|
},
|
|
|
|
SignerReject {
|
2016-09-30 15:30:17 +02:00
|
|
|
id: Option<usize>,
|
2016-09-20 12:19:07 +02:00
|
|
|
port: u16,
|
|
|
|
authfile: PathBuf
|
|
|
|
},
|
2016-08-05 17:00:46 +02:00
|
|
|
Snapshot(SnapshotCommand),
|
2016-09-23 15:28:09 +02:00
|
|
|
Hash(Option<String>),
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-11-02 19:42:21 +01:00
|
|
|
pub struct Execute {
|
|
|
|
pub logger: LogConfig,
|
|
|
|
pub cmd: Cmd,
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
pub struct Configuration {
|
|
|
|
pub args: Args,
|
2017-03-13 12:10:53 +01:00
|
|
|
pub spec_name_override: Option<String>,
|
2016-05-13 17:32:32 +02:00
|
|
|
}
|
|
|
|
|
2016-04-21 16:45:04 +02:00
|
|
|
impl Configuration {
|
2017-03-13 12:10:53 +01:00
|
|
|
pub fn parse<S: AsRef<str>>(command: &[S], spec_name_override: Option<String>) -> Result<Self, ArgsError> {
|
2016-12-27 12:53:56 +01:00
|
|
|
let args = Args::parse(command)?;
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
let config = Configuration {
|
|
|
|
args: args,
|
2017-03-13 12:10:53 +01:00
|
|
|
spec_name_override: spec_name_override,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(config)
|
|
|
|
}
|
|
|
|
|
2016-11-02 19:42:21 +01:00
|
|
|
pub fn into_command(self) -> Result<Execute, String> {
|
2016-07-25 16:09:47 +02:00
|
|
|
let dirs = self.directories();
|
2017-09-05 13:30:22 +02:00
|
|
|
let pruning = self.args.arg_pruning.parse()?;
|
|
|
|
let pruning_history = self.args.arg_pruning_history;
|
2016-12-27 12:53:56 +01:00
|
|
|
let vm_type = self.vm_type()?;
|
2017-10-25 13:13:11 +02:00
|
|
|
let spec = self.chain()?;
|
2017-09-05 13:30:22 +02:00
|
|
|
let mode = match self.args.arg_mode.as_ref() {
|
2017-03-13 12:10:53 +01:00
|
|
|
"last" => None,
|
2017-09-05 13:30:22 +02:00
|
|
|
mode => Some(to_mode(&mode, self.args.arg_mode_timeout, self.args.arg_mode_alarm)?),
|
2017-03-13 12:10:53 +01:00
|
|
|
};
|
2016-12-27 12:53:56 +01:00
|
|
|
let update_policy = self.update_policy()?;
|
2016-07-25 16:09:47 +02:00
|
|
|
let logger_config = self.logger_config();
|
2017-04-13 16:32:07 +02:00
|
|
|
let ws_conf = self.ws_config()?;
|
2016-12-27 12:53:56 +01:00
|
|
|
let http_conf = self.http_config()?;
|
|
|
|
let ipc_conf = self.ipc_config()?;
|
|
|
|
let net_conf = self.net_config()?;
|
2017-05-24 12:24:07 +02:00
|
|
|
let ui_conf = self.ui_config();
|
2016-11-03 22:22:25 +01:00
|
|
|
let network_id = self.network_id();
|
2016-07-25 16:09:47 +02:00
|
|
|
let cache_config = self.cache_config();
|
2017-09-05 13:30:22 +02:00
|
|
|
let tracing = self.args.arg_tracing.parse()?;
|
|
|
|
let fat_db = self.args.arg_fat_db.parse()?;
|
|
|
|
let compaction = self.args.arg_db_compaction.parse()?;
|
2016-07-29 15:36:00 +02:00
|
|
|
let wal = !self.args.flag_fast_and_loose;
|
2017-03-29 17:07:58 +02:00
|
|
|
let public_node = self.args.flag_public_node;
|
2017-10-10 17:42:20 +02:00
|
|
|
let warp_sync = !self.args.flag_no_warp;
|
2016-07-25 16:09:47 +02:00
|
|
|
let geth_compatibility = self.args.flag_geth;
|
2017-10-05 12:35:01 +02:00
|
|
|
let dapps_conf = self.dapps_config();
|
2017-02-16 14:41:33 +01:00
|
|
|
let ipfs_conf = self.ipfs_config();
|
2017-04-08 11:26:16 +02:00
|
|
|
let secretstore_conf = self.secretstore_config()?;
|
2016-12-27 12:53:56 +01:00
|
|
|
let format = self.format()?;
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
let cmd = if self.args.flag_version {
|
|
|
|
Cmd::Version
|
2016-09-20 12:19:07 +02:00
|
|
|
} else if self.args.cmd_signer {
|
2017-05-24 12:24:07 +02:00
|
|
|
let authfile = ::signer::codes_path(&ws_conf.signer_path);
|
2016-09-20 12:19:07 +02:00
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
if self.args.cmd_signer_new_token {
|
2017-07-28 19:07:38 +02:00
|
|
|
Cmd::SignerToken(ws_conf, ui_conf, logger_config.clone())
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_signer_sign {
|
2017-11-09 14:42:17 +01:00
|
|
|
let pwfile = self.args.arg_password.first().map(|pwfile| {
|
2016-09-30 15:30:17 +02:00
|
|
|
PathBuf::from(pwfile)
|
|
|
|
});
|
2016-09-20 12:19:07 +02:00
|
|
|
Cmd::SignerSign {
|
2017-09-05 13:30:22 +02:00
|
|
|
id: self.args.arg_signer_sign_id,
|
2016-09-20 12:19:07 +02:00
|
|
|
pwfile: pwfile,
|
2017-05-24 12:24:07 +02:00
|
|
|
port: ws_conf.port,
|
2016-09-20 12:19:07 +02:00
|
|
|
authfile: authfile,
|
|
|
|
}
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_signer_reject {
|
2016-09-20 12:19:07 +02:00
|
|
|
Cmd::SignerReject {
|
2017-09-05 13:30:22 +02:00
|
|
|
id: self.args.arg_signer_reject_id,
|
2017-05-24 12:24:07 +02:00
|
|
|
port: ws_conf.port,
|
2016-09-20 12:19:07 +02:00
|
|
|
authfile: authfile,
|
|
|
|
}
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_signer_list {
|
2016-09-20 12:19:07 +02:00
|
|
|
Cmd::SignerList {
|
2017-05-24 12:24:07 +02:00
|
|
|
port: ws_conf.port,
|
2016-09-20 12:19:07 +02:00
|
|
|
authfile: authfile,
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_tools && self.args.cmd_tools_hash {
|
|
|
|
Cmd::Hash(self.args.arg_tools_hash_file)
|
|
|
|
} else if self.args.cmd_db && self.args.cmd_db_kill {
|
2016-12-12 17:19:41 +01:00
|
|
|
Cmd::Blockchain(BlockchainCmd::Kill(KillBlockchain {
|
|
|
|
spec: spec,
|
|
|
|
dirs: dirs,
|
|
|
|
pruning: pruning,
|
|
|
|
}))
|
2016-07-25 16:09:47 +02:00
|
|
|
} else if self.args.cmd_account {
|
2017-09-05 13:30:22 +02:00
|
|
|
let account_cmd = if self.args.cmd_account_new {
|
2016-07-25 16:09:47 +02:00
|
|
|
let new_acc = NewAccount {
|
2017-09-05 13:30:22 +02:00
|
|
|
iterations: self.args.arg_keys_iterations,
|
2016-07-25 16:09:47 +02:00
|
|
|
path: dirs.keys,
|
2016-12-12 16:51:07 +01:00
|
|
|
spec: spec,
|
2017-11-09 14:42:17 +01:00
|
|
|
password_file: self.args.arg_password.first().map(|x| x.to_owned()),
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
AccountCmd::New(new_acc)
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_account_list {
|
2016-12-12 16:51:07 +01:00
|
|
|
let list_acc = ListAccounts {
|
|
|
|
path: dirs.keys,
|
|
|
|
spec: spec,
|
|
|
|
};
|
|
|
|
AccountCmd::List(list_acc)
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_account_import {
|
2016-07-25 16:09:47 +02:00
|
|
|
let import_acc = ImportAccounts {
|
2017-09-05 13:30:22 +02:00
|
|
|
from: self.args.arg_account_import_path.expect("CLI argument is required; qed").clone(),
|
2016-07-25 16:09:47 +02:00
|
|
|
to: dirs.keys,
|
2016-12-12 16:51:07 +01:00
|
|
|
spec: spec,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
AccountCmd::Import(import_acc)
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
};
|
|
|
|
Cmd::Account(account_cmd)
|
2016-10-04 10:44:47 +02:00
|
|
|
} else if self.args.flag_import_geth_keys {
|
|
|
|
let account_cmd = AccountCmd::ImportFromGeth(
|
|
|
|
ImportFromGethAccounts {
|
2016-12-12 16:51:07 +01:00
|
|
|
spec: spec,
|
2016-10-04 10:44:47 +02:00
|
|
|
to: dirs.keys,
|
|
|
|
testnet: self.args.flag_testnet
|
2016-10-06 10:20:05 +02:00
|
|
|
}
|
2016-10-04 10:44:47 +02:00
|
|
|
);
|
|
|
|
Cmd::Account(account_cmd)
|
2016-07-25 16:09:47 +02:00
|
|
|
} else if self.args.cmd_wallet {
|
|
|
|
let presale_cmd = ImportWallet {
|
2017-09-05 13:30:22 +02:00
|
|
|
iterations: self.args.arg_keys_iterations,
|
2016-07-25 16:09:47 +02:00
|
|
|
path: dirs.keys,
|
2016-12-12 16:51:07 +01:00
|
|
|
spec: spec,
|
2017-09-05 13:30:22 +02:00
|
|
|
wallet_path: self.args.arg_wallet_import_path.unwrap().clone(),
|
2017-11-09 14:42:17 +01:00
|
|
|
password_file: self.args.arg_password.first().map(|x| x.to_owned()),
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
Cmd::ImportPresaleWallet(presale_cmd)
|
|
|
|
} else if self.args.cmd_import {
|
|
|
|
let import_cmd = ImportBlockchain {
|
|
|
|
spec: spec,
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
2017-09-05 13:30:22 +02:00
|
|
|
file_path: self.args.arg_import_file.clone(),
|
2016-08-04 09:22:54 +02:00
|
|
|
format: format,
|
2016-07-25 16:09:47 +02:00
|
|
|
pruning: pruning,
|
2016-10-14 14:44:56 +02:00
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-07-25 16:09:47 +02:00
|
|
|
compaction: compaction,
|
2016-07-29 15:36:00 +02:00
|
|
|
wal: wal,
|
2016-07-25 16:09:47 +02:00
|
|
|
tracing: tracing,
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: fat_db,
|
2016-07-25 16:09:47 +02:00
|
|
|
vm_type: vm_type,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: !self.args.flag_no_seal_check,
|
2016-11-02 19:42:21 +01:00
|
|
|
with_color: logger_config.color,
|
2016-12-02 18:21:54 +01:00
|
|
|
verifier_settings: self.verifier_settings(),
|
2017-07-27 13:50:12 +02:00
|
|
|
light: self.args.flag_light,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
Cmd::Blockchain(BlockchainCmd::Import(import_cmd))
|
|
|
|
} else if self.args.cmd_export {
|
2017-09-05 13:30:22 +02:00
|
|
|
if self.args.cmd_export_blocks {
|
2016-11-27 11:11:56 +01:00
|
|
|
let export_cmd = ExportBlockchain {
|
|
|
|
spec: spec,
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
2017-09-05 13:30:22 +02:00
|
|
|
file_path: self.args.arg_export_blocks_file.clone(),
|
2016-11-27 11:11:56 +01:00
|
|
|
format: format,
|
|
|
|
pruning: pruning,
|
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-11-27 11:11:56 +01:00
|
|
|
compaction: compaction,
|
|
|
|
wal: wal,
|
|
|
|
tracing: tracing,
|
|
|
|
fat_db: fat_db,
|
2017-09-05 13:30:22 +02:00
|
|
|
from_block: to_block_id(&self.args.arg_export_blocks_from)?,
|
|
|
|
to_block: to_block_id(&self.args.arg_export_blocks_to)?,
|
2016-11-27 11:11:56 +01:00
|
|
|
check_seal: !self.args.flag_no_seal_check,
|
|
|
|
};
|
|
|
|
Cmd::Blockchain(BlockchainCmd::Export(export_cmd))
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if self.args.cmd_export_state {
|
2016-11-27 11:11:56 +01:00
|
|
|
let export_cmd = ExportState {
|
|
|
|
spec: spec,
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
2017-09-05 13:30:22 +02:00
|
|
|
file_path: self.args.arg_export_state_file.clone(),
|
2016-11-27 11:11:56 +01:00
|
|
|
format: format,
|
|
|
|
pruning: pruning,
|
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-11-27 11:11:56 +01:00
|
|
|
compaction: compaction,
|
|
|
|
wal: wal,
|
|
|
|
tracing: tracing,
|
|
|
|
fat_db: fat_db,
|
2017-09-05 13:30:22 +02:00
|
|
|
at: to_block_id(&self.args.arg_export_state_at)?,
|
|
|
|
storage: !self.args.flag_export_state_no_storage,
|
|
|
|
code: !self.args.flag_export_state_no_code,
|
|
|
|
min_balance: self.args.arg_export_state_min_balance.and_then(|s| to_u256(&s).ok()),
|
|
|
|
max_balance: self.args.arg_export_state_max_balance.and_then(|s| to_u256(&s).ok()),
|
2016-11-27 11:11:56 +01:00
|
|
|
};
|
|
|
|
Cmd::Blockchain(BlockchainCmd::ExportState(export_cmd))
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
2016-08-05 17:00:46 +02:00
|
|
|
} else if self.args.cmd_snapshot {
|
|
|
|
let snapshot_cmd = SnapshotCommand {
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
|
|
|
spec: spec,
|
|
|
|
pruning: pruning,
|
2016-10-14 14:44:56 +02:00
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-08-05 17:00:46 +02:00
|
|
|
tracing: tracing,
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: fat_db,
|
2016-08-05 17:00:46 +02:00
|
|
|
compaction: compaction,
|
2017-09-05 13:30:22 +02:00
|
|
|
file_path: self.args.arg_snapshot_file.clone(),
|
2016-08-05 17:00:46 +02:00
|
|
|
wal: wal,
|
|
|
|
kind: snapshot::Kind::Take,
|
2017-09-05 13:30:22 +02:00
|
|
|
block_at: to_block_id(&self.args.arg_snapshot_at)?,
|
2016-08-05 17:00:46 +02:00
|
|
|
};
|
|
|
|
Cmd::Snapshot(snapshot_cmd)
|
|
|
|
} else if self.args.cmd_restore {
|
|
|
|
let restore_cmd = SnapshotCommand {
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
|
|
|
spec: spec,
|
|
|
|
pruning: pruning,
|
2016-10-14 14:44:56 +02:00
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-08-05 17:00:46 +02:00
|
|
|
tracing: tracing,
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: fat_db,
|
2016-08-05 17:00:46 +02:00
|
|
|
compaction: compaction,
|
2017-09-05 13:30:22 +02:00
|
|
|
file_path: self.args.arg_restore_file.clone(),
|
2016-08-05 17:00:46 +02:00
|
|
|
wal: wal,
|
|
|
|
kind: snapshot::Kind::Restore,
|
2016-12-27 12:53:56 +01:00
|
|
|
block_at: to_block_id("latest")?, // unimportant.
|
2016-08-05 17:00:46 +02:00
|
|
|
};
|
|
|
|
Cmd::Snapshot(restore_cmd)
|
2016-07-25 16:09:47 +02:00
|
|
|
} else {
|
|
|
|
let daemon = if self.args.cmd_daemon {
|
2017-09-05 13:30:22 +02:00
|
|
|
Some(self.args.arg_daemon_pid_file.clone().expect("CLI argument is required; qed"))
|
2016-07-25 16:09:47 +02:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
2016-12-02 18:21:54 +01:00
|
|
|
let verifier_settings = self.verifier_settings();
|
2017-07-14 20:40:28 +02:00
|
|
|
let whisper_config = self.whisper_config();
|
2016-12-02 18:21:54 +01:00
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
let run_cmd = RunCmd {
|
|
|
|
cache_config: cache_config,
|
|
|
|
dirs: dirs,
|
|
|
|
spec: spec,
|
|
|
|
pruning: pruning,
|
2016-10-14 14:44:56 +02:00
|
|
|
pruning_history: pruning_history,
|
2017-09-05 13:30:22 +02:00
|
|
|
pruning_memory: self.args.arg_pruning_memory,
|
2016-07-25 16:09:47 +02:00
|
|
|
daemon: daemon,
|
2016-11-02 19:42:21 +01:00
|
|
|
logger_config: logger_config.clone(),
|
2017-10-25 13:13:11 +02:00
|
|
|
miner_options: self.miner_options()?,
|
backports to beta (#7434)
* Merge pull request #7368 from paritytech/td-future-blocks
Wait for future blocks in AuRa
* Fix tracing failed calls.
* Problem: sending any Whisper message fails
The error is "PoW too low to compete with other messages"
This has been previously reported in #7144
Solution: prevent the move semantics
The source of the error is in PoolHandle.relay
implementation for NetPoolHandle.
Because of the move semantics, `res` variable is in fact
copied (as it implements Copy) into the closure and for
that reason, the returned result is always `false.
* Merge pull request #7433 from paritytech/td-strict-config
Strict config parsing
* Problem: AuRa's unsafeties around step duration (#7282)
Firstly, `Step.duration_remaining` casts it to u32, unnecesarily
limiting it to 2^32. While theoretically this is "good enough" (at 3
seconds steps it provides room for a little over 400 years), it is
still a lossy way to calculate the remaining time until the next step.
Secondly, step duration might be zero, triggering division by zero
in `Step.calibrate`
Solution: rework the code around the fact that duration is
typically in single digits and never grows, hence, it can be represented
by a much narrower range (u16) and this highlights the fact that
multiplying u64 by u16 will only result in an overflow in even further
future, at which point we should panic informatively (if anybody's
still around)
Similarly, panic when it is detected that incrementing the step
counter wrapped around on the overflow of usize.
As for the division by zero, prevent it by making zero an invalid
value for step duration. This will make AuRa log the constraint
mismatch and panic (after all, what purpose would zero step duration
serve? it makes no sense within the definition of the protocol,
as finality can only be achieved as per the specification
if messages are received within the step duration, which would violate
the speed of light and other physical laws in this case).
* Merge pull request #7437 from paritytech/a5-chains-expanse
Remove expanse chain
* Expanse Byzantium update w/ correct metropolis difficulty increment divisor (#7463)
* Byzantium Update for Expanse
Here the changes go. Hope I didnt miss anything.
* expip2 changes - update duration limit
* Fix missing EXPIP-2 fields
* Format numbers as hex
* Fix compilation errors
* Group expanse chain spec fields together
* Set metropolisDifficultyIncrementDivisor for Expanse
* Revert #7437
* Add Expanse block 900_000 hash checkpoint
* Advance AuRa step as far as we can and prevent invalid blocks. (#7451)
* Advance AuRa step as far as we can.
* Wait for future blocks.
* fixed panic when io is not available for export block, closes #7486 (#7495)
* Update Parity Mainnet Bootnodes (#7476)
* Update Parity Mainnet Bootnodes
* Replace the Azure HDD bootnodes with the new ones :)
* Use https connection (#7503)
Use https when connecting to etherscan.io API for price-info
* Expose default gas price percentile configuration in CLI (#7497)
* Expose gas price percentile.
* Fix light eth_call.
* fix gas_price in light client
2018-01-09 13:55:10 +01:00
|
|
|
gas_price_percentile: self.args.arg_gas_price_percentile,
|
2017-08-28 14:11:55 +02:00
|
|
|
ntp_servers: self.ntp_servers(),
|
2017-04-13 16:32:07 +02:00
|
|
|
ws_conf: ws_conf,
|
2016-07-25 16:09:47 +02:00
|
|
|
http_conf: http_conf,
|
|
|
|
ipc_conf: ipc_conf,
|
|
|
|
net_conf: net_conf,
|
|
|
|
network_id: network_id,
|
2016-12-27 12:53:56 +01:00
|
|
|
acc_conf: self.accounts_config()?,
|
2017-07-17 08:33:26 +02:00
|
|
|
gas_pricer_conf: self.gas_pricer_config()?,
|
2016-12-27 12:53:56 +01:00
|
|
|
miner_extras: self.miner_extras()?,
|
2017-01-25 11:03:36 +01:00
|
|
|
stratum: self.stratum_options()?,
|
2016-11-23 20:35:21 +01:00
|
|
|
update_policy: update_policy,
|
2016-07-25 16:09:47 +02:00
|
|
|
mode: mode,
|
|
|
|
tracing: tracing,
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: fat_db,
|
2016-07-25 16:09:47 +02:00
|
|
|
compaction: compaction,
|
2016-07-29 15:36:00 +02:00
|
|
|
wal: wal,
|
2016-07-25 16:09:47 +02:00
|
|
|
vm_type: vm_type,
|
2016-10-18 18:16:00 +02:00
|
|
|
warp_sync: warp_sync,
|
2017-03-29 17:07:58 +02:00
|
|
|
public_node: public_node,
|
2016-07-25 16:09:47 +02:00
|
|
|
geth_compatibility: geth_compatibility,
|
2017-05-23 12:24:32 +02:00
|
|
|
net_settings: self.network_settings()?,
|
2016-07-25 16:09:47 +02:00
|
|
|
dapps_conf: dapps_conf,
|
2017-02-16 14:41:33 +01:00
|
|
|
ipfs_conf: ipfs_conf,
|
2017-05-24 12:24:07 +02:00
|
|
|
ui_conf: ui_conf,
|
2017-02-20 16:13:21 +01:00
|
|
|
secretstore_conf: secretstore_conf,
|
2017-01-06 16:05:58 +01:00
|
|
|
dapp: self.dapp_to_open()?,
|
2016-07-25 16:09:47 +02:00
|
|
|
ui: self.args.cmd_ui,
|
2017-09-05 13:30:22 +02:00
|
|
|
name: self.args.arg_identity,
|
|
|
|
custom_bootnodes: self.args.arg_bootnodes.is_some(),
|
2016-09-02 20:24:59 +02:00
|
|
|
no_periodic_snapshot: self.args.flag_no_periodic_snapshot,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: !self.args.flag_no_seal_check,
|
2016-11-22 18:03:35 +01:00
|
|
|
download_old_blocks: !self.args.flag_no_ancient_blocks,
|
2016-12-02 18:21:54 +01:00
|
|
|
verifier_settings: verifier_settings,
|
2017-03-22 16:45:50 +01:00
|
|
|
serve_light: !self.args.flag_no_serve_light,
|
|
|
|
light: self.args.flag_light,
|
2017-05-04 12:13:50 +02:00
|
|
|
no_persistent_txqueue: self.args.flag_no_persistent_txqueue,
|
2017-07-14 20:40:28 +02:00
|
|
|
whisper: whisper_config,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
Cmd::Run(run_cmd)
|
|
|
|
};
|
|
|
|
|
2016-11-02 19:42:21 +01:00
|
|
|
Ok(Execute {
|
|
|
|
logger: logger_config,
|
|
|
|
cmd: cmd,
|
|
|
|
})
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn vm_type(&self) -> Result<VMType, String> {
|
|
|
|
if self.args.flag_jitvm {
|
|
|
|
VMType::jit().ok_or("Parity is built without the JIT EVM.".into())
|
|
|
|
} else {
|
|
|
|
Ok(VMType::Interpreter)
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn miner_extras(&self) -> Result<MinerExtras, String> {
|
|
|
|
let extras = MinerExtras {
|
2016-12-27 12:53:56 +01:00
|
|
|
author: self.author()?,
|
|
|
|
extra_data: self.extra_data()?,
|
2017-09-05 13:30:22 +02:00
|
|
|
gas_floor_target: to_u256(&self.args.arg_gas_floor_target)?,
|
|
|
|
gas_ceil_target: to_u256(&self.args.arg_gas_cap)?,
|
2016-12-27 12:53:56 +01:00
|
|
|
engine_signer: self.engine_signer()?,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(extras)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn author(&self) -> Result<Address, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
to_address(self.args.arg_etherbase.clone().or(self.args.arg_author.clone()))
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
2016-12-05 22:31:38 +01:00
|
|
|
fn engine_signer(&self) -> Result<Address, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
to_address(self.args.arg_engine_signer.clone())
|
2016-12-05 20:23:03 +01:00
|
|
|
}
|
|
|
|
|
2016-08-04 09:22:54 +02:00
|
|
|
fn format(&self) -> Result<Option<DataFormat>, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
match self.args.arg_import_format.clone()
|
|
|
|
.or(self.args.arg_export_blocks_format.clone())
|
|
|
|
.or(self.args.arg_export_state_format.clone()) {
|
2016-12-27 12:53:56 +01:00
|
|
|
Some(ref f) => Ok(Some(f.parse()?)),
|
2016-08-04 09:22:54 +02:00
|
|
|
None => Ok(None),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn cache_config(&self) -> CacheConfig {
|
2017-09-05 13:30:22 +02:00
|
|
|
match self.args.arg_cache_size.or(self.args.arg_cache) {
|
2016-07-25 16:09:47 +02:00
|
|
|
Some(size) => CacheConfig::new_with_total_cache_size(size),
|
2016-10-07 00:28:42 +02:00
|
|
|
None => CacheConfig::new(
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_cache_size_db,
|
|
|
|
self.args.arg_cache_size_blocks,
|
|
|
|
self.args.arg_cache_size_queue,
|
|
|
|
self.args.arg_cache_size_state,
|
2016-10-07 00:28:42 +02:00
|
|
|
),
|
2016-07-05 17:50:46 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn logger_config(&self) -> LogConfig {
|
|
|
|
LogConfig {
|
2017-09-05 13:30:22 +02:00
|
|
|
mode: self.args.arg_logging.clone(),
|
2016-07-25 16:09:47 +02:00
|
|
|
color: !self.args.flag_no_color && !cfg!(windows),
|
2017-09-05 13:30:22 +02:00
|
|
|
file: self.args.arg_log_file.clone(),
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
|
2017-10-25 13:13:11 +02:00
|
|
|
fn chain(&self) -> Result<SpecType, String> {
|
|
|
|
let name = if let Some(ref s) = self.spec_name_override {
|
2017-03-13 12:10:53 +01:00
|
|
|
s.clone()
|
2017-10-25 13:13:11 +02:00
|
|
|
} else if self.args.flag_testnet {
|
2017-03-02 20:24:27 +01:00
|
|
|
"testnet".to_owned()
|
2016-04-30 19:58:28 +02:00
|
|
|
} else {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_chain.clone()
|
2017-10-25 13:13:11 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(name.parse()?)
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn max_peers(&self) -> u32 {
|
2017-09-05 13:30:22 +02:00
|
|
|
let peers = self.args.arg_max_peers as u32;
|
2016-07-29 17:30:02 +02:00
|
|
|
max(self.min_peers(), peers)
|
|
|
|
}
|
|
|
|
|
2017-07-28 19:06:39 +02:00
|
|
|
fn ip_filter(&self) -> Result<IpFilter, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
match IpFilter::parse(self.args.arg_allow_ips.as_str()) {
|
2017-07-28 19:06:39 +02:00
|
|
|
Ok(allow_ip) => Ok(allow_ip),
|
|
|
|
Err(_) => Err("Invalid IP filter value".to_owned()),
|
2016-10-24 18:25:27 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-29 17:30:02 +02:00
|
|
|
fn min_peers(&self) -> u32 {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_peers.unwrap_or(self.args.arg_min_peers) as u32
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
|
2016-10-24 18:25:27 +02:00
|
|
|
fn max_pending_peers(&self) -> u32 {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_max_pending_peers as u32
|
2016-10-24 18:25:27 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn snapshot_peers(&self) -> u32 {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_snapshot_peers as u32
|
2016-10-24 18:25:27 +02:00
|
|
|
}
|
|
|
|
|
2016-06-29 20:07:21 +02:00
|
|
|
fn work_notify(&self) -> Vec<String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_notify_work.as_ref().map_or_else(Vec::new, |s| s.split(',').map(|s| s.to_owned()).collect())
|
2016-06-29 15:37:11 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn accounts_config(&self) -> Result<AccountsConfig, String> {
|
|
|
|
let cfg = AccountsConfig {
|
2017-09-05 13:30:22 +02:00
|
|
|
iterations: self.args.arg_keys_iterations,
|
2016-07-25 16:09:47 +02:00
|
|
|
testnet: self.args.flag_testnet,
|
2017-09-05 13:30:22 +02:00
|
|
|
password_files: self.args.arg_password.clone(),
|
|
|
|
unlocked_accounts: to_addresses(&self.args.arg_unlock)?,
|
2017-02-10 01:07:06 +01:00
|
|
|
enable_hardware_wallets: !self.args.flag_no_hardware_wallets,
|
2017-06-06 18:06:40 +02:00
|
|
|
enable_fast_unlock: self.args.flag_fast_unlock,
|
2016-06-27 17:23:54 +02:00
|
|
|
};
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
Ok(cfg)
|
|
|
|
}
|
|
|
|
|
2017-01-25 11:03:36 +01:00
|
|
|
fn stratum_options(&self) -> Result<Option<StratumOptions>, String> {
|
|
|
|
if self.args.flag_stratum {
|
|
|
|
Ok(Some(StratumOptions {
|
|
|
|
io_path: self.directories().db,
|
|
|
|
listen_addr: self.stratum_interface(),
|
2017-09-05 13:30:22 +02:00
|
|
|
port: self.args.arg_ports_shift + self.args.arg_stratum_port,
|
|
|
|
secret: self.args.arg_stratum_secret.as_ref().map(|s| s.parse::<H256>().unwrap_or_else(|_| keccak(s))),
|
2017-01-25 11:03:36 +01:00
|
|
|
}))
|
|
|
|
} else { Ok(None) }
|
|
|
|
}
|
|
|
|
|
2017-10-25 13:13:11 +02:00
|
|
|
fn miner_options(&self) -> Result<MinerOptions, String> {
|
|
|
|
let is_dev_chain = self.chain()? == SpecType::Dev;
|
|
|
|
if is_dev_chain && self.args.flag_force_sealing && self.args.arg_reseal_min_period == 0 {
|
2017-07-01 17:20:49 +02:00
|
|
|
return Err("Force sealing can't be used with reseal_min_period = 0".into());
|
|
|
|
}
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
let reseal = self.args.arg_reseal_on_txs.parse::<ResealPolicy>()?;
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
let options = MinerOptions {
|
2016-06-29 15:37:11 +02:00
|
|
|
new_work_notify: self.work_notify(),
|
2016-06-27 17:23:54 +02:00
|
|
|
force_sealing: self.args.flag_force_sealing,
|
2016-07-25 16:09:47 +02:00
|
|
|
reseal_on_external_tx: reseal.external,
|
|
|
|
reseal_on_own_tx: reseal.own,
|
2017-07-10 13:36:42 +02:00
|
|
|
reseal_on_uncle: self.args.flag_reseal_on_uncle,
|
2017-09-05 13:30:22 +02:00
|
|
|
tx_gas_limit: match self.args.arg_tx_gas_limit {
|
2016-12-27 12:53:56 +01:00
|
|
|
Some(ref d) => to_u256(d)?,
|
2016-07-25 16:09:47 +02:00
|
|
|
None => U256::max_value(),
|
2016-06-27 18:27:06 +02:00
|
|
|
},
|
2017-09-05 13:30:22 +02:00
|
|
|
tx_queue_size: self.args.arg_tx_queue_size,
|
|
|
|
tx_queue_memory_limit: if self.args.arg_tx_queue_mem_limit > 0 {
|
|
|
|
Some(self.args.arg_tx_queue_mem_limit as usize * 1024 * 1024)
|
2017-07-13 15:12:25 +02:00
|
|
|
} else { None },
|
2017-09-05 13:30:22 +02:00
|
|
|
tx_queue_gas_limit: to_gas_limit(&self.args.arg_tx_queue_gas)?,
|
|
|
|
tx_queue_strategy: to_queue_strategy(&self.args.arg_tx_queue_strategy)?,
|
|
|
|
pending_set: to_pending_set(&self.args.arg_relay_set)?,
|
2017-10-25 13:13:11 +02:00
|
|
|
reseal_min_period: Duration::from_millis(self.args.arg_reseal_min_period),
|
2017-09-05 13:30:22 +02:00
|
|
|
reseal_max_period: Duration::from_millis(self.args.arg_reseal_max_period),
|
|
|
|
work_queue_size: self.args.arg_work_queue_size,
|
2016-06-30 12:56:58 +02:00
|
|
|
enable_resubmission: !self.args.flag_remove_solved,
|
2017-09-05 13:30:22 +02:00
|
|
|
tx_queue_banning: match self.args.arg_tx_time_limit {
|
2016-10-27 19:28:34 +02:00
|
|
|
Some(limit) => Banning::Enabled {
|
2017-09-05 13:30:22 +02:00
|
|
|
min_offends: self.args.arg_tx_queue_ban_count,
|
2016-10-27 19:28:34 +02:00
|
|
|
offend_threshold: Duration::from_millis(limit),
|
2017-09-05 13:30:22 +02:00
|
|
|
ban_duration: Duration::from_secs(self.args.arg_tx_queue_ban_time as u64),
|
2016-10-27 19:28:34 +02:00
|
|
|
},
|
|
|
|
None => Banning::Disabled,
|
2017-01-22 16:15:22 +01:00
|
|
|
},
|
|
|
|
refuse_service_transactions: self.args.flag_refuse_service_transactions,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
2016-04-21 16:45:04 +02:00
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
Ok(options)
|
2016-06-23 14:29:16 +02:00
|
|
|
}
|
2016-06-19 13:20:14 +02:00
|
|
|
|
2017-08-10 18:32:10 +02:00
|
|
|
fn ui_port(&self) -> u16 {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_ports_shift + self.args.arg_ui_port
|
2017-08-10 18:32:10 +02:00
|
|
|
}
|
|
|
|
|
2017-08-09 08:45:07 +02:00
|
|
|
fn ntp_servers(&self) -> Vec<String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_ntp_servers.split(",").map(str::to_owned).collect()
|
2017-08-09 08:45:07 +02:00
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
fn ui_config(&self) -> UiConfiguration {
|
|
|
|
UiConfiguration {
|
2016-11-07 17:40:53 +01:00
|
|
|
enabled: self.ui_enabled(),
|
|
|
|
interface: self.ui_interface(),
|
2017-08-10 18:32:10 +02:00
|
|
|
port: self.ui_port(),
|
2017-05-24 12:24:07 +02:00
|
|
|
hosts: self.ui_hosts(),
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn dapps_config(&self) -> DappsConfiguration {
|
2017-08-10 18:32:10 +02:00
|
|
|
let dev_ui = if self.args.flag_ui_no_validation { vec![("localhost".to_owned(), 3000)] } else { vec![] };
|
|
|
|
let ui_port = self.ui_port();
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
DappsConfiguration {
|
|
|
|
enabled: self.dapps_enabled(),
|
2017-01-06 16:05:58 +01:00
|
|
|
dapps_path: PathBuf::from(self.directories().dapps),
|
|
|
|
extra_dapps: if self.args.cmd_dapp {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_dapp_path.iter().map(|path| PathBuf::from(path)).collect()
|
2017-01-06 16:05:58 +01:00
|
|
|
} else {
|
|
|
|
vec![]
|
|
|
|
},
|
2017-08-10 18:32:10 +02:00
|
|
|
extra_embed_on: {
|
|
|
|
let mut extra_embed = dev_ui.clone();
|
|
|
|
match self.ui_hosts() {
|
|
|
|
// In case host validation is disabled allow all frame ancestors
|
|
|
|
None => extra_embed.push(("*".to_owned(), ui_port)),
|
|
|
|
Some(hosts) => extra_embed.extend(hosts.into_iter().filter_map(|host| {
|
|
|
|
let mut it = host.split(":");
|
|
|
|
let host = it.next();
|
|
|
|
let port = it.next().and_then(|v| u16::from_str(v).ok());
|
|
|
|
|
|
|
|
match (host, port) {
|
|
|
|
(Some(host), Some(port)) => Some((host.into(), port)),
|
|
|
|
(Some(host), None) => Some((host.into(), ui_port)),
|
|
|
|
_ => None,
|
|
|
|
}
|
|
|
|
})),
|
|
|
|
}
|
|
|
|
extra_embed
|
2017-07-11 13:45:23 +02:00
|
|
|
},
|
2017-08-10 18:32:10 +02:00
|
|
|
extra_script_src: dev_ui,
|
2017-01-06 16:05:58 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-08 11:26:16 +02:00
|
|
|
fn secretstore_config(&self) -> Result<SecretStoreConfiguration, String> {
|
|
|
|
Ok(SecretStoreConfiguration {
|
2017-02-20 16:13:21 +01:00
|
|
|
enabled: self.secretstore_enabled(),
|
2017-07-27 12:29:09 +02:00
|
|
|
http_enabled: self.secretstore_http_enabled(),
|
2017-07-27 14:48:07 +02:00
|
|
|
acl_check_enabled: self.secretstore_acl_check_enabled(),
|
2017-04-08 11:26:16 +02:00
|
|
|
self_secret: self.secretstore_self_secret()?,
|
|
|
|
nodes: self.secretstore_nodes()?,
|
2017-02-20 16:13:21 +01:00
|
|
|
interface: self.secretstore_interface(),
|
2017-09-05 13:30:22 +02:00
|
|
|
port: self.args.arg_ports_shift + self.args.arg_secretstore_port,
|
2017-04-08 11:26:16 +02:00
|
|
|
http_interface: self.secretstore_http_interface(),
|
2017-09-05 13:30:22 +02:00
|
|
|
http_port: self.args.arg_ports_shift + self.args.arg_secretstore_http_port,
|
2017-02-20 16:13:21 +01:00
|
|
|
data_path: self.directories().secretstore,
|
2017-10-02 15:27:31 +02:00
|
|
|
admin_public: self.secretstore_admin_public()?,
|
2017-04-08 11:26:16 +02:00
|
|
|
})
|
2017-02-20 16:13:21 +01:00
|
|
|
}
|
|
|
|
|
2017-02-16 14:41:33 +01:00
|
|
|
fn ipfs_config(&self) -> IpfsConfiguration {
|
|
|
|
IpfsConfiguration {
|
|
|
|
enabled: self.args.flag_ipfs_api,
|
2017-09-05 13:30:22 +02:00
|
|
|
port: self.args.arg_ports_shift + self.args.arg_ipfs_api_port,
|
2017-02-24 10:32:42 +01:00
|
|
|
interface: self.ipfs_interface(),
|
|
|
|
cors: self.ipfs_cors(),
|
|
|
|
hosts: self.ipfs_hosts(),
|
2017-02-16 14:41:33 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-06 16:05:58 +01:00
|
|
|
fn dapp_to_open(&self) -> Result<Option<String>, String> {
|
|
|
|
if !self.args.cmd_dapp {
|
|
|
|
return Ok(None);
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
2017-09-05 13:30:22 +02:00
|
|
|
let path = self.args.arg_dapp_path.as_ref().map(String::as_str).unwrap_or(".");
|
2017-01-06 16:05:58 +01:00
|
|
|
let path = Path::new(path).canonicalize()
|
|
|
|
.map_err(|e| format!("Invalid path: {}. Error: {:?}", path, e))?;
|
|
|
|
let name = path.file_name()
|
|
|
|
.and_then(|name| name.to_str())
|
|
|
|
.ok_or_else(|| "Root path is not supported.".to_owned())?;
|
|
|
|
Ok(Some(name.into()))
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn gas_pricer_config(&self) -> Result<GasPricerConfig, String> {
|
2017-01-18 19:44:24 +01:00
|
|
|
fn wei_per_gas(usd_per_tx: f32, usd_per_eth: f32) -> U256 {
|
|
|
|
let wei_per_usd: f32 = 1.0e18 / usd_per_eth;
|
|
|
|
let gas_per_tx: f32 = 21000.0;
|
|
|
|
let wei_per_gas: f32 = wei_per_usd * usd_per_tx / gas_per_tx;
|
|
|
|
U256::from_dec_str(&format!("{:.0}", wei_per_gas)).unwrap()
|
|
|
|
}
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
if let Some(dec) = self.args.arg_gasprice.as_ref() {
|
2017-07-13 14:25:41 +02:00
|
|
|
return Ok(GasPricerConfig::Fixed(to_u256(dec)?));
|
2017-09-05 13:30:22 +02:00
|
|
|
} else if let Some(dec) = self.args.arg_min_gas_price {
|
2017-07-14 04:40:47 +02:00
|
|
|
return Ok(GasPricerConfig::Fixed(U256::from(dec)));
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
let usd_per_tx = to_price(&self.args.arg_usd_per_tx)?;
|
|
|
|
if "auto" == self.args.arg_usd_per_eth.as_str() {
|
2017-01-18 19:44:24 +01:00
|
|
|
// Just a very rough estimate to avoid accepting
|
|
|
|
// ZGP transactions before the price is fetched
|
|
|
|
// if user does not want it.
|
|
|
|
let last_known_usd_per_eth = 10.0;
|
2016-07-25 16:09:47 +02:00
|
|
|
return Ok(GasPricerConfig::Calibrated {
|
2017-01-18 19:44:24 +01:00
|
|
|
initial_minimum: wei_per_gas(usd_per_tx, last_known_usd_per_eth),
|
2016-07-25 16:09:47 +02:00
|
|
|
usd_per_tx: usd_per_tx,
|
2017-09-05 13:30:22 +02:00
|
|
|
recalibration_period: to_duration(self.args.arg_price_update_period.as_str())?,
|
2016-07-25 16:09:47 +02:00
|
|
|
});
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
2016-07-25 16:09:47 +02:00
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
let usd_per_eth = to_price(&self.args.arg_usd_per_eth)?;
|
2017-01-18 19:44:24 +01:00
|
|
|
let wei_per_gas = wei_per_gas(usd_per_tx, usd_per_eth);
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
info!(
|
|
|
|
"Using a fixed conversion rate of Ξ1 = {} ({} wei/gas)",
|
2017-04-19 22:59:02 +02:00
|
|
|
Colour::White.bold().paint(format!("US${:.2}", usd_per_eth)),
|
2016-07-25 16:09:47 +02:00
|
|
|
Colour::Yellow.bold().paint(format!("{}", wei_per_gas))
|
|
|
|
);
|
|
|
|
|
2017-01-18 19:44:24 +01:00
|
|
|
Ok(GasPricerConfig::Fixed(wei_per_gas))
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn extra_data(&self) -> Result<Bytes, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
match self.args.arg_extradata.as_ref().or(self.args.arg_extra_data.as_ref()) {
|
2016-08-17 16:06:41 +02:00
|
|
|
Some(x) if x.len() <= 32 => Ok(x.as_bytes().to_owned()),
|
2016-07-25 16:09:47 +02:00
|
|
|
None => Ok(version_data()),
|
|
|
|
Some(_) => Err("Extra data must be at most 32 characters".into()),
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn init_reserved_nodes(&self) -> Result<Vec<String>, String> {
|
2016-06-20 14:13:33 +02:00
|
|
|
use std::fs::File;
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
match self.args.arg_reserved_peers {
|
2016-07-25 16:09:47 +02:00
|
|
|
Some(ref path) => {
|
|
|
|
let mut buffer = String::new();
|
2016-12-27 12:53:56 +01:00
|
|
|
let mut node_file = File::open(path).map_err(|e| format!("Error opening reserved nodes file: {}", e))?;
|
|
|
|
node_file.read_to_string(&mut buffer).map_err(|_| "Error reading reserved node file")?;
|
2017-07-10 13:24:40 +02:00
|
|
|
let lines = buffer.lines().map(|s| s.trim().to_owned()).filter(|s| !s.is_empty() && !s.starts_with("#")).collect::<Vec<_>>();
|
2016-07-29 10:22:51 +02:00
|
|
|
if let Some(invalid) = lines.iter().find(|s| !is_valid_node_url(s)) {
|
|
|
|
return Err(format!("Invalid node address format given for a boot node: {}", invalid));
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
2016-07-29 10:22:51 +02:00
|
|
|
Ok(lines)
|
2016-07-25 16:09:47 +02:00
|
|
|
},
|
|
|
|
None => Ok(Vec::new())
|
2016-06-20 14:13:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-23 12:24:32 +02:00
|
|
|
fn net_addresses(&self) -> Result<(SocketAddr, Option<SocketAddr>), String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
let port = self.args.arg_ports_shift + self.args.arg_port;
|
2017-05-23 12:24:32 +02:00
|
|
|
let listen_address = SocketAddr::new("0.0.0.0".parse().unwrap(), port);
|
2017-09-05 13:30:22 +02:00
|
|
|
let public_address = if self.args.arg_nat.starts_with("extip:") {
|
|
|
|
let host = &self.args.arg_nat[6..];
|
2016-12-27 12:53:56 +01:00
|
|
|
let host = host.parse().map_err(|_| format!("Invalid host given with `--nat extip:{}`", host))?;
|
2016-04-30 19:58:28 +02:00
|
|
|
Some(SocketAddr::new(host, port))
|
2016-04-21 16:45:04 +02:00
|
|
|
} else {
|
2016-07-04 18:21:22 +02:00
|
|
|
None
|
2016-04-21 16:45:04 +02:00
|
|
|
};
|
2016-07-25 16:09:47 +02:00
|
|
|
Ok((listen_address, public_address))
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn net_config(&self) -> Result<NetworkConfiguration, String> {
|
2016-04-21 16:45:04 +02:00
|
|
|
let mut ret = NetworkConfiguration::new();
|
2017-09-05 13:30:22 +02:00
|
|
|
ret.nat_enabled = self.args.arg_nat == "any" || self.args.arg_nat == "upnp";
|
|
|
|
ret.boot_nodes = to_bootnodes(&self.args.arg_bootnodes)?;
|
2016-12-27 12:53:56 +01:00
|
|
|
let (listen, public) = self.net_addresses()?;
|
2017-05-23 12:24:32 +02:00
|
|
|
ret.listen_address = Some(format!("{}", listen));
|
2016-08-05 10:32:04 +02:00
|
|
|
ret.public_address = public.map(|p| format!("{}", p));
|
2017-09-05 13:30:22 +02:00
|
|
|
ret.use_secret = match self.args.arg_node_key.as_ref()
|
2017-08-31 11:35:41 +02:00
|
|
|
.map(|s| s.parse::<Secret>().or_else(|_| Secret::from_unsafe_slice(&keccak(s))).map_err(|e| format!("Invalid key: {:?}", e))
|
2017-01-11 12:16:47 +01:00
|
|
|
) {
|
|
|
|
None => None,
|
|
|
|
Some(Ok(key)) => Some(key),
|
|
|
|
Some(Err(err)) => return Err(err),
|
|
|
|
};
|
2016-04-21 16:45:04 +02:00
|
|
|
ret.discovery_enabled = !self.args.flag_no_discovery && !self.args.flag_nodiscover;
|
2016-07-29 17:30:02 +02:00
|
|
|
ret.max_peers = self.max_peers();
|
|
|
|
ret.min_peers = self.min_peers();
|
2016-10-24 18:25:27 +02:00
|
|
|
ret.snapshot_peers = self.snapshot_peers();
|
2017-07-28 19:06:39 +02:00
|
|
|
ret.ip_filter = self.ip_filter()?;
|
2016-10-24 18:25:27 +02:00
|
|
|
ret.max_pending_peers = self.max_pending_peers();
|
2016-12-15 21:56:45 +01:00
|
|
|
let mut net_path = PathBuf::from(self.directories().base);
|
2016-04-21 16:45:04 +02:00
|
|
|
net_path.push("network");
|
|
|
|
ret.config_path = Some(net_path.to_str().unwrap().to_owned());
|
2016-12-27 12:53:56 +01:00
|
|
|
ret.reserved_nodes = self.init_reserved_nodes()?;
|
2016-08-05 10:32:04 +02:00
|
|
|
ret.allow_non_reserved = !self.args.flag_reserved_only;
|
2016-07-25 16:09:47 +02:00
|
|
|
Ok(ret)
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-12-05 15:54:31 +01:00
|
|
|
fn network_id(&self) -> Option<u64> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_network_id.or(self.args.arg_networkid)
|
2016-07-11 09:46:33 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn rpc_apis(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
let mut apis: Vec<&str> = self.args.arg_rpcapi
|
2017-03-29 17:07:58 +02:00
|
|
|
.as_ref()
|
2017-09-05 13:30:22 +02:00
|
|
|
.unwrap_or(&self.args.arg_jsonrpc_apis)
|
2017-03-29 17:07:58 +02:00
|
|
|
.split(",")
|
|
|
|
.collect();
|
|
|
|
|
2016-11-06 12:51:53 +01:00
|
|
|
if self.args.flag_geth {
|
2017-04-06 19:38:33 +02:00
|
|
|
apis.insert(0, "personal");
|
2017-03-29 17:07:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
apis.join(",")
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn cors(cors: Option<&String>) -> Option<Vec<String>> {
|
2017-12-27 18:56:23 +01:00
|
|
|
// Never return `None` here (enables CORS for all hosts).
|
|
|
|
Some(cors.map(|ref c| c.split(',').map(Into::into).collect()).unwrap_or_default())
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn rpc_cors(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
let cors = self.args.arg_jsonrpc_cors.as_ref().or(self.args.arg_rpccorsdomain.as_ref());
|
2017-02-24 10:32:42 +01:00
|
|
|
Self::cors(cors)
|
2016-07-20 12:34:17 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn ipfs_cors(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
Self::cors(self.args.arg_ipfs_api_cors.as_ref())
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2017-05-23 12:24:32 +02:00
|
|
|
fn hosts(&self, hosts: &str, interface: &str) -> Option<Vec<String>> {
|
|
|
|
if self.args.flag_unsafe_expose {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
if interface == "0.0.0.0" && hosts == "none" {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
Self::parse_hosts(hosts)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn parse_hosts(hosts: &str) -> Option<Vec<String>> {
|
2017-02-24 10:32:42 +01:00
|
|
|
match hosts {
|
2016-07-20 12:34:17 +02:00
|
|
|
"none" => return Some(Vec::new()),
|
2017-04-03 10:27:37 +02:00
|
|
|
"*" | "all" | "any" => return None,
|
2016-07-20 12:34:17 +02:00
|
|
|
_ => {}
|
|
|
|
}
|
2017-02-24 10:32:42 +01:00
|
|
|
let hosts = hosts.split(',').map(Into::into).collect();
|
2016-07-20 12:34:17 +02:00
|
|
|
Some(hosts)
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
2016-05-13 12:53:33 +02:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
fn ui_hosts(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.hosts(&self.args.arg_ui_hosts, &self.ui_interface())
|
2017-05-24 12:24:07 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn rpc_hosts(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.hosts(&self.args.arg_jsonrpc_hosts, &self.rpc_interface())
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2017-04-13 16:32:07 +02:00
|
|
|
fn ws_hosts(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.hosts(&self.args.arg_ws_hosts, &self.ws_interface())
|
2017-04-13 16:32:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn ws_origins(&self) -> Option<Vec<String>> {
|
2017-07-11 14:49:35 +02:00
|
|
|
if self.args.flag_unsafe_expose || self.args.flag_ui_no_validation {
|
2017-06-03 14:41:42 +02:00
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
Self::parse_hosts(&self.args.arg_ws_origins)
|
2017-04-13 16:32:07 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn ipfs_hosts(&self) -> Option<Vec<String>> {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.hosts(&self.args.arg_ipfs_api_hosts, &self.ipfs_interface())
|
2016-08-25 08:57:13 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn ipc_config(&self) -> Result<IpcConfiguration, String> {
|
|
|
|
let conf = IpcConfiguration {
|
|
|
|
enabled: !(self.args.flag_ipcdisable || self.args.flag_ipc_off || self.args.flag_no_ipc),
|
|
|
|
socket_addr: self.ipc_path(),
|
2016-11-06 12:51:53 +01:00
|
|
|
apis: {
|
2017-09-05 13:30:22 +02:00
|
|
|
let mut apis = self.args.arg_ipcapi.clone().unwrap_or(self.args.arg_ipc_apis.clone());
|
2016-11-06 12:51:53 +01:00
|
|
|
if self.args.flag_geth {
|
2016-11-08 21:45:22 +01:00
|
|
|
if !apis.is_empty() {
|
|
|
|
apis.push_str(",");
|
|
|
|
}
|
2016-11-06 12:51:53 +01:00
|
|
|
apis.push_str("personal");
|
|
|
|
}
|
2016-12-27 12:53:56 +01:00
|
|
|
apis.parse()?
|
2016-11-06 12:51:53 +01:00
|
|
|
},
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
2016-05-13 12:53:33 +02:00
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
Ok(conf)
|
2016-05-14 19:43:29 +02:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn http_config(&self) -> Result<HttpConfiguration, String> {
|
|
|
|
let conf = HttpConfiguration {
|
2017-04-03 10:27:37 +02:00
|
|
|
enabled: self.rpc_enabled(),
|
2016-07-25 16:09:47 +02:00
|
|
|
interface: self.rpc_interface(),
|
2017-09-05 13:30:22 +02:00
|
|
|
port: self.args.arg_ports_shift + self.args.arg_rpcport.unwrap_or(self.args.arg_jsonrpc_port),
|
2017-04-06 19:38:33 +02:00
|
|
|
apis: match self.args.flag_public_node {
|
|
|
|
false => self.rpc_apis().parse()?,
|
|
|
|
true => self.rpc_apis().parse::<ApiSet>()?.retain(ApiSet::PublicContext),
|
|
|
|
},
|
2016-07-25 16:09:47 +02:00
|
|
|
hosts: self.rpc_hosts(),
|
|
|
|
cors: self.rpc_cors(),
|
2017-09-05 13:30:22 +02:00
|
|
|
server_threads: match self.args.arg_jsonrpc_server_threads {
|
2017-10-05 12:35:01 +02:00
|
|
|
Some(threads) if threads > 0 => threads,
|
|
|
|
_ => 1,
|
2017-07-11 12:22:19 +02:00
|
|
|
},
|
2017-09-05 13:30:22 +02:00
|
|
|
processing_threads: self.args.arg_jsonrpc_threads,
|
2016-07-25 16:09:47 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(conf)
|
2016-05-04 15:37:09 +02:00
|
|
|
}
|
|
|
|
|
2017-04-13 16:32:07 +02:00
|
|
|
fn ws_config(&self) -> Result<WsConfiguration, String> {
|
2017-05-24 12:24:07 +02:00
|
|
|
let ui = self.ui_config();
|
|
|
|
|
2017-04-13 16:32:07 +02:00
|
|
|
let conf = WsConfiguration {
|
|
|
|
enabled: self.ws_enabled(),
|
|
|
|
interface: self.ws_interface(),
|
2017-09-05 13:30:22 +02:00
|
|
|
port: self.args.arg_ports_shift + self.args.arg_ws_port,
|
|
|
|
apis: self.args.arg_ws_apis.parse()?,
|
2017-04-13 16:32:07 +02:00
|
|
|
hosts: self.ws_hosts(),
|
2017-05-24 12:24:07 +02:00
|
|
|
origins: self.ws_origins(),
|
|
|
|
signer_path: self.directories().signer.into(),
|
2017-06-12 15:57:16 +02:00
|
|
|
support_token_api: !self.args.flag_public_node,
|
2017-05-24 12:24:07 +02:00
|
|
|
ui_address: ui.address(),
|
2017-04-13 16:32:07 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(conf)
|
|
|
|
}
|
|
|
|
|
2017-05-23 12:24:32 +02:00
|
|
|
fn network_settings(&self) -> Result<NetworkSettings, String> {
|
|
|
|
let http_conf = self.http_config()?;
|
|
|
|
let net_addresses = self.net_addresses()?;
|
|
|
|
Ok(NetworkSettings {
|
2017-09-05 13:30:22 +02:00
|
|
|
name: self.args.arg_identity.clone(),
|
2017-10-25 13:13:11 +02:00
|
|
|
chain: format!("{}", self.chain()?),
|
2017-05-23 12:24:32 +02:00
|
|
|
network_port: net_addresses.0.port(),
|
|
|
|
rpc_enabled: http_conf.enabled,
|
|
|
|
rpc_interface: http_conf.interface,
|
|
|
|
rpc_port: http_conf.port,
|
|
|
|
})
|
2016-04-21 19:19:42 +02:00
|
|
|
}
|
2016-05-13 17:32:32 +02:00
|
|
|
|
2016-11-23 20:35:21 +01:00
|
|
|
fn update_policy(&self) -> Result<UpdatePolicy, String> {
|
|
|
|
Ok(UpdatePolicy {
|
|
|
|
enable_downloading: !self.args.flag_no_download,
|
2016-12-11 16:52:41 +01:00
|
|
|
require_consensus: !self.args.flag_no_consensus,
|
2017-09-05 13:30:22 +02:00
|
|
|
filter: match self.args.arg_auto_update.as_ref() {
|
2016-11-23 20:35:21 +01:00
|
|
|
"none" => UpdateFilter::None,
|
|
|
|
"critical" => UpdateFilter::Critical,
|
|
|
|
"all" => UpdateFilter::All,
|
2016-12-16 21:45:51 +01:00
|
|
|
_ => return Err("Invalid value for `--auto-update`. See `--help` for more information.".into()),
|
2016-11-23 20:35:21 +01:00
|
|
|
},
|
2017-09-05 13:30:22 +02:00
|
|
|
track: match self.args.arg_release_track.as_ref() {
|
2016-12-15 18:51:59 +01:00
|
|
|
"stable" => ReleaseTrack::Stable,
|
|
|
|
"beta" => ReleaseTrack::Beta,
|
|
|
|
"nightly" => ReleaseTrack::Nightly,
|
|
|
|
"testing" => ReleaseTrack::Testing,
|
|
|
|
"current" => ReleaseTrack::Unknown,
|
2016-12-16 21:45:51 +01:00
|
|
|
_ => return Err("Invalid value for `--releases-track`. See `--help` for more information.".into()),
|
2016-12-15 18:51:59 +01:00
|
|
|
},
|
2016-12-15 19:53:13 +01:00
|
|
|
path: default_hypervisor_path(),
|
2016-11-23 20:35:21 +01:00
|
|
|
})
|
2016-11-23 16:29:15 +01:00
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn directories(&self) -> Directories {
|
2017-01-05 14:12:54 +01:00
|
|
|
let local_path = default_local_path();
|
2017-09-05 13:30:22 +02:00
|
|
|
let base_path = self.args.arg_base_path.as_ref().or_else(|| self.args.arg_datadir.as_ref()).map_or_else(|| default_data_path(), |s| s.clone());
|
2017-05-29 15:15:54 +02:00
|
|
|
let data_path = replace_home("", &base_path);
|
2017-09-05 13:30:22 +02:00
|
|
|
let is_using_base_path = self.args.arg_base_path.is_some();
|
2017-07-10 12:57:40 +02:00
|
|
|
// If base_path is set and db_path is not we default to base path subdir instead of LOCAL.
|
2017-09-05 13:30:22 +02:00
|
|
|
let base_db_path = if is_using_base_path && self.args.arg_db_path.is_none() {
|
2017-01-18 18:45:30 +01:00
|
|
|
"$BASE/chains"
|
2017-01-05 14:12:54 +01:00
|
|
|
} else {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.args.arg_db_path.as_ref().map_or(dir::CHAINS_PATH, |s| &s)
|
2017-01-05 14:12:54 +01:00
|
|
|
};
|
2017-08-02 12:38:58 +02:00
|
|
|
let cache_path = if is_using_base_path { "$BASE/cache" } else { dir::CACHE_PATH };
|
2017-01-18 18:45:30 +01:00
|
|
|
|
2017-07-10 12:57:40 +02:00
|
|
|
let db_path = replace_home_and_local(&data_path, &local_path, &base_db_path);
|
2017-08-02 12:38:58 +02:00
|
|
|
let cache_path = replace_home_and_local(&data_path, &local_path, cache_path);
|
2017-09-05 13:30:22 +02:00
|
|
|
let keys_path = replace_home(&data_path, &self.args.arg_keys_path);
|
|
|
|
let dapps_path = replace_home(&data_path, &self.args.arg_dapps_path);
|
|
|
|
let secretstore_path = replace_home(&data_path, &self.args.arg_secretstore_path);
|
|
|
|
let ui_path = replace_home(&data_path, &self.args.arg_ui_path);
|
2016-05-13 17:32:32 +02:00
|
|
|
|
|
|
|
Directories {
|
|
|
|
keys: keys_path,
|
2016-12-15 21:56:45 +01:00
|
|
|
base: data_path,
|
2017-07-10 12:57:40 +02:00
|
|
|
cache: cache_path,
|
2016-12-15 21:56:45 +01:00
|
|
|
db: db_path,
|
2016-06-03 11:51:11 +02:00
|
|
|
dapps: dapps_path,
|
2016-11-07 17:40:53 +01:00
|
|
|
signer: ui_path,
|
2017-02-20 16:13:21 +01:00
|
|
|
secretstore: secretstore_path,
|
2016-05-13 17:32:32 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn ipc_path(&self) -> String {
|
2016-06-15 00:57:49 +02:00
|
|
|
if self.args.flag_geth {
|
2016-07-25 16:09:47 +02:00
|
|
|
geth_ipc_path(self.args.flag_testnet)
|
2016-06-15 00:57:49 +02:00
|
|
|
} else {
|
2017-05-23 12:24:32 +02:00
|
|
|
parity_ipc_path(
|
|
|
|
&self.directories().base,
|
2017-09-05 13:30:22 +02:00
|
|
|
&self.args.arg_ipcpath.clone().unwrap_or(self.args.arg_ipc_path.clone()),
|
|
|
|
self.args.arg_ports_shift,
|
2017-05-23 12:24:32 +02:00
|
|
|
)
|
2016-06-13 18:55:24 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-23 12:24:32 +02:00
|
|
|
fn interface(&self, interface: &str) -> String {
|
|
|
|
if self.args.flag_unsafe_expose {
|
|
|
|
return "0.0.0.0".into();
|
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
match interface {
|
2016-06-24 12:10:36 +02:00
|
|
|
"all" => "0.0.0.0",
|
|
|
|
"local" => "127.0.0.1",
|
|
|
|
x => x,
|
|
|
|
}.into()
|
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
fn ui_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_ui_interface)
|
2017-05-24 12:24:07 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn rpc_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
let rpc_interface = self.args.arg_rpcaddr.clone().unwrap_or(self.args.arg_jsonrpc_interface.clone());
|
2017-05-23 12:24:32 +02:00
|
|
|
self.interface(&rpc_interface)
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2017-04-13 16:32:07 +02:00
|
|
|
fn ws_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_ws_interface)
|
2017-04-13 16:32:07 +02:00
|
|
|
}
|
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
fn ipfs_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_ipfs_api_interface)
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2017-02-20 16:13:21 +01:00
|
|
|
fn secretstore_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_secretstore_interface)
|
2017-04-08 11:26:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
fn secretstore_http_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_secretstore_http_interface)
|
2017-04-08 11:26:16 +02:00
|
|
|
}
|
|
|
|
|
2017-08-09 11:09:40 +02:00
|
|
|
fn secretstore_self_secret(&self) -> Result<Option<NodeSecretKey>, String> {
|
2017-09-05 13:30:22 +02:00
|
|
|
match self.args.arg_secretstore_secret {
|
2017-08-09 11:09:40 +02:00
|
|
|
Some(ref s) if s.len() == 64 => Ok(Some(NodeSecretKey::Plain(s.parse()
|
|
|
|
.map_err(|e| format!("Invalid secret store secret: {}. Error: {:?}", s, e))?))),
|
|
|
|
Some(ref s) if s.len() == 40 => Ok(Some(NodeSecretKey::KeyStore(s.parse()
|
|
|
|
.map_err(|e| format!("Invalid secret store secret address: {}. Error: {:?}", s, e))?))),
|
|
|
|
Some(_) => Err(format!("Invalid secret store secret. Must be either existing account address, or hex-encoded private key")),
|
2017-04-08 11:26:16 +02:00
|
|
|
None => Ok(None),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-02 15:27:31 +02:00
|
|
|
fn secretstore_admin_public(&self) -> Result<Option<Public>, String> {
|
|
|
|
match self.args.arg_secretstore_admin_public.as_ref() {
|
|
|
|
Some(admin_public) => Ok(Some(admin_public.parse().map_err(|e| format!("Invalid secret store admin public: {}", e))?)),
|
|
|
|
None => Ok(None),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-08 11:26:16 +02:00
|
|
|
fn secretstore_nodes(&self) -> Result<BTreeMap<Public, (String, u16)>, String> {
|
|
|
|
let mut nodes = BTreeMap::new();
|
2017-09-05 13:30:22 +02:00
|
|
|
for node in self.args.arg_secretstore_nodes.split(',').filter(|n| n != &"") {
|
2017-04-08 11:26:16 +02:00
|
|
|
let public_and_addr: Vec<_> = node.split('@').collect();
|
|
|
|
if public_and_addr.len() != 2 {
|
|
|
|
return Err(format!("Invalid secret store node: {}", node));
|
|
|
|
}
|
|
|
|
|
|
|
|
let ip_and_port: Vec<_> = public_and_addr[1].split(':').collect();
|
|
|
|
if ip_and_port.len() != 2 {
|
|
|
|
return Err(format!("Invalid secret store node: {}", node));
|
|
|
|
}
|
|
|
|
|
|
|
|
let public = public_and_addr[0].parse()
|
|
|
|
.map_err(|e| format!("Invalid public key in secret store node: {}. Error: {:?}", public_and_addr[0], e))?;
|
|
|
|
let port = ip_and_port[1].parse()
|
|
|
|
.map_err(|e| format!("Invalid port in secret store node: {}. Error: {:?}", ip_and_port[1], e))?;
|
|
|
|
|
|
|
|
nodes.insert(public, (ip_and_port[0].into(), port));
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(nodes)
|
2017-02-20 16:13:21 +01:00
|
|
|
}
|
|
|
|
|
2017-01-25 11:03:36 +01:00
|
|
|
fn stratum_interface(&self) -> String {
|
2017-09-05 13:30:22 +02:00
|
|
|
self.interface(&self.args.arg_stratum_interface)
|
2017-01-25 11:03:36 +01:00
|
|
|
}
|
|
|
|
|
2017-04-03 10:27:37 +02:00
|
|
|
fn rpc_enabled(&self) -> bool {
|
|
|
|
!self.args.flag_jsonrpc_off && !self.args.flag_no_jsonrpc
|
|
|
|
}
|
|
|
|
|
2017-04-13 16:32:07 +02:00
|
|
|
fn ws_enabled(&self) -> bool {
|
|
|
|
!self.args.flag_no_ws
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
fn dapps_enabled(&self) -> bool {
|
2017-04-03 10:27:37 +02:00
|
|
|
!self.args.flag_dapps_off && !self.args.flag_no_dapps && self.rpc_enabled() && cfg!(feature = "dapps")
|
2016-06-24 12:14:46 +02:00
|
|
|
}
|
2016-06-24 14:20:39 +02:00
|
|
|
|
2017-02-20 16:13:21 +01:00
|
|
|
fn secretstore_enabled(&self) -> bool {
|
|
|
|
!self.args.flag_no_secretstore && cfg!(feature = "secretstore")
|
|
|
|
}
|
|
|
|
|
2017-07-27 12:29:09 +02:00
|
|
|
fn secretstore_http_enabled(&self) -> bool {
|
|
|
|
!self.args.flag_no_secretstore_http && cfg!(feature = "secretstore")
|
|
|
|
}
|
|
|
|
|
2017-07-27 14:48:07 +02:00
|
|
|
fn secretstore_acl_check_enabled(&self) -> bool {
|
|
|
|
!self.args.flag_no_secretstore_acl_check
|
|
|
|
}
|
|
|
|
|
2016-11-07 17:40:53 +01:00
|
|
|
fn ui_enabled(&self) -> bool {
|
|
|
|
if self.args.flag_force_ui {
|
2016-07-22 14:47:31 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-09-05 13:30:22 +02:00
|
|
|
let ui_disabled = self.args.arg_unlock.is_some() ||
|
2016-07-22 14:47:31 +02:00
|
|
|
self.args.flag_geth ||
|
2016-11-07 17:40:53 +01:00
|
|
|
self.args.flag_no_ui;
|
2016-07-22 14:47:31 +02:00
|
|
|
|
2017-06-09 12:26:57 +02:00
|
|
|
!ui_disabled && cfg!(feature = "ui-enabled")
|
2016-06-24 14:20:39 +02:00
|
|
|
}
|
2016-12-02 18:21:54 +01:00
|
|
|
|
|
|
|
fn verifier_settings(&self) -> VerifierSettings {
|
|
|
|
let mut settings = VerifierSettings::default();
|
|
|
|
settings.scale_verifiers = self.args.flag_scale_verifiers;
|
2017-09-05 13:30:22 +02:00
|
|
|
if let Some(num_verifiers) = self.args.arg_num_verifiers {
|
2016-12-02 18:21:54 +01:00
|
|
|
settings.num_verifiers = num_verifiers;
|
|
|
|
}
|
|
|
|
|
|
|
|
settings
|
|
|
|
}
|
2017-07-14 20:40:28 +02:00
|
|
|
|
|
|
|
fn whisper_config(&self) -> ::whisper::Config {
|
|
|
|
::whisper::Config {
|
|
|
|
enabled: self.args.flag_whisper,
|
2017-09-05 13:30:22 +02:00
|
|
|
target_message_pool_size: self.args.arg_whisper_pool_size * 1024 * 1024,
|
2017-07-14 20:40:28 +02:00
|
|
|
}
|
|
|
|
}
|
2016-04-21 16:45:04 +02:00
|
|
|
}
|
|
|
|
|
2016-04-30 19:58:28 +02:00
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2017-05-24 12:24:07 +02:00
|
|
|
use std::io::Write;
|
|
|
|
use std::fs::{File, create_dir};
|
2017-07-28 19:06:39 +02:00
|
|
|
use std::str::FromStr;
|
2017-05-24 12:24:07 +02:00
|
|
|
|
|
|
|
use devtools::{RandomTempPath};
|
2016-12-11 15:41:49 +01:00
|
|
|
use ethcore::client::{VMType, BlockId};
|
2016-10-15 14:46:33 +02:00
|
|
|
use ethcore::miner::{MinerOptions, PrioritizationStrategy};
|
2017-05-24 12:24:07 +02:00
|
|
|
use parity_rpc::NetworkSettings;
|
|
|
|
use updater::{UpdatePolicy, UpdateFilter, ReleaseTrack};
|
|
|
|
|
|
|
|
use account::{AccountCmd, NewAccount, ImportAccounts, ListAccounts};
|
2016-11-28 12:08:12 +01:00
|
|
|
use blockchain::{BlockchainCmd, ImportBlockchain, ExportBlockchain, DataFormat, ExportState};
|
2017-05-24 12:24:07 +02:00
|
|
|
use cli::Args;
|
|
|
|
use dir::{Directories, default_hypervisor_path};
|
|
|
|
use helpers::{default_network_config};
|
2016-12-12 17:53:17 +01:00
|
|
|
use params::SpecType;
|
2017-05-24 12:24:07 +02:00
|
|
|
use presale::ImportWallet;
|
|
|
|
use rpc::{WsConfiguration, UiConfiguration};
|
|
|
|
use run::RunCmd;
|
|
|
|
|
2017-07-28 19:06:39 +02:00
|
|
|
use network::{AllowIP, IpFilter};
|
|
|
|
|
|
|
|
extern crate ipnetwork;
|
|
|
|
use self::ipnetwork::IpNetwork;
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
use super::*;
|
2016-07-25 16:09:47 +02:00
|
|
|
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
|
|
struct TestPasswordReader(&'static str);
|
2016-04-30 19:58:28 +02:00
|
|
|
|
|
|
|
fn parse(args: &[&str]) -> Configuration {
|
|
|
|
Configuration {
|
2016-09-11 11:52:12 +02:00
|
|
|
args: Args::parse_without_config(args).unwrap(),
|
2017-03-13 12:10:53 +01:00
|
|
|
spec_name_override: None,
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[test]
|
|
|
|
fn test_command_version() {
|
|
|
|
let args = vec!["parity", "--version"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Version);
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_account_new() {
|
|
|
|
let args = vec!["parity", "account", "new"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(AccountCmd::New(NewAccount {
|
2016-07-25 16:09:47 +02:00
|
|
|
iterations: 10240,
|
2016-12-13 23:38:29 +01:00
|
|
|
path: Directories::default().keys,
|
2016-07-25 16:09:47 +02:00
|
|
|
password_file: None,
|
2016-12-12 17:53:17 +01:00
|
|
|
spec: SpecType::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_account_list() {
|
|
|
|
let args = vec!["parity", "account", "list"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(
|
2016-12-12 17:53:17 +01:00
|
|
|
AccountCmd::List(ListAccounts {
|
2016-12-13 23:38:29 +01:00
|
|
|
path: Directories::default().keys,
|
2016-12-12 17:53:17 +01:00
|
|
|
spec: SpecType::default(),
|
|
|
|
})
|
2016-11-02 19:42:21 +01:00
|
|
|
));
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_account_import() {
|
|
|
|
let args = vec!["parity", "account", "import", "my_dir", "another_dir"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Account(AccountCmd::Import(ImportAccounts {
|
2016-07-25 16:09:47 +02:00
|
|
|
from: vec!["my_dir".into(), "another_dir".into()],
|
2016-12-13 23:38:29 +01:00
|
|
|
to: Directories::default().keys,
|
2016-12-12 17:53:17 +01:00
|
|
|
spec: SpecType::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_wallet_import() {
|
|
|
|
let args = vec!["parity", "wallet", "import", "my_wallet.json", "--password", "pwd"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::ImportPresaleWallet(ImportWallet {
|
2016-07-25 16:09:47 +02:00
|
|
|
iterations: 10240,
|
2016-12-13 23:38:29 +01:00
|
|
|
path: Directories::default().keys,
|
2016-07-25 16:09:47 +02:00
|
|
|
wallet_path: "my_wallet.json".into(),
|
|
|
|
password_file: Some("pwd".into()),
|
2016-12-12 17:53:17 +01:00
|
|
|
spec: SpecType::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
}));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_blockchain_import() {
|
|
|
|
let args = vec!["parity", "import", "blockchain.json"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Import(ImportBlockchain {
|
2016-07-25 16:09:47 +02:00
|
|
|
spec: Default::default(),
|
|
|
|
cache_config: Default::default(),
|
|
|
|
dirs: Default::default(),
|
|
|
|
file_path: Some("blockchain.json".into()),
|
2016-08-04 09:22:54 +02:00
|
|
|
format: Default::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
pruning: Default::default(),
|
2017-02-13 17:15:25 +01:00
|
|
|
pruning_history: 64,
|
2017-05-02 11:40:03 +02:00
|
|
|
pruning_memory: 32,
|
2016-07-25 16:09:47 +02:00
|
|
|
compaction: Default::default(),
|
2016-07-29 15:36:00 +02:00
|
|
|
wal: true,
|
2016-07-25 16:09:47 +02:00
|
|
|
tracing: Default::default(),
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: Default::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
vm_type: VMType::Interpreter,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: true,
|
2016-11-03 16:11:08 +01:00
|
|
|
with_color: !cfg!(windows),
|
2016-12-02 18:36:00 +01:00
|
|
|
verifier_settings: Default::default(),
|
2017-07-27 13:50:12 +02:00
|
|
|
light: false,
|
2016-07-25 16:09:47 +02:00
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_command_blockchain_export() {
|
2016-11-28 12:08:12 +01:00
|
|
|
let args = vec!["parity", "export", "blocks", "blockchain.json"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
|
2016-07-25 16:09:47 +02:00
|
|
|
spec: Default::default(),
|
|
|
|
cache_config: Default::default(),
|
|
|
|
dirs: Default::default(),
|
|
|
|
file_path: Some("blockchain.json".into()),
|
|
|
|
pruning: Default::default(),
|
2017-02-13 17:15:25 +01:00
|
|
|
pruning_history: 64,
|
2017-05-02 11:40:03 +02:00
|
|
|
pruning_memory: 32,
|
2016-07-25 16:09:47 +02:00
|
|
|
format: Default::default(),
|
|
|
|
compaction: Default::default(),
|
2016-07-29 15:36:00 +02:00
|
|
|
wal: true,
|
2016-07-25 16:09:47 +02:00
|
|
|
tracing: Default::default(),
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: Default::default(),
|
2016-11-22 10:24:22 +01:00
|
|
|
from_block: BlockId::Number(1),
|
|
|
|
to_block: BlockId::Latest,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: true,
|
2016-07-25 16:09:47 +02:00
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
2016-11-28 12:08:12 +01:00
|
|
|
#[test]
|
|
|
|
fn test_command_state_export() {
|
|
|
|
let args = vec!["parity", "export", "state", "state.json"];
|
|
|
|
let conf = parse(&args);
|
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::ExportState(ExportState {
|
|
|
|
spec: Default::default(),
|
|
|
|
cache_config: Default::default(),
|
|
|
|
dirs: Default::default(),
|
|
|
|
file_path: Some("state.json".into()),
|
|
|
|
pruning: Default::default(),
|
2017-02-13 17:15:25 +01:00
|
|
|
pruning_history: 64,
|
2017-05-02 11:40:03 +02:00
|
|
|
pruning_memory: 32,
|
2016-11-28 12:08:12 +01:00
|
|
|
format: Default::default(),
|
|
|
|
compaction: Default::default(),
|
|
|
|
wal: true,
|
|
|
|
tracing: Default::default(),
|
|
|
|
fat_db: Default::default(),
|
2016-12-04 18:13:23 +01:00
|
|
|
at: BlockId::Latest,
|
2016-11-28 12:08:12 +01:00
|
|
|
storage: true,
|
|
|
|
code: true,
|
|
|
|
min_balance: None,
|
|
|
|
max_balance: None,
|
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
2016-08-04 09:22:54 +02:00
|
|
|
#[test]
|
|
|
|
fn test_command_blockchain_export_with_custom_format() {
|
2016-11-28 12:08:12 +01:00
|
|
|
let args = vec!["parity", "export", "blocks", "--format", "hex", "blockchain.json"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-11-02 19:42:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Blockchain(BlockchainCmd::Export(ExportBlockchain {
|
2016-08-04 09:22:54 +02:00
|
|
|
spec: Default::default(),
|
|
|
|
cache_config: Default::default(),
|
|
|
|
dirs: Default::default(),
|
|
|
|
file_path: Some("blockchain.json".into()),
|
|
|
|
pruning: Default::default(),
|
2017-02-13 17:15:25 +01:00
|
|
|
pruning_history: 64,
|
2017-05-02 11:40:03 +02:00
|
|
|
pruning_memory: 32,
|
2016-08-04 09:22:54 +02:00
|
|
|
format: Some(DataFormat::Hex),
|
|
|
|
compaction: Default::default(),
|
|
|
|
wal: true,
|
|
|
|
tracing: Default::default(),
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: Default::default(),
|
2016-11-22 10:24:22 +01:00
|
|
|
from_block: BlockId::Number(1),
|
|
|
|
to_block: BlockId::Latest,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: true,
|
2016-08-04 09:22:54 +02:00
|
|
|
})));
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[test]
|
|
|
|
fn test_command_signer_new_token() {
|
|
|
|
let args = vec!["parity", "signer", "new-token"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2016-12-13 23:38:29 +01:00
|
|
|
let expected = Directories::default().signer;
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::SignerToken(WsConfiguration {
|
|
|
|
enabled: true,
|
|
|
|
interface: "127.0.0.1".into(),
|
|
|
|
port: 8546,
|
|
|
|
apis: ApiSet::UnsafeContext,
|
2017-08-13 17:41:50 +02:00
|
|
|
origins: Some(vec!["chrome-extension://*".into(), "moz-extension://*".into()]),
|
2017-05-24 12:24:07 +02:00
|
|
|
hosts: Some(vec![]),
|
|
|
|
signer_path: expected.into(),
|
2017-09-21 14:52:44 +02:00
|
|
|
ui_address: Some("127.0.0.1:8180".into()),
|
2017-06-12 17:43:23 +02:00
|
|
|
support_token_api: true
|
2017-05-24 12:24:07 +02:00
|
|
|
}, UiConfiguration {
|
2016-11-14 11:56:01 +01:00
|
|
|
enabled: true,
|
|
|
|
interface: "127.0.0.1".into(),
|
|
|
|
port: 8180,
|
2017-05-24 12:24:07 +02:00
|
|
|
hosts: Some(vec![]),
|
2017-07-28 19:07:38 +02:00
|
|
|
}, LogConfig {
|
|
|
|
color: true,
|
|
|
|
mode: None,
|
|
|
|
file: None,
|
|
|
|
} ));
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_run_cmd() {
|
|
|
|
let args = vec!["parity"];
|
2016-09-12 14:11:30 +02:00
|
|
|
let conf = parse(&args);
|
2017-02-20 16:13:21 +01:00
|
|
|
let mut expected = RunCmd {
|
2016-07-25 16:09:47 +02:00
|
|
|
cache_config: Default::default(),
|
|
|
|
dirs: Default::default(),
|
|
|
|
spec: Default::default(),
|
|
|
|
pruning: Default::default(),
|
2017-02-13 17:15:25 +01:00
|
|
|
pruning_history: 64,
|
2017-05-02 11:40:03 +02:00
|
|
|
pruning_memory: 32,
|
2016-07-25 16:09:47 +02:00
|
|
|
daemon: None,
|
|
|
|
logger_config: Default::default(),
|
|
|
|
miner_options: Default::default(),
|
backports to beta (#7434)
* Merge pull request #7368 from paritytech/td-future-blocks
Wait for future blocks in AuRa
* Fix tracing failed calls.
* Problem: sending any Whisper message fails
The error is "PoW too low to compete with other messages"
This has been previously reported in #7144
Solution: prevent the move semantics
The source of the error is in PoolHandle.relay
implementation for NetPoolHandle.
Because of the move semantics, `res` variable is in fact
copied (as it implements Copy) into the closure and for
that reason, the returned result is always `false.
* Merge pull request #7433 from paritytech/td-strict-config
Strict config parsing
* Problem: AuRa's unsafeties around step duration (#7282)
Firstly, `Step.duration_remaining` casts it to u32, unnecesarily
limiting it to 2^32. While theoretically this is "good enough" (at 3
seconds steps it provides room for a little over 400 years), it is
still a lossy way to calculate the remaining time until the next step.
Secondly, step duration might be zero, triggering division by zero
in `Step.calibrate`
Solution: rework the code around the fact that duration is
typically in single digits and never grows, hence, it can be represented
by a much narrower range (u16) and this highlights the fact that
multiplying u64 by u16 will only result in an overflow in even further
future, at which point we should panic informatively (if anybody's
still around)
Similarly, panic when it is detected that incrementing the step
counter wrapped around on the overflow of usize.
As for the division by zero, prevent it by making zero an invalid
value for step duration. This will make AuRa log the constraint
mismatch and panic (after all, what purpose would zero step duration
serve? it makes no sense within the definition of the protocol,
as finality can only be achieved as per the specification
if messages are received within the step duration, which would violate
the speed of light and other physical laws in this case).
* Merge pull request #7437 from paritytech/a5-chains-expanse
Remove expanse chain
* Expanse Byzantium update w/ correct metropolis difficulty increment divisor (#7463)
* Byzantium Update for Expanse
Here the changes go. Hope I didnt miss anything.
* expip2 changes - update duration limit
* Fix missing EXPIP-2 fields
* Format numbers as hex
* Fix compilation errors
* Group expanse chain spec fields together
* Set metropolisDifficultyIncrementDivisor for Expanse
* Revert #7437
* Add Expanse block 900_000 hash checkpoint
* Advance AuRa step as far as we can and prevent invalid blocks. (#7451)
* Advance AuRa step as far as we can.
* Wait for future blocks.
* fixed panic when io is not available for export block, closes #7486 (#7495)
* Update Parity Mainnet Bootnodes (#7476)
* Update Parity Mainnet Bootnodes
* Replace the Azure HDD bootnodes with the new ones :)
* Use https connection (#7503)
Use https when connecting to etherscan.io API for price-info
* Expose default gas price percentile configuration in CLI (#7497)
* Expose gas price percentile.
* Fix light eth_call.
* fix gas_price in light client
2018-01-09 13:55:10 +01:00
|
|
|
gas_price_percentile: 50,
|
2017-08-28 14:11:55 +02:00
|
|
|
ntp_servers: vec![
|
|
|
|
"0.parity.pool.ntp.org:123".into(),
|
|
|
|
"1.parity.pool.ntp.org:123".into(),
|
|
|
|
"2.parity.pool.ntp.org:123".into(),
|
|
|
|
"3.parity.pool.ntp.org:123".into(),
|
|
|
|
],
|
2017-04-13 16:32:07 +02:00
|
|
|
ws_conf: Default::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
http_conf: Default::default(),
|
|
|
|
ipc_conf: Default::default(),
|
|
|
|
net_conf: default_network_config(),
|
|
|
|
network_id: None,
|
2017-03-29 17:07:58 +02:00
|
|
|
public_node: false,
|
2017-03-02 20:04:17 +01:00
|
|
|
warp_sync: true,
|
2016-07-25 16:09:47 +02:00
|
|
|
acc_conf: Default::default(),
|
2017-07-16 18:22:45 +02:00
|
|
|
gas_pricer_conf: Default::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
miner_extras: Default::default(),
|
2016-12-15 19:53:13 +01:00
|
|
|
update_policy: UpdatePolicy { enable_downloading: true, require_consensus: true, filter: UpdateFilter::Critical, track: ReleaseTrack::Unknown, path: default_hypervisor_path() },
|
2016-07-25 16:09:47 +02:00
|
|
|
mode: Default::default(),
|
|
|
|
tracing: Default::default(),
|
|
|
|
compaction: Default::default(),
|
2016-07-29 15:36:00 +02:00
|
|
|
wal: true,
|
2016-07-25 16:09:47 +02:00
|
|
|
vm_type: Default::default(),
|
|
|
|
geth_compatibility: false,
|
|
|
|
net_settings: Default::default(),
|
|
|
|
dapps_conf: Default::default(),
|
2017-02-16 14:41:33 +01:00
|
|
|
ipfs_conf: Default::default(),
|
2017-05-24 12:24:07 +02:00
|
|
|
ui_conf: Default::default(),
|
2017-02-20 16:13:21 +01:00
|
|
|
secretstore_conf: Default::default(),
|
2016-07-25 16:09:47 +02:00
|
|
|
ui: false,
|
2017-01-06 16:05:58 +01:00
|
|
|
dapp: None,
|
2016-07-25 16:09:47 +02:00
|
|
|
name: "".into(),
|
|
|
|
custom_bootnodes: false,
|
2016-10-03 11:13:10 +02:00
|
|
|
fat_db: Default::default(),
|
2016-09-02 20:24:59 +02:00
|
|
|
no_periodic_snapshot: false,
|
2017-01-25 11:03:36 +01:00
|
|
|
stratum: None,
|
2016-10-24 15:09:13 +02:00
|
|
|
check_seal: true,
|
2016-11-22 18:03:35 +01:00
|
|
|
download_old_blocks: true,
|
2016-12-02 18:36:00 +01:00
|
|
|
verifier_settings: Default::default(),
|
2017-03-22 16:45:50 +01:00
|
|
|
serve_light: true,
|
|
|
|
light: false,
|
2017-05-04 12:13:50 +02:00
|
|
|
no_persistent_txqueue: false,
|
2017-07-14 20:40:28 +02:00
|
|
|
whisper: Default::default(),
|
2017-02-20 16:13:21 +01:00
|
|
|
};
|
|
|
|
expected.secretstore_conf.enabled = cfg!(feature = "secretstore");
|
2017-07-27 12:29:09 +02:00
|
|
|
expected.secretstore_conf.http_enabled = cfg!(feature = "secretstore");
|
2017-02-20 16:13:21 +01:00
|
|
|
assert_eq!(conf.into_command().unwrap().cmd, Cmd::Run(expected));
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
|
2016-10-15 14:46:33 +02:00
|
|
|
#[test]
|
|
|
|
fn should_parse_mining_options() {
|
|
|
|
// given
|
|
|
|
let mut mining_options = MinerOptions::default();
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity"]);
|
|
|
|
let conf1 = parse(&["parity", "--tx-queue-strategy", "gas_factor"]);
|
|
|
|
let conf2 = parse(&["parity", "--tx-queue-strategy", "gas_price"]);
|
|
|
|
let conf3 = parse(&["parity", "--tx-queue-strategy", "gas"]);
|
|
|
|
|
|
|
|
// then
|
2017-10-25 13:13:11 +02:00
|
|
|
assert_eq!(conf0.miner_options().unwrap(), mining_options);
|
2016-10-15 14:46:33 +02:00
|
|
|
mining_options.tx_queue_strategy = PrioritizationStrategy::GasFactorAndGasPrice;
|
2017-10-25 13:13:11 +02:00
|
|
|
assert_eq!(conf1.miner_options().unwrap(), mining_options);
|
2016-10-15 14:46:33 +02:00
|
|
|
mining_options.tx_queue_strategy = PrioritizationStrategy::GasPriceOnly;
|
2017-10-25 13:13:11 +02:00
|
|
|
assert_eq!(conf2.miner_options().unwrap(), mining_options);
|
2016-10-15 14:46:33 +02:00
|
|
|
mining_options.tx_queue_strategy = PrioritizationStrategy::GasAndGasPrice;
|
2017-10-25 13:13:11 +02:00
|
|
|
assert_eq!(conf3.miner_options().unwrap(), mining_options);
|
2016-10-15 14:46:33 +02:00
|
|
|
}
|
|
|
|
|
2017-07-01 17:20:49 +02:00
|
|
|
#[test]
|
|
|
|
fn should_fail_on_force_reseal_and_reseal_min_period() {
|
2017-10-25 13:13:11 +02:00
|
|
|
let conf = parse(&["parity", "--chain", "dev", "--force-sealing", "--reseal-min-period", "0"]);
|
2017-07-01 17:20:49 +02:00
|
|
|
|
2017-10-25 13:13:11 +02:00
|
|
|
assert!(conf.miner_options().is_err());
|
2017-07-01 17:20:49 +02:00
|
|
|
}
|
|
|
|
|
2016-11-23 20:35:21 +01:00
|
|
|
#[test]
|
|
|
|
fn should_parse_updater_options() {
|
|
|
|
// when
|
2016-12-15 19:17:44 +01:00
|
|
|
let conf0 = parse(&["parity", "--release-track=testing"]);
|
2016-12-11 16:52:41 +01:00
|
|
|
let conf1 = parse(&["parity", "--auto-update", "all", "--no-consensus"]);
|
2016-12-15 19:19:50 +01:00
|
|
|
let conf2 = parse(&["parity", "--no-download", "--auto-update=all", "--release-track=beta"]);
|
|
|
|
let conf3 = parse(&["parity", "--auto-update=xxx"]);
|
2016-11-23 20:35:21 +01:00
|
|
|
|
|
|
|
// then
|
2016-12-15 19:53:13 +01:00
|
|
|
assert_eq!(conf0.update_policy().unwrap(), UpdatePolicy{enable_downloading: true, require_consensus: true, filter: UpdateFilter::Critical, track: ReleaseTrack::Testing, path: default_hypervisor_path()});
|
|
|
|
assert_eq!(conf1.update_policy().unwrap(), UpdatePolicy{enable_downloading: true, require_consensus: false, filter: UpdateFilter::All, track: ReleaseTrack::Unknown, path: default_hypervisor_path()});
|
|
|
|
assert_eq!(conf2.update_policy().unwrap(), UpdatePolicy{enable_downloading: false, require_consensus: true, filter: UpdateFilter::All, track: ReleaseTrack::Beta, path: default_hypervisor_path()});
|
2016-11-23 20:35:21 +01:00
|
|
|
assert!(conf3.update_policy().is_err());
|
|
|
|
}
|
|
|
|
|
2016-04-30 19:58:28 +02:00
|
|
|
#[test]
|
|
|
|
fn should_parse_network_settings() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf = parse(&["parity", "--testnet", "--identity", "testname"]);
|
|
|
|
|
|
|
|
// then
|
2017-05-23 12:24:32 +02:00
|
|
|
assert_eq!(conf.network_settings(), Ok(NetworkSettings {
|
2016-04-30 19:58:28 +02:00
|
|
|
name: "testname".to_owned(),
|
2017-10-25 13:13:11 +02:00
|
|
|
chain: "kovan".to_owned(),
|
2016-04-30 19:58:28 +02:00
|
|
|
network_port: 30303,
|
2016-05-04 22:09:30 +02:00
|
|
|
rpc_enabled: true,
|
2017-05-23 12:24:32 +02:00
|
|
|
rpc_interface: "127.0.0.1".to_owned(),
|
2016-04-30 19:58:28 +02:00
|
|
|
rpc_port: 8545,
|
2017-05-23 12:24:32 +02:00
|
|
|
}));
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_parse_rpc_settings_with_geth_compatiblity() {
|
|
|
|
// given
|
|
|
|
fn assert(conf: Configuration) {
|
2017-05-23 12:24:32 +02:00
|
|
|
let net = conf.network_settings().unwrap();
|
2016-04-30 19:58:28 +02:00
|
|
|
assert_eq!(net.rpc_enabled, true);
|
2017-05-23 12:24:32 +02:00
|
|
|
assert_eq!(net.rpc_interface, "0.0.0.0".to_owned());
|
2016-04-30 19:58:28 +02:00
|
|
|
assert_eq!(net.rpc_port, 8000);
|
2016-07-20 12:34:17 +02:00
|
|
|
assert_eq!(conf.rpc_cors(), Some(vec!["*".to_owned()]));
|
2016-04-30 19:58:28 +02:00
|
|
|
assert_eq!(conf.rpc_apis(), "web3,eth".to_owned());
|
|
|
|
}
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf1 = parse(&["parity", "-j",
|
|
|
|
"--jsonrpc-port", "8000",
|
|
|
|
"--jsonrpc-interface", "all",
|
|
|
|
"--jsonrpc-cors", "*",
|
|
|
|
"--jsonrpc-apis", "web3,eth"
|
|
|
|
]);
|
|
|
|
let conf2 = parse(&["parity", "--rpc",
|
|
|
|
"--rpcport", "8000",
|
|
|
|
"--rpcaddr", "all",
|
|
|
|
"--rpccorsdomain", "*",
|
|
|
|
"--rpcapi", "web3,eth"
|
|
|
|
]);
|
|
|
|
|
|
|
|
// then
|
|
|
|
assert(conf1);
|
|
|
|
assert(conf2);
|
|
|
|
}
|
2016-07-20 12:34:17 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_parse_rpc_hosts() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity"]);
|
|
|
|
let conf1 = parse(&["parity", "--jsonrpc-hosts", "none"]);
|
|
|
|
let conf2 = parse(&["parity", "--jsonrpc-hosts", "all"]);
|
2017-05-02 11:41:09 +02:00
|
|
|
let conf3 = parse(&["parity", "--jsonrpc-hosts", "parity.io,something.io"]);
|
2016-07-20 12:34:17 +02:00
|
|
|
|
|
|
|
// then
|
|
|
|
assert_eq!(conf0.rpc_hosts(), Some(Vec::new()));
|
|
|
|
assert_eq!(conf1.rpc_hosts(), Some(Vec::new()));
|
|
|
|
assert_eq!(conf2.rpc_hosts(), None);
|
2017-05-02 11:41:09 +02:00
|
|
|
assert_eq!(conf3.rpc_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
|
2016-07-20 12:34:17 +02:00
|
|
|
}
|
2016-07-22 14:47:31 +02:00
|
|
|
|
2017-02-24 10:32:42 +01:00
|
|
|
#[test]
|
|
|
|
fn should_parse_ipfs_hosts() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity"]);
|
|
|
|
let conf1 = parse(&["parity", "--ipfs-api-hosts", "none"]);
|
|
|
|
let conf2 = parse(&["parity", "--ipfs-api-hosts", "all"]);
|
2017-05-02 11:41:09 +02:00
|
|
|
let conf3 = parse(&["parity", "--ipfs-api-hosts", "parity.io,something.io"]);
|
2017-02-24 10:32:42 +01:00
|
|
|
|
|
|
|
// then
|
|
|
|
assert_eq!(conf0.ipfs_hosts(), Some(Vec::new()));
|
|
|
|
assert_eq!(conf1.ipfs_hosts(), Some(Vec::new()));
|
|
|
|
assert_eq!(conf2.ipfs_hosts(), None);
|
2017-05-02 11:41:09 +02:00
|
|
|
assert_eq!(conf3.ipfs_hosts(), Some(vec!["parity.io".into(), "something.io".into()]));
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_parse_ipfs_cors() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity"]);
|
|
|
|
let conf1 = parse(&["parity", "--ipfs-api-cors", "*"]);
|
2017-05-02 11:41:09 +02:00
|
|
|
let conf2 = parse(&["parity", "--ipfs-api-cors", "http://parity.io,http://something.io"]);
|
2017-02-24 10:32:42 +01:00
|
|
|
|
|
|
|
// then
|
2017-12-27 18:56:23 +01:00
|
|
|
assert_eq!(conf0.ipfs_cors(), Some(vec![]));
|
2017-02-24 10:32:42 +01:00
|
|
|
assert_eq!(conf1.ipfs_cors(), Some(vec!["*".into()]));
|
2017-05-02 11:41:09 +02:00
|
|
|
assert_eq!(conf2.ipfs_cors(), Some(vec!["http://parity.io".into(),"http://something.io".into()]));
|
2017-02-24 10:32:42 +01:00
|
|
|
}
|
|
|
|
|
2016-07-22 14:47:31 +02:00
|
|
|
#[test]
|
|
|
|
fn should_disable_signer_in_geth_compat() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity", "--geth"]);
|
2016-11-07 17:40:53 +01:00
|
|
|
let conf1 = parse(&["parity", "--geth", "--force-ui"]);
|
2016-07-22 14:47:31 +02:00
|
|
|
|
|
|
|
// then
|
2016-11-07 17:40:53 +01:00
|
|
|
assert_eq!(conf0.ui_enabled(), false);
|
|
|
|
assert_eq!(conf1.ui_enabled(), true);
|
2016-07-22 14:47:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_disable_signer_when_account_is_unlocked() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity", "--unlock", "0x0"]);
|
|
|
|
|
|
|
|
// then
|
2016-11-07 17:40:53 +01:00
|
|
|
assert_eq!(conf0.ui_enabled(), false);
|
2016-07-22 14:47:31 +02:00
|
|
|
}
|
2016-07-29 10:48:05 +02:00
|
|
|
|
2016-08-02 18:53:53 +02:00
|
|
|
#[test]
|
2017-05-24 12:24:07 +02:00
|
|
|
fn should_parse_ui_configuration() {
|
2016-08-02 18:53:53 +02:00
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
2017-09-05 13:30:22 +02:00
|
|
|
let conf0 = parse(&["parity", "--ui-path=signer"]);
|
|
|
|
let conf1 = parse(&["parity", "--ui-path=signer", "--ui-no-validation"]);
|
|
|
|
let conf2 = parse(&["parity", "--ui-path=signer", "--ui-port", "3123"]);
|
|
|
|
let conf3 = parse(&["parity", "--ui-path=signer", "--ui-interface", "test"]);
|
2016-08-02 18:53:53 +02:00
|
|
|
|
|
|
|
// then
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf0.directories().signer, "signer".to_owned());
|
|
|
|
assert_eq!(conf0.ui_config(), UiConfiguration {
|
2016-08-23 16:53:24 +02:00
|
|
|
enabled: true,
|
|
|
|
interface: "127.0.0.1".into(),
|
2017-05-24 12:24:07 +02:00
|
|
|
port: 8180,
|
|
|
|
hosts: Some(vec![]),
|
2016-08-23 16:53:24 +02:00
|
|
|
});
|
2017-06-04 12:34:03 +02:00
|
|
|
assert!(conf0.ws_config().unwrap().hosts.is_some());
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf1.directories().signer, "signer".to_owned());
|
|
|
|
assert_eq!(conf1.ui_config(), UiConfiguration {
|
2016-08-23 16:53:24 +02:00
|
|
|
enabled: true,
|
|
|
|
interface: "127.0.0.1".into(),
|
2017-05-24 12:24:07 +02:00
|
|
|
port: 8180,
|
2017-06-04 12:34:03 +02:00
|
|
|
hosts: Some(vec![]),
|
2016-08-23 16:53:24 +02:00
|
|
|
});
|
2017-07-11 13:45:23 +02:00
|
|
|
assert_eq!(conf1.dapps_config().extra_embed_on, vec![("localhost".to_owned(), 3000)]);
|
2017-07-11 14:49:35 +02:00
|
|
|
assert_eq!(conf1.ws_config().unwrap().origins, None);
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf2.directories().signer, "signer".to_owned());
|
|
|
|
assert_eq!(conf2.ui_config(), UiConfiguration {
|
2016-08-23 16:53:24 +02:00
|
|
|
enabled: true,
|
|
|
|
interface: "127.0.0.1".into(),
|
2017-05-24 12:24:07 +02:00
|
|
|
port: 3123,
|
|
|
|
hosts: Some(vec![]),
|
2016-08-23 16:53:24 +02:00
|
|
|
});
|
2017-06-04 12:34:03 +02:00
|
|
|
assert!(conf2.ws_config().unwrap().hosts.is_some());
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf3.directories().signer, "signer".to_owned());
|
|
|
|
assert_eq!(conf3.ui_config(), UiConfiguration {
|
2016-08-23 16:53:24 +02:00
|
|
|
enabled: true,
|
|
|
|
interface: "test".into(),
|
2017-05-24 12:24:07 +02:00
|
|
|
port: 8180,
|
|
|
|
hosts: Some(vec![]),
|
2016-08-23 16:53:24 +02:00
|
|
|
});
|
2017-06-04 12:34:03 +02:00
|
|
|
assert!(conf3.ws_config().unwrap().hosts.is_some());
|
2016-08-02 18:53:53 +02:00
|
|
|
}
|
|
|
|
|
2017-01-06 16:05:58 +01:00
|
|
|
#[test]
|
|
|
|
fn should_parse_dapp_opening() {
|
|
|
|
// given
|
|
|
|
let temp = RandomTempPath::new();
|
|
|
|
let name = temp.file_name().unwrap().to_str().unwrap();
|
|
|
|
create_dir(temp.as_str().to_owned()).unwrap();
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity", "dapp", temp.to_str().unwrap()]);
|
|
|
|
|
|
|
|
// then
|
|
|
|
assert_eq!(conf0.dapp_to_open(), Ok(Some(name.into())));
|
|
|
|
let extra_dapps = conf0.dapps_config().extra_dapps;
|
|
|
|
assert_eq!(extra_dapps, vec![temp.to_owned()]);
|
|
|
|
}
|
|
|
|
|
2016-07-29 10:48:05 +02:00
|
|
|
#[test]
|
|
|
|
fn should_not_bail_on_empty_line_in_reserved_peers() {
|
|
|
|
let temp = RandomTempPath::new();
|
|
|
|
create_dir(temp.as_str().to_owned()).unwrap();
|
|
|
|
let filename = temp.as_str().to_owned() + "/peers";
|
|
|
|
File::create(filename.clone()).unwrap().write_all(b" \n\t\n").unwrap();
|
|
|
|
let args = vec!["parity", "--reserved-peers", &filename];
|
2017-03-13 12:10:53 +01:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
2016-07-29 10:48:05 +02:00
|
|
|
assert!(conf.init_reserved_nodes().is_ok());
|
|
|
|
}
|
2017-02-24 17:36:52 +01:00
|
|
|
|
2017-07-10 13:24:40 +02:00
|
|
|
#[test]
|
|
|
|
fn should_ignore_comments_in_reserved_peers() {
|
|
|
|
let temp = RandomTempPath::new();
|
|
|
|
create_dir(temp.as_str().to_owned()).unwrap();
|
|
|
|
let filename = temp.as_str().to_owned() + "/peers_comments";
|
|
|
|
File::create(filename.clone()).unwrap().write_all(b"# Sample comment\nenode://6f8a80d14311c39f35f516fa664deaaaa13e85b2f7493f37f6144d86991ec012937307647bd3b9a82abe2974e1407241d54947bbb39763a4cac9f77166ad92a0@172.0.0.1:30303\n").unwrap();
|
|
|
|
let args = vec!["parity", "--reserved-peers", &filename];
|
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
let reserved_nodes = conf.init_reserved_nodes();
|
|
|
|
assert!(reserved_nodes.is_ok());
|
|
|
|
assert_eq!(reserved_nodes.unwrap().len(), 1);
|
|
|
|
}
|
|
|
|
|
2017-02-24 17:36:52 +01:00
|
|
|
#[test]
|
2017-07-13 14:25:41 +02:00
|
|
|
fn test_dev_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "dev"];
|
2017-07-13 14:25:41 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
2017-02-24 17:36:52 +01:00
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
2017-07-17 08:03:57 +02:00
|
|
|
assert_eq!(c.net_settings.chain, "dev");
|
2017-07-16 18:22:45 +02:00
|
|
|
assert_eq!(c.gas_pricer_conf, GasPricerConfig::Fixed(0.into()));
|
2017-02-24 17:36:52 +01:00
|
|
|
assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0));
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
2017-05-23 12:24:32 +02:00
|
|
|
|
2017-07-14 05:15:39 +02:00
|
|
|
#[test]
|
|
|
|
fn test_mining_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "mining"];
|
2017-07-14 05:15:39 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
|
|
|
assert_eq!(c.net_conf.min_peers, 50);
|
|
|
|
assert_eq!(c.net_conf.max_peers, 100);
|
|
|
|
assert_eq!(c.ipc_conf.enabled, false);
|
|
|
|
assert_eq!(c.dapps_conf.enabled, false);
|
|
|
|
assert_eq!(c.miner_options.force_sealing, true);
|
|
|
|
assert_eq!(c.miner_options.reseal_on_external_tx, true);
|
|
|
|
assert_eq!(c.miner_options.reseal_on_own_tx, true);
|
|
|
|
assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(4000));
|
|
|
|
assert_eq!(c.miner_options.tx_queue_size, 2048);
|
|
|
|
assert_eq!(c.cache_config, CacheConfig::new_with_total_cache_size(256));
|
|
|
|
assert_eq!(c.logger_config.mode.unwrap(), "miner=trace,own_tx=trace");
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 05:42:56 +02:00
|
|
|
#[test]
|
|
|
|
fn test_non_standard_ports_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "non-standard-ports"];
|
2017-07-14 05:42:56 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
|
|
|
assert_eq!(c.net_settings.network_port, 30305);
|
|
|
|
assert_eq!(c.net_settings.rpc_port, 8645);
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-17 08:03:57 +02:00
|
|
|
#[test]
|
|
|
|
fn test_insecure_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "insecure"];
|
2017-07-17 08:03:57 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
|
|
|
assert_eq!(c.update_policy.require_consensus, false);
|
|
|
|
assert_eq!(c.net_settings.rpc_interface, "0.0.0.0");
|
|
|
|
match c.http_conf.apis {
|
|
|
|
ApiSet::List(set) => assert_eq!(set, ApiSet::All.list_apis()),
|
|
|
|
_ => panic!("Incorrect rpc apis"),
|
|
|
|
}
|
|
|
|
// "web3,eth,net,personal,parity,parity_set,traces,rpc,parity_accounts");
|
|
|
|
assert_eq!(c.http_conf.hosts, None);
|
|
|
|
assert_eq!(c.ipfs_conf.hosts, None);
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_dev_insecure_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "dev-insecure"];
|
2017-07-17 08:03:57 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
|
|
|
assert_eq!(c.net_settings.chain, "dev");
|
2017-07-17 08:33:26 +02:00
|
|
|
assert_eq!(c.gas_pricer_conf, GasPricerConfig::Fixed(0.into()));
|
2017-07-17 08:03:57 +02:00
|
|
|
assert_eq!(c.miner_options.reseal_min_period, Duration::from_millis(0));
|
|
|
|
assert_eq!(c.update_policy.require_consensus, false);
|
|
|
|
assert_eq!(c.net_settings.rpc_interface, "0.0.0.0");
|
|
|
|
match c.http_conf.apis {
|
|
|
|
ApiSet::List(set) => assert_eq!(set, ApiSet::All.list_apis()),
|
|
|
|
_ => panic!("Incorrect rpc apis"),
|
|
|
|
}
|
|
|
|
// "web3,eth,net,personal,parity,parity_set,traces,rpc,parity_accounts");
|
|
|
|
assert_eq!(c.http_conf.hosts, None);
|
|
|
|
assert_eq!(c.ipfs_conf.hosts, None);
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-14 05:42:56 +02:00
|
|
|
#[test]
|
|
|
|
fn test_override_preset() {
|
2017-07-22 05:37:38 +02:00
|
|
|
let args = vec!["parity", "--config", "mining", "--min-peers=99"];
|
2017-07-14 05:42:56 +02:00
|
|
|
let conf = Configuration::parse(&args, None).unwrap();
|
|
|
|
match conf.into_command().unwrap().cmd {
|
|
|
|
Cmd::Run(c) => {
|
|
|
|
assert_eq!(c.net_conf.min_peers, 99);
|
|
|
|
},
|
|
|
|
_ => panic!("Should be Cmd::Run"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-23 12:24:32 +02:00
|
|
|
#[test]
|
|
|
|
fn should_apply_ports_shift() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity", "--ports-shift", "1", "--stratum"]);
|
|
|
|
let conf1 = parse(&["parity", "--ports-shift", "1", "--jsonrpc-port", "8544"]);
|
|
|
|
|
|
|
|
// then
|
|
|
|
assert_eq!(conf0.net_addresses().unwrap().0.port(), 30304);
|
|
|
|
assert_eq!(conf0.network_settings().unwrap().network_port, 30304);
|
|
|
|
assert_eq!(conf0.network_settings().unwrap().rpc_port, 8546);
|
|
|
|
assert_eq!(conf0.http_config().unwrap().port, 8546);
|
|
|
|
assert_eq!(conf0.ws_config().unwrap().port, 8547);
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf0.ui_config().port, 8181);
|
2017-05-23 12:24:32 +02:00
|
|
|
assert_eq!(conf0.secretstore_config().unwrap().port, 8084);
|
|
|
|
assert_eq!(conf0.secretstore_config().unwrap().http_port, 8083);
|
|
|
|
assert_eq!(conf0.ipfs_config().port, 5002);
|
|
|
|
assert_eq!(conf0.stratum_options().unwrap().unwrap().port, 8009);
|
|
|
|
|
|
|
|
|
|
|
|
assert_eq!(conf1.net_addresses().unwrap().0.port(), 30304);
|
|
|
|
assert_eq!(conf1.network_settings().unwrap().network_port, 30304);
|
|
|
|
assert_eq!(conf1.network_settings().unwrap().rpc_port, 8545);
|
|
|
|
assert_eq!(conf1.http_config().unwrap().port, 8545);
|
|
|
|
assert_eq!(conf1.ws_config().unwrap().port, 8547);
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(conf1.ui_config().port, 8181);
|
2017-05-23 12:24:32 +02:00
|
|
|
assert_eq!(conf1.secretstore_config().unwrap().port, 8084);
|
|
|
|
assert_eq!(conf1.secretstore_config().unwrap().http_port, 8083);
|
|
|
|
assert_eq!(conf1.ipfs_config().port, 5002);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_expose_all_servers() {
|
|
|
|
// given
|
|
|
|
|
|
|
|
// when
|
|
|
|
let conf0 = parse(&["parity", "--unsafe-expose"]);
|
|
|
|
|
|
|
|
// then
|
|
|
|
assert_eq!(&conf0.network_settings().unwrap().rpc_interface, "0.0.0.0");
|
|
|
|
assert_eq!(&conf0.http_config().unwrap().interface, "0.0.0.0");
|
|
|
|
assert_eq!(conf0.http_config().unwrap().hosts, None);
|
|
|
|
assert_eq!(&conf0.ws_config().unwrap().interface, "0.0.0.0");
|
|
|
|
assert_eq!(conf0.ws_config().unwrap().hosts, None);
|
2017-06-03 14:41:42 +02:00
|
|
|
assert_eq!(conf0.ws_config().unwrap().origins, None);
|
2017-05-24 12:24:07 +02:00
|
|
|
assert_eq!(&conf0.ui_config().interface, "0.0.0.0");
|
|
|
|
assert_eq!(conf0.ui_config().hosts, None);
|
2017-05-23 12:24:32 +02:00
|
|
|
assert_eq!(&conf0.secretstore_config().unwrap().interface, "0.0.0.0");
|
|
|
|
assert_eq!(&conf0.secretstore_config().unwrap().http_interface, "0.0.0.0");
|
|
|
|
assert_eq!(&conf0.ipfs_config().interface, "0.0.0.0");
|
|
|
|
assert_eq!(conf0.ipfs_config().hosts, None);
|
|
|
|
}
|
2017-07-28 19:06:39 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn allow_ips() {
|
|
|
|
let all = parse(&["parity", "--allow-ips", "all"]);
|
|
|
|
let private = parse(&["parity", "--allow-ips", "private"]);
|
|
|
|
let block_custom = parse(&["parity", "--allow-ips", "-10.0.0.0/8"]);
|
|
|
|
let combo = parse(&["parity", "--allow-ips", "public 10.0.0.0/8 -1.0.0.0/8"]);
|
|
|
|
let ipv6_custom_public = parse(&["parity", "--allow-ips", "public fc00::/7"]);
|
|
|
|
let ipv6_custom_private = parse(&["parity", "--allow-ips", "private -fc00::/7"]);
|
|
|
|
|
|
|
|
assert_eq!(all.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::All,
|
|
|
|
custom_allow: vec![],
|
|
|
|
custom_block: vec![],
|
|
|
|
});
|
|
|
|
|
|
|
|
assert_eq!(private.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::Private,
|
|
|
|
custom_allow: vec![],
|
|
|
|
custom_block: vec![],
|
|
|
|
});
|
|
|
|
|
|
|
|
assert_eq!(block_custom.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::All,
|
|
|
|
custom_allow: vec![],
|
|
|
|
custom_block: vec![IpNetwork::from_str("10.0.0.0/8").unwrap()],
|
|
|
|
});
|
|
|
|
|
|
|
|
assert_eq!(combo.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::Public,
|
|
|
|
custom_allow: vec![IpNetwork::from_str("10.0.0.0/8").unwrap()],
|
|
|
|
custom_block: vec![IpNetwork::from_str("1.0.0.0/8").unwrap()],
|
|
|
|
});
|
|
|
|
|
|
|
|
assert_eq!(ipv6_custom_public.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::Public,
|
|
|
|
custom_allow: vec![IpNetwork::from_str("fc00::/7").unwrap()],
|
|
|
|
custom_block: vec![],
|
|
|
|
});
|
|
|
|
|
|
|
|
assert_eq!(ipv6_custom_private.ip_filter().unwrap(), IpFilter {
|
|
|
|
predefined: AllowIP::Private,
|
|
|
|
custom_allow: vec![],
|
|
|
|
custom_block: vec![IpNetwork::from_str("fc00::/7").unwrap()],
|
|
|
|
});
|
|
|
|
}
|
2017-08-02 12:38:58 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn should_use_correct_cache_path_if_base_is_set() {
|
|
|
|
let std = parse(&["parity"]);
|
|
|
|
let base = parse(&["parity", "--base-path", "/test"]);
|
|
|
|
|
|
|
|
let base_path = ::dir::default_data_path();
|
|
|
|
let local_path = ::dir::default_local_path();
|
|
|
|
assert_eq!(std.directories().cache, ::helpers::replace_home_and_local(&base_path, &local_path, ::dir::CACHE_PATH));
|
|
|
|
assert_eq!(base.directories().cache, "/test/cache");
|
|
|
|
}
|
2016-04-30 19:58:28 +02:00
|
|
|
}
|