2017-01-25 18:51:41 +01:00
|
|
|
// Copyright 2015-2017 Parity Technologies (UK) Ltd.
|
2016-06-01 19:37:34 +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/>.
|
|
|
|
|
2017-02-04 22:18:19 +01:00
|
|
|
use std::cmp::PartialEq;
|
2016-06-01 19:37:34 +02:00
|
|
|
use std::collections::BTreeMap;
|
2016-07-25 16:09:47 +02:00
|
|
|
use std::collections::HashSet;
|
2016-06-01 19:37:34 +02:00
|
|
|
use std::str::FromStr;
|
2017-05-23 12:26:39 +02:00
|
|
|
use std::sync::{Arc, Weak};
|
2017-02-04 22:18:19 +01:00
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
pub use parity_rpc::signer::SignerService;
|
|
|
|
pub use parity_rpc::dapps::{DappsService, LocalDapp};
|
2017-02-04 22:18:19 +01:00
|
|
|
|
2016-06-20 00:10:34 +02:00
|
|
|
use ethcore::account_provider::AccountProvider;
|
2017-02-04 22:18:19 +01:00
|
|
|
use ethcore::client::Client;
|
|
|
|
use ethcore::miner::{Miner, ExternalMiner};
|
2016-10-31 17:32:53 +01:00
|
|
|
use ethcore::snapshot::SnapshotService;
|
2017-08-28 14:11:55 +02:00
|
|
|
use ethcore_logger::RotatingLogger;
|
2017-03-22 21:09:43 +01:00
|
|
|
use ethsync::{ManageNetwork, SyncProvider, LightSync};
|
2016-12-22 18:26:39 +01:00
|
|
|
use hash_fetch::fetch::Client as FetchClient;
|
2017-05-06 13:24:18 +02:00
|
|
|
use jsonrpc_core::{self as core, MetaIoHandler};
|
2017-03-22 21:09:43 +01:00
|
|
|
use light::{TransactionQueue as LightTransactionQueue, Cache as LightDataCache};
|
2017-08-24 15:17:48 +02:00
|
|
|
use light::client::LightChainClient;
|
2017-08-28 14:11:55 +02:00
|
|
|
use node_health::NodeHealth;
|
|
|
|
use parity_reactor;
|
|
|
|
use parity_rpc::dispatch::{FullDispatcher, LightDispatcher};
|
|
|
|
use parity_rpc::informant::{ActivityNotifier, ClientNotifier};
|
|
|
|
use parity_rpc::{Metadata, NetworkSettings};
|
2017-02-04 22:18:19 +01:00
|
|
|
use updater::Updater;
|
2017-09-02 20:09:13 +02:00
|
|
|
use parking_lot::{Mutex, RwLock};
|
2016-06-01 19:37:34 +02:00
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[derive(Debug, PartialEq, Clone, Eq, Hash)]
|
2016-06-01 19:37:34 +02:00
|
|
|
pub enum Api {
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Web3 (Safe)
|
2016-06-01 19:37:34 +02:00
|
|
|
Web3,
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Net (Safe)
|
2016-06-01 19:37:34 +02:00
|
|
|
Net,
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Eth (Safe)
|
2016-06-01 19:37:34 +02:00
|
|
|
Eth,
|
2017-05-23 12:26:39 +02:00
|
|
|
/// Eth Pub-Sub (Safe)
|
|
|
|
EthPubSub,
|
2016-11-09 19:41:47 +01:00
|
|
|
/// Geth-compatible "personal" API (DEPRECATED; only used in `--geth` mode.)
|
2016-11-06 12:51:53 +01:00
|
|
|
Personal,
|
|
|
|
/// Signer - Confirm transactions in Signer (UNSAFE: Passwords, List of transactions)
|
2016-06-07 22:52:48 +02:00
|
|
|
Signer,
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Parity - Custom extensions (Safe)
|
|
|
|
Parity,
|
2017-05-23 18:05:17 +02:00
|
|
|
/// Parity PubSub - Generic Publish-Subscriber (Safety depends on other APIs exposed).
|
|
|
|
ParityPubSub,
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Parity Accounts extensions (UNSAFE: Passwords, Side Effects (new account))
|
|
|
|
ParityAccounts,
|
|
|
|
/// Parity - Set methods (UNSAFE: Side Effects affecting node operation)
|
|
|
|
ParitySet,
|
|
|
|
/// Traces (Safe)
|
2016-06-01 19:37:34 +02:00
|
|
|
Traces,
|
2016-11-06 12:51:53 +01:00
|
|
|
/// Rpc (Safe)
|
2016-06-01 19:37:34 +02:00
|
|
|
Rpc,
|
2017-05-05 15:57:29 +02:00
|
|
|
/// SecretStore (Safe)
|
|
|
|
SecretStore,
|
2017-07-14 20:40:28 +02:00
|
|
|
/// Whisper (Safe)
|
|
|
|
// TODO: _if_ someone guesses someone else's key or filter IDs they can remove
|
|
|
|
// BUT these are all ephemeral so it seems fine.
|
|
|
|
Whisper,
|
|
|
|
/// Whisper Pub-Sub (Safe but same concerns as above).
|
|
|
|
WhisperPubSub,
|
2016-06-01 19:37:34 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
impl FromStr for Api {
|
2016-07-25 16:09:47 +02:00
|
|
|
type Err = String;
|
2016-06-01 19:37:34 +02:00
|
|
|
|
|
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
|
|
|
use self::Api::*;
|
|
|
|
|
|
|
|
match s {
|
|
|
|
"web3" => Ok(Web3),
|
|
|
|
"net" => Ok(Net),
|
|
|
|
"eth" => Ok(Eth),
|
2017-05-23 12:26:39 +02:00
|
|
|
"pubsub" => Ok(EthPubSub),
|
2016-11-06 12:51:53 +01:00
|
|
|
"personal" => Ok(Personal),
|
2016-06-07 22:52:48 +02:00
|
|
|
"signer" => Ok(Signer),
|
2016-11-06 12:51:53 +01:00
|
|
|
"parity" => Ok(Parity),
|
2017-05-23 18:05:17 +02:00
|
|
|
"parity_pubsub" => Ok(ParityPubSub),
|
2016-11-06 12:51:53 +01:00
|
|
|
"parity_accounts" => Ok(ParityAccounts),
|
|
|
|
"parity_set" => Ok(ParitySet),
|
2016-06-01 19:37:34 +02:00
|
|
|
"traces" => Ok(Traces),
|
|
|
|
"rpc" => Ok(Rpc),
|
2017-05-05 15:57:29 +02:00
|
|
|
"secretstore" => Ok(SecretStore),
|
2017-07-14 20:40:28 +02:00
|
|
|
"shh" => Ok(Whisper),
|
|
|
|
"shh_pubsub" => Ok(WhisperPubSub),
|
2016-07-25 16:09:47 +02:00
|
|
|
api => Err(format!("Unknown api: {}", api))
|
2016-06-01 19:37:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-03 10:27:37 +02:00
|
|
|
#[derive(Debug, Clone)]
|
2016-07-25 16:09:47 +02:00
|
|
|
pub enum ApiSet {
|
2017-04-06 19:38:33 +02:00
|
|
|
// Safe context (like token-protected WS interface)
|
2016-07-25 16:09:47 +02:00
|
|
|
SafeContext,
|
2017-04-06 19:38:33 +02:00
|
|
|
// Unsafe context (like jsonrpc over http)
|
2016-07-25 16:09:47 +02:00
|
|
|
UnsafeContext,
|
2017-04-06 19:38:33 +02:00
|
|
|
// Public context (like public jsonrpc over http)
|
|
|
|
PublicContext,
|
|
|
|
// All possible APIs
|
|
|
|
All,
|
|
|
|
// Local "unsafe" context and accounts access
|
2016-11-04 09:58:39 +01:00
|
|
|
IpcContext,
|
2017-07-10 17:42:29 +02:00
|
|
|
// APIs for Parity Generic Pub-Sub
|
|
|
|
PubSub,
|
2017-04-06 19:38:33 +02:00
|
|
|
// Fixed list of APis
|
2016-07-25 16:09:47 +02:00
|
|
|
List(HashSet<Api>),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Default for ApiSet {
|
|
|
|
fn default() -> Self {
|
|
|
|
ApiSet::UnsafeContext
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PartialEq for ApiSet {
|
|
|
|
fn eq(&self, other: &Self) -> bool {
|
|
|
|
self.list_apis() == other.list_apis()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl FromStr for ApiSet {
|
|
|
|
type Err = String;
|
|
|
|
|
|
|
|
fn from_str(s: &str) -> Result<Self, Self::Err> {
|
2017-04-06 19:38:33 +02:00
|
|
|
let mut apis = HashSet::new();
|
|
|
|
|
|
|
|
for api in s.split(',') {
|
|
|
|
match api {
|
|
|
|
"all" => {
|
|
|
|
apis.extend(ApiSet::All.list_apis());
|
|
|
|
},
|
|
|
|
"safe" => {
|
|
|
|
// Safe APIs are those that are safe even in UnsafeContext.
|
|
|
|
apis.extend(ApiSet::UnsafeContext.list_apis());
|
|
|
|
},
|
|
|
|
// Remove the API
|
|
|
|
api if api.starts_with("-") => {
|
|
|
|
let api = api[1..].parse()?;
|
|
|
|
apis.remove(&api);
|
|
|
|
},
|
|
|
|
api => {
|
|
|
|
let api = api.parse()?;
|
|
|
|
apis.insert(api);
|
|
|
|
},
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Ok(ApiSet::List(apis))
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-10 17:42:29 +02:00
|
|
|
fn to_modules(apis: &HashSet<Api>) -> BTreeMap<String, String> {
|
2017-03-22 20:14:40 +01:00
|
|
|
let mut modules = BTreeMap::new();
|
|
|
|
for api in apis {
|
|
|
|
let (name, version) = match *api {
|
|
|
|
Api::Web3 => ("web3", "1.0"),
|
|
|
|
Api::Net => ("net", "1.0"),
|
|
|
|
Api::Eth => ("eth", "1.0"),
|
2017-05-23 12:26:39 +02:00
|
|
|
Api::EthPubSub => ("pubsub", "1.0"),
|
2017-03-22 20:14:40 +01:00
|
|
|
Api::Personal => ("personal", "1.0"),
|
|
|
|
Api::Signer => ("signer", "1.0"),
|
|
|
|
Api::Parity => ("parity", "1.0"),
|
|
|
|
Api::ParityAccounts => ("parity_accounts", "1.0"),
|
2017-05-23 18:05:17 +02:00
|
|
|
Api::ParityPubSub => ("parity_pubsub", "1.0"),
|
2017-03-22 20:14:40 +01:00
|
|
|
Api::ParitySet => ("parity_set", "1.0"),
|
|
|
|
Api::Traces => ("traces", "1.0"),
|
|
|
|
Api::Rpc => ("rpc", "1.0"),
|
2017-05-05 15:57:29 +02:00
|
|
|
Api::SecretStore => ("secretstore", "1.0"),
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Whisper => ("shh", "1.0"),
|
|
|
|
Api::WhisperPubSub => ("shh_pubsub", "1.0"),
|
2017-03-22 20:14:40 +01:00
|
|
|
};
|
|
|
|
modules.insert(name.into(), version.into());
|
|
|
|
}
|
|
|
|
modules
|
|
|
|
}
|
|
|
|
|
|
|
|
/// RPC dependencies can be used to initialize RPC endpoints from APIs.
|
|
|
|
pub trait Dependencies {
|
|
|
|
type Notifier: ActivityNotifier;
|
|
|
|
|
|
|
|
/// Create the activity notifier.
|
|
|
|
fn activity_notifier(&self) -> Self::Notifier;
|
|
|
|
|
|
|
|
/// Extend the given I/O handler with endpoints for each API.
|
2017-05-24 12:24:07 +02:00
|
|
|
fn extend_with_set<S>(
|
|
|
|
&self,
|
|
|
|
handler: &mut MetaIoHandler<Metadata, S>,
|
2017-07-10 17:42:29 +02:00
|
|
|
apis: &HashSet<Api>,
|
2017-05-24 12:24:07 +02:00
|
|
|
) where S: core::Middleware<Metadata>;
|
2017-03-22 20:14:40 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/// RPC dependencies for a full node.
|
|
|
|
pub struct FullDependencies {
|
2016-09-21 12:44:49 +02:00
|
|
|
pub signer_service: Arc<SignerService>,
|
2016-06-01 19:37:34 +02:00
|
|
|
pub client: Arc<Client>,
|
2016-10-31 17:32:53 +01:00
|
|
|
pub snapshot: Arc<SnapshotService>,
|
2016-07-16 15:51:06 +02:00
|
|
|
pub sync: Arc<SyncProvider>,
|
|
|
|
pub net: Arc<ManageNetwork>,
|
2017-03-29 17:07:58 +02:00
|
|
|
pub secret_store: Option<Arc<AccountProvider>>,
|
2016-06-01 19:37:34 +02:00
|
|
|
pub miner: Arc<Miner>,
|
|
|
|
pub external_miner: Arc<ExternalMiner>,
|
|
|
|
pub logger: Arc<RotatingLogger>,
|
|
|
|
pub settings: Arc<NetworkSettings>,
|
2016-07-11 17:02:42 +02:00
|
|
|
pub net_service: Arc<ManageNetwork>,
|
2016-12-11 19:14:42 +01:00
|
|
|
pub updater: Arc<Updater>,
|
2017-08-28 14:11:55 +02:00
|
|
|
pub health: NodeHealth,
|
2016-08-03 15:31:00 +02:00
|
|
|
pub geth_compatibility: bool,
|
2017-05-24 12:24:07 +02:00
|
|
|
pub dapps_service: Option<Arc<DappsService>>,
|
|
|
|
pub dapps_address: Option<(String, u16)>,
|
|
|
|
pub ws_address: Option<(String, u16)>,
|
2016-12-22 18:26:39 +01:00
|
|
|
pub fetch: FetchClient,
|
2017-05-06 13:24:18 +02:00
|
|
|
pub remote: parity_reactor::Remote,
|
2017-07-14 20:40:28 +02:00
|
|
|
pub whisper_rpc: Option<::whisper::RpcFactory>,
|
2016-06-01 19:37:34 +02:00
|
|
|
}
|
|
|
|
|
2017-05-06 13:24:18 +02:00
|
|
|
impl FullDependencies {
|
2017-05-24 12:24:07 +02:00
|
|
|
fn extend_api<S>(
|
2017-05-06 13:24:18 +02:00
|
|
|
&self,
|
2017-05-24 12:24:07 +02:00
|
|
|
handler: &mut MetaIoHandler<Metadata, S>,
|
2017-07-10 17:42:29 +02:00
|
|
|
apis: &HashSet<Api>,
|
2017-05-06 13:24:18 +02:00
|
|
|
for_generic_pubsub: bool,
|
2017-05-24 12:24:07 +02:00
|
|
|
) where S: core::Middleware<Metadata> {
|
2017-04-13 16:32:07 +02:00
|
|
|
use parity_rpc::v1::*;
|
2017-03-22 20:14:40 +01:00
|
|
|
|
|
|
|
macro_rules! add_signing_methods {
|
|
|
|
($namespace:ident, $handler:expr, $deps:expr) => {
|
|
|
|
{
|
|
|
|
let deps = &$deps;
|
2017-05-28 14:40:36 +02:00
|
|
|
let dispatcher = FullDispatcher::new(deps.client.clone(), deps.miner.clone());
|
2017-03-22 20:14:40 +01:00
|
|
|
if deps.signer_service.is_enabled() {
|
|
|
|
$handler.extend_with($namespace::to_delegate(SigningQueueClient::new(&deps.signer_service, dispatcher, &deps.secret_store)))
|
|
|
|
} else {
|
|
|
|
$handler.extend_with($namespace::to_delegate(SigningUnsafeClient::new(&deps.secret_store, dispatcher)))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-28 14:40:36 +02:00
|
|
|
let dispatcher = FullDispatcher::new(self.client.clone(), self.miner.clone());
|
2017-03-22 20:14:40 +01:00
|
|
|
for api in apis {
|
|
|
|
match *api {
|
|
|
|
Api::Web3 => {
|
|
|
|
handler.extend_with(Web3Client::new().to_delegate());
|
|
|
|
},
|
|
|
|
Api::Net => {
|
|
|
|
handler.extend_with(NetClient::new(&self.sync).to_delegate());
|
|
|
|
},
|
|
|
|
Api::Eth => {
|
|
|
|
let client = EthClient::new(
|
|
|
|
&self.client,
|
|
|
|
&self.snapshot,
|
|
|
|
&self.sync,
|
|
|
|
&self.secret_store,
|
|
|
|
&self.miner,
|
|
|
|
&self.external_miner,
|
|
|
|
EthClientOptions {
|
|
|
|
pending_nonce_from_queue: self.geth_compatibility,
|
|
|
|
allow_pending_receipt_query: !self.geth_compatibility,
|
|
|
|
send_block_number_in_get_work: !self.geth_compatibility,
|
|
|
|
}
|
|
|
|
);
|
|
|
|
handler.extend_with(client.to_delegate());
|
|
|
|
|
2017-05-06 13:24:18 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
let filter_client = EthFilterClient::new(self.client.clone(), self.miner.clone());
|
|
|
|
handler.extend_with(filter_client.to_delegate());
|
2017-03-22 20:14:40 +01:00
|
|
|
|
2017-05-06 13:24:18 +02:00
|
|
|
add_signing_methods!(EthSigning, handler, self);
|
|
|
|
}
|
2017-03-22 20:14:40 +01:00
|
|
|
},
|
2017-05-23 12:26:39 +02:00
|
|
|
Api::EthPubSub => {
|
2017-07-27 12:52:36 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
let client = EthPubSubClient::new(self.client.clone(), self.remote.clone());
|
|
|
|
self.client.add_notify(client.handler());
|
|
|
|
handler.extend_with(client.to_delegate());
|
|
|
|
}
|
2017-05-23 12:26:39 +02:00
|
|
|
},
|
2017-03-22 20:14:40 +01:00
|
|
|
Api::Personal => {
|
|
|
|
handler.extend_with(PersonalClient::new(&self.secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
|
|
|
|
},
|
|
|
|
Api::Signer => {
|
2017-05-17 16:20:41 +02:00
|
|
|
handler.extend_with(SignerClient::new(&self.secret_store, dispatcher.clone(), &self.signer_service, self.remote.clone()).to_delegate());
|
2017-03-22 20:14:40 +01:00
|
|
|
},
|
|
|
|
Api::Parity => {
|
|
|
|
let signer = match self.signer_service.is_enabled() {
|
|
|
|
true => Some(self.signer_service.clone()),
|
|
|
|
false => None,
|
|
|
|
};
|
|
|
|
handler.extend_with(ParityClient::new(
|
2017-08-28 14:11:55 +02:00
|
|
|
self.client.clone(),
|
|
|
|
self.miner.clone(),
|
|
|
|
self.sync.clone(),
|
|
|
|
self.updater.clone(),
|
|
|
|
self.net_service.clone(),
|
|
|
|
self.health.clone(),
|
|
|
|
self.secret_store.clone(),
|
2017-03-22 20:14:40 +01:00
|
|
|
self.logger.clone(),
|
|
|
|
self.settings.clone(),
|
|
|
|
signer,
|
2017-05-24 12:24:07 +02:00
|
|
|
self.dapps_address.clone(),
|
|
|
|
self.ws_address.clone(),
|
2017-03-22 20:14:40 +01:00
|
|
|
).to_delegate());
|
|
|
|
|
2017-05-23 18:05:17 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
add_signing_methods!(ParitySigning, handler, self);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Api::ParityPubSub => {
|
2017-05-06 13:24:18 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
let mut rpc = MetaIoHandler::default();
|
2017-07-10 17:42:29 +02:00
|
|
|
let apis = ApiSet::List(apis.clone()).retain(ApiSet::PubSub).list_apis();
|
|
|
|
self.extend_api(&mut rpc, &apis, true);
|
2017-05-06 13:24:18 +02:00
|
|
|
handler.extend_with(PubSubClient::new(rpc, self.remote.clone()).to_delegate());
|
|
|
|
}
|
2017-03-22 20:14:40 +01:00
|
|
|
},
|
|
|
|
Api::ParityAccounts => {
|
|
|
|
handler.extend_with(ParityAccountsClient::new(&self.secret_store).to_delegate());
|
|
|
|
},
|
|
|
|
Api::ParitySet => {
|
|
|
|
handler.extend_with(ParitySetClient::new(
|
|
|
|
&self.client,
|
|
|
|
&self.miner,
|
|
|
|
&self.updater,
|
|
|
|
&self.net_service,
|
2017-05-24 12:24:07 +02:00
|
|
|
self.dapps_service.clone(),
|
2017-03-22 20:14:40 +01:00
|
|
|
self.fetch.clone(),
|
|
|
|
).to_delegate())
|
|
|
|
},
|
|
|
|
Api::Traces => {
|
|
|
|
handler.extend_with(TracesClient::new(&self.client, &self.miner).to_delegate())
|
|
|
|
},
|
|
|
|
Api::Rpc => {
|
|
|
|
let modules = to_modules(&apis);
|
|
|
|
handler.extend_with(RpcClient::new(modules).to_delegate());
|
2017-05-05 15:57:29 +02:00
|
|
|
},
|
|
|
|
Api::SecretStore => {
|
|
|
|
handler.extend_with(SecretStoreClient::new(&self.secret_store).to_delegate());
|
|
|
|
},
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Whisper => {
|
|
|
|
if let Some(ref whisper_rpc) = self.whisper_rpc {
|
|
|
|
let whisper = whisper_rpc.make_handler();
|
|
|
|
handler.extend_with(::parity_whisper::rpc::Whisper::to_delegate(whisper));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Api::WhisperPubSub => {
|
2017-07-27 12:52:36 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
if let Some(ref whisper_rpc) = self.whisper_rpc {
|
|
|
|
let whisper = whisper_rpc.make_handler();
|
|
|
|
handler.extend_with(
|
|
|
|
::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper)
|
|
|
|
);
|
|
|
|
}
|
2017-07-14 20:40:28 +02:00
|
|
|
}
|
|
|
|
}
|
2017-03-22 20:14:40 +01:00
|
|
|
}
|
|
|
|
}
|
2016-06-01 19:37:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-06 13:24:18 +02:00
|
|
|
impl Dependencies for FullDependencies {
|
|
|
|
type Notifier = ClientNotifier;
|
|
|
|
|
|
|
|
fn activity_notifier(&self) -> ClientNotifier {
|
|
|
|
ClientNotifier {
|
|
|
|
client: self.client.clone(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-24 12:24:07 +02:00
|
|
|
fn extend_with_set<S>(
|
|
|
|
&self,
|
|
|
|
handler: &mut MetaIoHandler<Metadata, S>,
|
2017-07-10 17:42:29 +02:00
|
|
|
apis: &HashSet<Api>,
|
2017-05-24 12:24:07 +02:00
|
|
|
) where S: core::Middleware<Metadata> {
|
2017-05-06 13:24:18 +02:00
|
|
|
self.extend_api(handler, apis, false)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-22 21:09:43 +01:00
|
|
|
/// Light client notifier. Doesn't do anything yet, but might in the future.
|
|
|
|
pub struct LightClientNotifier;
|
|
|
|
|
|
|
|
impl ActivityNotifier for LightClientNotifier {
|
|
|
|
fn active(&self) {}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// RPC dependencies for a light client.
|
2017-08-24 15:17:48 +02:00
|
|
|
pub struct LightDependencies<T> {
|
2017-03-22 21:09:43 +01:00
|
|
|
pub signer_service: Arc<SignerService>,
|
2017-08-24 15:17:48 +02:00
|
|
|
pub client: Arc<T>,
|
2017-03-22 21:09:43 +01:00
|
|
|
pub sync: Arc<LightSync>,
|
|
|
|
pub net: Arc<ManageNetwork>,
|
|
|
|
pub secret_store: Arc<AccountProvider>,
|
|
|
|
pub logger: Arc<RotatingLogger>,
|
|
|
|
pub settings: Arc<NetworkSettings>,
|
2017-08-28 14:11:55 +02:00
|
|
|
pub health: NodeHealth,
|
2017-03-22 21:09:43 +01:00
|
|
|
pub on_demand: Arc<::light::on_demand::OnDemand>,
|
|
|
|
pub cache: Arc<Mutex<LightDataCache>>,
|
|
|
|
pub transaction_queue: Arc<RwLock<LightTransactionQueue>>,
|
2017-05-24 12:24:07 +02:00
|
|
|
pub dapps_service: Option<Arc<DappsService>>,
|
|
|
|
pub dapps_address: Option<(String, u16)>,
|
|
|
|
pub ws_address: Option<(String, u16)>,
|
2017-03-22 21:09:43 +01:00
|
|
|
pub fetch: FetchClient,
|
|
|
|
pub geth_compatibility: bool,
|
2017-05-17 16:20:41 +02:00
|
|
|
pub remote: parity_reactor::Remote,
|
2017-07-14 20:40:28 +02:00
|
|
|
pub whisper_rpc: Option<::whisper::RpcFactory>,
|
2017-03-22 21:09:43 +01:00
|
|
|
}
|
|
|
|
|
2017-08-24 15:17:48 +02:00
|
|
|
impl<C: LightChainClient + 'static> LightDependencies<C> {
|
2017-05-23 18:05:17 +02:00
|
|
|
fn extend_api<T: core::Middleware<Metadata>>(
|
|
|
|
&self,
|
|
|
|
handler: &mut MetaIoHandler<Metadata, T>,
|
2017-07-10 17:42:29 +02:00
|
|
|
apis: &HashSet<Api>,
|
2017-05-23 18:05:17 +02:00
|
|
|
for_generic_pubsub: bool,
|
|
|
|
) {
|
2017-04-13 16:32:07 +02:00
|
|
|
use parity_rpc::v1::*;
|
2017-03-22 21:09:43 +01:00
|
|
|
|
|
|
|
let dispatcher = LightDispatcher::new(
|
|
|
|
self.sync.clone(),
|
|
|
|
self.client.clone(),
|
|
|
|
self.on_demand.clone(),
|
|
|
|
self.cache.clone(),
|
|
|
|
self.transaction_queue.clone(),
|
|
|
|
);
|
|
|
|
|
2017-03-23 19:42:11 +01:00
|
|
|
macro_rules! add_signing_methods {
|
|
|
|
($namespace:ident, $handler:expr, $deps:expr) => {
|
|
|
|
{
|
|
|
|
let deps = &$deps;
|
|
|
|
let dispatcher = dispatcher.clone();
|
2017-04-03 08:51:23 +02:00
|
|
|
let secret_store = Some(deps.secret_store.clone());
|
2017-03-23 19:42:11 +01:00
|
|
|
if deps.signer_service.is_enabled() {
|
2017-04-03 08:51:23 +02:00
|
|
|
$handler.extend_with($namespace::to_delegate(
|
|
|
|
SigningQueueClient::new(&deps.signer_service, dispatcher, &secret_store)
|
|
|
|
))
|
2017-03-23 19:42:11 +01:00
|
|
|
} else {
|
2017-04-03 08:51:23 +02:00
|
|
|
$handler.extend_with(
|
|
|
|
$namespace::to_delegate(SigningUnsafeClient::new(&secret_store, dispatcher))
|
|
|
|
)
|
2017-03-23 19:42:11 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-22 21:09:43 +01:00
|
|
|
for api in apis {
|
|
|
|
match *api {
|
|
|
|
Api::Web3 => {
|
|
|
|
handler.extend_with(Web3Client::new().to_delegate());
|
|
|
|
},
|
|
|
|
Api::Net => {
|
|
|
|
handler.extend_with(light::NetClient::new(self.sync.clone()).to_delegate());
|
|
|
|
},
|
|
|
|
Api::Eth => {
|
|
|
|
let client = light::EthClient::new(
|
|
|
|
self.sync.clone(),
|
|
|
|
self.client.clone(),
|
|
|
|
self.on_demand.clone(),
|
|
|
|
self.transaction_queue.clone(),
|
|
|
|
self.secret_store.clone(),
|
|
|
|
self.cache.clone(),
|
|
|
|
);
|
2017-04-12 12:07:54 +02:00
|
|
|
handler.extend_with(Eth::to_delegate(client.clone()));
|
2017-05-23 18:05:17 +02:00
|
|
|
|
|
|
|
if !for_generic_pubsub {
|
|
|
|
handler.extend_with(EthFilter::to_delegate(client));
|
|
|
|
add_signing_methods!(EthSigning, handler, self);
|
|
|
|
}
|
2017-03-22 21:09:43 +01:00
|
|
|
},
|
2017-05-23 12:26:39 +02:00
|
|
|
Api::EthPubSub => {
|
2017-06-28 12:21:13 +02:00
|
|
|
let client = EthPubSubClient::light(
|
|
|
|
self.client.clone(),
|
|
|
|
self.on_demand.clone(),
|
|
|
|
self.sync.clone(),
|
|
|
|
self.cache.clone(),
|
|
|
|
self.remote.clone(),
|
|
|
|
);
|
2017-05-23 12:26:39 +02:00
|
|
|
self.client.add_listener(
|
|
|
|
Arc::downgrade(&client.handler()) as Weak<::light::client::LightChainNotify>
|
|
|
|
);
|
|
|
|
handler.extend_with(EthPubSub::to_delegate(client));
|
|
|
|
},
|
2017-03-22 21:09:43 +01:00
|
|
|
Api::Personal => {
|
2017-04-03 08:51:23 +02:00
|
|
|
let secret_store = Some(self.secret_store.clone());
|
|
|
|
handler.extend_with(PersonalClient::new(&secret_store, dispatcher.clone(), self.geth_compatibility).to_delegate());
|
2017-03-22 21:09:43 +01:00
|
|
|
},
|
|
|
|
Api::Signer => {
|
2017-04-03 08:51:23 +02:00
|
|
|
let secret_store = Some(self.secret_store.clone());
|
2017-05-17 16:20:41 +02:00
|
|
|
handler.extend_with(SignerClient::new(&secret_store, dispatcher.clone(), &self.signer_service, self.remote.clone()).to_delegate());
|
2017-03-22 21:09:43 +01:00
|
|
|
},
|
|
|
|
Api::Parity => {
|
|
|
|
let signer = match self.signer_service.is_enabled() {
|
|
|
|
true => Some(self.signer_service.clone()),
|
|
|
|
false => None,
|
|
|
|
};
|
|
|
|
handler.extend_with(light::ParityClient::new(
|
2017-04-19 14:30:00 +02:00
|
|
|
self.client.clone(),
|
2017-03-22 21:09:43 +01:00
|
|
|
Arc::new(dispatcher.clone()),
|
|
|
|
self.secret_store.clone(),
|
|
|
|
self.logger.clone(),
|
|
|
|
self.settings.clone(),
|
2017-08-28 14:11:55 +02:00
|
|
|
self.health.clone(),
|
2017-03-22 21:09:43 +01:00
|
|
|
signer,
|
2017-05-24 12:24:07 +02:00
|
|
|
self.dapps_address.clone(),
|
|
|
|
self.ws_address.clone(),
|
2017-03-22 21:09:43 +01:00
|
|
|
).to_delegate());
|
|
|
|
|
2017-05-23 18:05:17 +02:00
|
|
|
if !for_generic_pubsub {
|
|
|
|
add_signing_methods!(ParitySigning, handler, self);
|
|
|
|
}
|
|
|
|
},
|
|
|
|
Api::ParityPubSub => {
|
|
|
|
if !for_generic_pubsub {
|
|
|
|
let mut rpc = MetaIoHandler::default();
|
2017-07-10 17:42:29 +02:00
|
|
|
let apis = ApiSet::List(apis.clone()).retain(ApiSet::PubSub).list_apis();
|
|
|
|
self.extend_api(&mut rpc, &apis, true);
|
2017-05-23 18:05:17 +02:00
|
|
|
handler.extend_with(PubSubClient::new(rpc, self.remote.clone()).to_delegate());
|
|
|
|
}
|
2017-03-22 21:09:43 +01:00
|
|
|
},
|
|
|
|
Api::ParityAccounts => {
|
2017-04-03 08:51:23 +02:00
|
|
|
let secret_store = Some(self.secret_store.clone());
|
|
|
|
handler.extend_with(ParityAccountsClient::new(&secret_store).to_delegate());
|
2017-03-22 21:09:43 +01:00
|
|
|
},
|
|
|
|
Api::ParitySet => {
|
|
|
|
handler.extend_with(light::ParitySetClient::new(
|
|
|
|
self.sync.clone(),
|
2017-05-24 12:24:07 +02:00
|
|
|
self.dapps_service.clone(),
|
2017-03-22 21:09:43 +01:00
|
|
|
self.fetch.clone(),
|
|
|
|
).to_delegate())
|
|
|
|
},
|
|
|
|
Api::Traces => {
|
|
|
|
handler.extend_with(light::TracesClient.to_delegate())
|
|
|
|
},
|
|
|
|
Api::Rpc => {
|
|
|
|
let modules = to_modules(&apis);
|
|
|
|
handler.extend_with(RpcClient::new(modules).to_delegate());
|
2017-05-05 15:57:29 +02:00
|
|
|
},
|
|
|
|
Api::SecretStore => {
|
|
|
|
let secret_store = Some(self.secret_store.clone());
|
|
|
|
handler.extend_with(SecretStoreClient::new(&secret_store).to_delegate());
|
|
|
|
},
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Whisper => {
|
|
|
|
if let Some(ref whisper_rpc) = self.whisper_rpc {
|
|
|
|
let whisper = whisper_rpc.make_handler();
|
|
|
|
handler.extend_with(::parity_whisper::rpc::Whisper::to_delegate(whisper));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Api::WhisperPubSub => {
|
|
|
|
if let Some(ref whisper_rpc) = self.whisper_rpc {
|
|
|
|
let whisper = whisper_rpc.make_handler();
|
|
|
|
handler.extend_with(::parity_whisper::rpc::WhisperPubSub::to_delegate(whisper));
|
|
|
|
}
|
|
|
|
}
|
2017-03-22 21:09:43 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-24 15:17:48 +02:00
|
|
|
impl<T: LightChainClient + 'static> Dependencies for LightDependencies<T> {
|
2017-05-23 18:05:17 +02:00
|
|
|
type Notifier = LightClientNotifier;
|
|
|
|
|
|
|
|
fn activity_notifier(&self) -> Self::Notifier { LightClientNotifier }
|
2017-05-24 12:24:07 +02:00
|
|
|
|
|
|
|
fn extend_with_set<S>(
|
|
|
|
&self,
|
|
|
|
handler: &mut MetaIoHandler<Metadata, S>,
|
2017-07-10 17:42:29 +02:00
|
|
|
apis: &HashSet<Api>,
|
2017-05-24 12:24:07 +02:00
|
|
|
) where S: core::Middleware<Metadata> {
|
2017-05-23 18:05:17 +02:00
|
|
|
self.extend_api(handler, apis, false)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
impl ApiSet {
|
2017-04-06 19:38:33 +02:00
|
|
|
/// Retains only APIs in given set.
|
|
|
|
pub fn retain(self, set: Self) -> Self {
|
|
|
|
ApiSet::List(&self.list_apis() & &set.list_apis())
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
pub fn list_apis(&self) -> HashSet<Api> {
|
2017-07-10 17:42:29 +02:00
|
|
|
let mut public_list = [
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3,
|
|
|
|
Api::Net,
|
|
|
|
Api::Eth,
|
|
|
|
Api::EthPubSub,
|
|
|
|
Api::Parity,
|
|
|
|
Api::Rpc,
|
|
|
|
Api::SecretStore,
|
|
|
|
Api::Whisper,
|
|
|
|
Api::WhisperPubSub,
|
2017-07-10 17:42:29 +02:00
|
|
|
].into_iter().cloned().collect();
|
2017-07-14 20:40:28 +02:00
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
match *self {
|
|
|
|
ApiSet::List(ref apis) => apis.clone(),
|
2017-04-06 19:38:33 +02:00
|
|
|
ApiSet::PublicContext => public_list,
|
|
|
|
ApiSet::UnsafeContext => {
|
|
|
|
public_list.insert(Api::Traces);
|
2017-05-23 18:05:17 +02:00
|
|
|
public_list.insert(Api::ParityPubSub);
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list
|
|
|
|
},
|
2016-11-04 09:58:39 +01:00
|
|
|
ApiSet::IpcContext => {
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list.insert(Api::Traces);
|
2017-05-23 18:05:17 +02:00
|
|
|
public_list.insert(Api::ParityPubSub);
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list.insert(Api::ParityAccounts);
|
|
|
|
public_list
|
2016-11-04 09:58:39 +01:00
|
|
|
},
|
2016-10-24 15:10:13 +02:00
|
|
|
ApiSet::SafeContext => {
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list.insert(Api::Traces);
|
2017-05-23 18:05:17 +02:00
|
|
|
public_list.insert(Api::ParityPubSub);
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list.insert(Api::ParityAccounts);
|
|
|
|
public_list.insert(Api::ParitySet);
|
|
|
|
public_list.insert(Api::Signer);
|
|
|
|
public_list
|
|
|
|
},
|
|
|
|
ApiSet::All => {
|
|
|
|
public_list.insert(Api::Traces);
|
2017-05-23 18:05:17 +02:00
|
|
|
public_list.insert(Api::ParityPubSub);
|
2017-04-06 19:38:33 +02:00
|
|
|
public_list.insert(Api::ParityAccounts);
|
|
|
|
public_list.insert(Api::ParitySet);
|
|
|
|
public_list.insert(Api::Signer);
|
|
|
|
public_list.insert(Api::Personal);
|
|
|
|
public_list
|
2016-07-25 16:09:47 +02:00
|
|
|
},
|
2017-07-10 17:42:29 +02:00
|
|
|
ApiSet::PubSub => [
|
|
|
|
Api::Eth,
|
|
|
|
Api::Parity,
|
|
|
|
Api::ParityAccounts,
|
|
|
|
Api::ParitySet,
|
|
|
|
Api::Traces,
|
|
|
|
].into_iter().cloned().collect()
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|
2016-06-01 19:37:34 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::{Api, ApiSet};
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_api_parsing() {
|
|
|
|
assert_eq!(Api::Web3, "web3".parse().unwrap());
|
|
|
|
assert_eq!(Api::Net, "net".parse().unwrap());
|
|
|
|
assert_eq!(Api::Eth, "eth".parse().unwrap());
|
2017-05-23 12:26:39 +02:00
|
|
|
assert_eq!(Api::EthPubSub, "pubsub".parse().unwrap());
|
2016-11-06 12:51:53 +01:00
|
|
|
assert_eq!(Api::Personal, "personal".parse().unwrap());
|
2016-07-25 16:09:47 +02:00
|
|
|
assert_eq!(Api::Signer, "signer".parse().unwrap());
|
2016-11-06 12:51:53 +01:00
|
|
|
assert_eq!(Api::Parity, "parity".parse().unwrap());
|
|
|
|
assert_eq!(Api::ParityAccounts, "parity_accounts".parse().unwrap());
|
|
|
|
assert_eq!(Api::ParitySet, "parity_set".parse().unwrap());
|
2016-07-25 16:09:47 +02:00
|
|
|
assert_eq!(Api::Traces, "traces".parse().unwrap());
|
|
|
|
assert_eq!(Api::Rpc, "rpc".parse().unwrap());
|
2017-05-05 15:57:29 +02:00
|
|
|
assert_eq!(Api::SecretStore, "secretstore".parse().unwrap());
|
2017-07-14 20:40:28 +02:00
|
|
|
assert_eq!(Api::Whisper, "shh".parse().unwrap());
|
|
|
|
assert_eq!(Api::WhisperPubSub, "shh_pubsub".parse().unwrap());
|
2016-07-25 16:09:47 +02:00
|
|
|
assert!("rp".parse::<Api>().is_err());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_api_set_default() {
|
|
|
|
assert_eq!(ApiSet::UnsafeContext, ApiSet::default());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_api_set_parsing() {
|
|
|
|
assert_eq!(ApiSet::List(vec![Api::Web3, Api::Eth].into_iter().collect()), "web3,eth".parse().unwrap());
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_api_set_unsafe_context() {
|
2016-11-06 12:51:53 +01:00
|
|
|
let expected = vec![
|
|
|
|
// make sure this list contains only SAFE methods
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2016-11-06 12:51:53 +01:00
|
|
|
].into_iter().collect();
|
2016-07-25 16:09:47 +02:00
|
|
|
assert_eq!(ApiSet::UnsafeContext.list_apis(), expected);
|
|
|
|
}
|
|
|
|
|
2016-11-06 12:51:53 +01:00
|
|
|
#[test]
|
|
|
|
fn test_api_set_ipc_context() {
|
|
|
|
let expected = vec![
|
|
|
|
// safe
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2016-11-06 12:51:53 +01:00
|
|
|
// semi-safe
|
|
|
|
Api::ParityAccounts
|
|
|
|
].into_iter().collect();
|
|
|
|
assert_eq!(ApiSet::IpcContext.list_apis(), expected);
|
|
|
|
}
|
|
|
|
|
2016-07-25 16:09:47 +02:00
|
|
|
#[test]
|
|
|
|
fn test_api_set_safe_context() {
|
2016-11-06 12:51:53 +01:00
|
|
|
let expected = vec![
|
|
|
|
// safe
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2016-11-06 12:51:53 +01:00
|
|
|
// semi-safe
|
|
|
|
Api::ParityAccounts,
|
|
|
|
// Unsafe
|
|
|
|
Api::ParitySet, Api::Signer,
|
|
|
|
].into_iter().collect();
|
2016-07-25 16:09:47 +02:00
|
|
|
assert_eq!(ApiSet::SafeContext.list_apis(), expected);
|
|
|
|
}
|
2017-04-06 19:38:33 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_all_apis() {
|
|
|
|
assert_eq!("all".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2017-04-06 19:38:33 +02:00
|
|
|
Api::ParityAccounts,
|
|
|
|
Api::ParitySet, Api::Signer,
|
|
|
|
Api::Personal
|
|
|
|
].into_iter().collect()));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_all_without_personal_apis() {
|
|
|
|
assert_eq!("personal,all,-personal".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2017-04-06 19:38:33 +02:00
|
|
|
Api::ParityAccounts,
|
|
|
|
Api::ParitySet, Api::Signer,
|
|
|
|
].into_iter().collect()));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_safe_parsing() {
|
|
|
|
assert_eq!("safe".parse::<ApiSet>().unwrap(), ApiSet::List(vec![
|
2017-07-14 20:40:28 +02:00
|
|
|
Api::Web3, Api::Net, Api::Eth, Api::EthPubSub, Api::Parity, Api::ParityPubSub, Api::Traces, Api::Rpc, Api::SecretStore, Api::Whisper, Api::WhisperPubSub,
|
2017-04-06 19:38:33 +02:00
|
|
|
].into_iter().collect()));
|
|
|
|
}
|
2016-07-25 16:09:47 +02:00
|
|
|
}
|