* Use ethcore_dappsPort when constructing URLs (#3139) * Upon connect, retrieve the available api ports * Update dapps to load from dappsPort * Update dapps summary with dappsPort * Allow proxy to use dappsPort * Replace /api/ping with HEAD / * Dynamic port for available apps * Retrieve content images with dappsPort * Fix / * Transfer token dropdown image fix * IdentityIcon loads images via contentHash * Update apps fetch to cater for dev & prod * DRY up 127.0.0.1:${dappsPort} with ${dappsUrl} * Cleaning up polluted namespaces (#3143) * Renaming ethcore_ to parity_ * Renaming files * Renaming poluted EthSigning * Tidy up the namespaces * Renaming files to match new structure * Splitting EthSigning into separate traits * jsapi move ethcore.* -> parity.* * Move jsonrpc parity definitions * Update UI API calls for parity interfaces * Move jsapi signer interfaces from personal to signer * Update UI to use signer.* where applicable * Updsate jsapi subscriptions for signer * Fix dodgy merge. * Update README. * Fix some tests. * Move parity-only personal.* to parity.* * Update UI for personal -> parity API moves * Update subscription APIs after personal -> parity move * personal. generateAuthorizationToken -> parity. generateAuthorizationToken (UI) * enode, dappsPort & signerPort (UI) * Update subscription tests (accountsInfo) * subscription update * personal -> parity * Additional error logging on method failures * move postTransaction to parity * Additional debug info with method failures * Fix personal tests. * Console wrning shows parameters, error object does not * Include parity_ signing methods. * Console log http transport info * Fix failing tests * Add RPC stubs for parity_accounts. * Allow some secure built-in dapps * Use parity_accounts in place of accountsInfo * Improve error reporting * Cleanup GHH error handling Former-commit-id: 5a094ccb9f0596d0e07abc23504b80dc099ad584
166 lines
5.4 KiB
Rust
166 lines
5.4 KiB
Rust
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
|
// This file is part of Parity.
|
|
|
|
// Parity is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! Account management (personal) rpc implementation
|
|
use std::sync::{Arc, Weak};
|
|
use std::collections::BTreeMap;
|
|
use util::{Address};
|
|
|
|
use ethkey::{Brain, Generator};
|
|
use ethcore::account_provider::AccountProvider;
|
|
use ethcore::client::MiningBlockChainClient;
|
|
|
|
use jsonrpc_core::{Value, Error, to_value};
|
|
use v1::traits::ParityAccounts;
|
|
use v1::types::{H160 as RpcH160, H256 as RpcH256};
|
|
use v1::helpers::errors;
|
|
|
|
/// Account management (personal) rpc implementation.
|
|
pub struct ParityAccountsClient<C> where C: MiningBlockChainClient {
|
|
accounts: Weak<AccountProvider>,
|
|
client: Weak<C>,
|
|
}
|
|
|
|
impl<C> ParityAccountsClient<C> where C: MiningBlockChainClient {
|
|
/// Creates new PersonalClient
|
|
pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>) -> Self {
|
|
ParityAccountsClient {
|
|
accounts: Arc::downgrade(store),
|
|
client: Arc::downgrade(client),
|
|
}
|
|
}
|
|
|
|
fn active(&self) -> Result<(), Error> {
|
|
// TODO: only call every 30s at most.
|
|
take_weak!(self.client).keep_alive();
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl<C: 'static> ParityAccounts for ParityAccountsClient<C> where C: MiningBlockChainClient {
|
|
fn accounts_info(&self) -> Result<BTreeMap<String, Value>, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
let info = try!(store.accounts_info().map_err(|e| errors::account("Could not fetch account info.", e)));
|
|
let other = store.addresses_info().expect("addresses_info always returns Ok; qed");
|
|
|
|
Ok(info.into_iter().chain(other.into_iter()).map(|(a, v)| {
|
|
let m = map![
|
|
"name".to_owned() => to_value(&v.name),
|
|
"meta".to_owned() => to_value(&v.meta),
|
|
"uuid".to_owned() => if let &Some(ref uuid) = &v.uuid {
|
|
to_value(uuid)
|
|
} else {
|
|
Value::Null
|
|
}
|
|
];
|
|
(format!("0x{}", a.hex()), Value::Object(m))
|
|
}).collect())
|
|
}
|
|
|
|
fn new_account_from_phrase(&self, phrase: String, pass: String) -> Result<RpcH160, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
|
|
store.insert_account(*Brain::new(phrase).generate().unwrap().secret(), &pass)
|
|
.map(Into::into)
|
|
.map_err(|e| errors::account("Could not create account.", e))
|
|
}
|
|
|
|
fn new_account_from_wallet(&self, json: String, pass: String) -> Result<RpcH160, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
|
|
store.import_presale(json.as_bytes(), &pass)
|
|
.or_else(|_| store.import_wallet(json.as_bytes(), &pass))
|
|
.map(Into::into)
|
|
.map_err(|e| errors::account("Could not create account.", e))
|
|
}
|
|
|
|
fn new_account_from_secret(&self, secret: RpcH256, pass: String) -> Result<RpcH160, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
|
|
store.insert_account(secret.into(), &pass)
|
|
.map(Into::into)
|
|
.map_err(|e| errors::account("Could not create account.", e))
|
|
}
|
|
|
|
fn test_password(&self, account: RpcH160, password: String) -> Result<bool, Error> {
|
|
try!(self.active());
|
|
let account: Address = account.into();
|
|
|
|
take_weak!(self.accounts)
|
|
.test_password(&account, password)
|
|
.map_err(|e| errors::account("Could not fetch account info.", e))
|
|
}
|
|
|
|
fn change_password(&self, account: RpcH160, password: String, new_password: String) -> Result<bool, Error> {
|
|
try!(self.active());
|
|
let account: Address = account.into();
|
|
take_weak!(self.accounts)
|
|
.change_password(&account, password, new_password)
|
|
.map(|_| true)
|
|
.map_err(|e| errors::account("Could not fetch account info.", e))
|
|
}
|
|
|
|
fn set_account_name(&self, addr: RpcH160, name: String) -> Result<bool, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
let addr: Address = addr.into();
|
|
|
|
store.set_account_name(addr.clone(), name.clone())
|
|
.or_else(|_| store.set_address_name(addr, name))
|
|
.expect("set_address_name always returns Ok; qed");
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_account_meta(&self, addr: RpcH160, meta: String) -> Result<bool, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
let addr: Address = addr.into();
|
|
|
|
store.set_account_meta(addr.clone(), meta.clone())
|
|
.or_else(|_| store.set_address_meta(addr, meta))
|
|
.expect("set_address_meta always returns Ok; qed");
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_account_visibility(&self, _address: RpcH160, _dapp: RpcH256, _visible: bool) -> Result<bool, Error> {
|
|
Ok(false)
|
|
}
|
|
|
|
fn import_geth_accounts(&self, addresses: Vec<RpcH160>) -> Result<Vec<RpcH160>, Error> {
|
|
let store = take_weak!(self.accounts);
|
|
|
|
store
|
|
.import_geth_accounts(addresses.into_iter().map(Into::into).collect(), false)
|
|
.map(|imported| imported.into_iter().map(Into::into).collect())
|
|
.map_err(|e| errors::account("Couldn't import Geth accounts", e))
|
|
}
|
|
|
|
fn geth_accounts(&self) -> Result<Vec<RpcH160>, Error> {
|
|
try!(self.active());
|
|
let store = take_weak!(self.accounts);
|
|
|
|
Ok(store.list_geth_accounts(false)
|
|
.into_iter()
|
|
.map(Into::into)
|
|
.collect()
|
|
)
|
|
}
|
|
}
|