6b074e8fb2
* bump rust-crypto * initial version of account provider utilizing secret store * update lazy_static to latest version * AccountProvider accounts method * new AccountProvider tests in progress * basic tests for new AccountProvider * ethcore compiles with new account provider and secret store * ethcore-rpc build now compiling with new AccountProvider * most rpc tests passing with new accounts_provider * fixed basic_authority tests * fixed eth_transaction_count rpc test * fixed mocked/eth.rs tests * fixed personal tests * fixed personal signer rpc tests * removed warnings * parity compiling fine with new sstore * fixed import direction * do not unlock temporarily when we have the password * removed TODO in account import * display warning on auto account import failure * fixed compiling of ethstore on windows * ethstore as a part of parity repo * added ethkey
97 lines
3.1 KiB
Rust
97 lines
3.1 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 jsonrpc_core::*;
|
|
use v1::traits::Personal;
|
|
use v1::types::TransactionRequest;
|
|
use v1::impls::unlock_sign_and_dispatch;
|
|
use ethcore::account_provider::AccountProvider;
|
|
use util::numbers::*;
|
|
use ethcore::client::MiningBlockChainClient;
|
|
use ethcore::miner::MinerService;
|
|
|
|
/// Account management (personal) rpc implementation.
|
|
pub struct PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
accounts: Weak<AccountProvider>,
|
|
client: Weak<C>,
|
|
miner: Weak<M>,
|
|
signer_port: Option<u16>,
|
|
}
|
|
|
|
impl<C, M> PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
/// Creates new PersonalClient
|
|
pub fn new(store: &Arc<AccountProvider>, client: &Arc<C>, miner: &Arc<M>, signer_port: Option<u16>) -> Self {
|
|
PersonalClient {
|
|
accounts: Arc::downgrade(store),
|
|
client: Arc::downgrade(client),
|
|
miner: Arc::downgrade(miner),
|
|
signer_port: signer_port,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<C: 'static, M: 'static> Personal for PersonalClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
|
|
fn signer_enabled(&self, _: Params) -> Result<Value, Error> {
|
|
self.signer_port
|
|
.map(|v| to_value(&v))
|
|
.unwrap_or_else(|| to_value(&false))
|
|
}
|
|
|
|
fn accounts(&self, _: Params) -> Result<Value, Error> {
|
|
let store = take_weak!(self.accounts);
|
|
to_value(&store.accounts())
|
|
}
|
|
|
|
fn new_account(&self, params: Params) -> Result<Value, Error> {
|
|
from_params::<(String, )>(params).and_then(
|
|
|(pass, )| {
|
|
let store = take_weak!(self.accounts);
|
|
match store.new_account(&pass) {
|
|
Ok(address) => to_value(&address),
|
|
Err(_) => Err(Error::internal_error())
|
|
}
|
|
}
|
|
)
|
|
}
|
|
|
|
fn unlock_account(&self, params: Params) -> Result<Value, Error> {
|
|
from_params::<(Address, String, u64)>(params).and_then(
|
|
|(account, account_pass, _)|{
|
|
let store = take_weak!(self.accounts);
|
|
match store.unlock_account_temporarily(account, account_pass) {
|
|
Ok(_) => Ok(Value::Bool(true)),
|
|
Err(_) => Ok(Value::Bool(false)),
|
|
}
|
|
})
|
|
}
|
|
|
|
fn sign_and_send_transaction(&self, params: Params) -> Result<Value, Error> {
|
|
from_params::<(TransactionRequest, String)>(params)
|
|
.and_then(|(request, password)| {
|
|
let sender = request.from;
|
|
let accounts = take_weak!(self.accounts);
|
|
|
|
match unlock_sign_and_dispatch(&*take_weak!(self.client), &*take_weak!(self.miner), request, &*accounts, sender, password) {
|
|
Ok(hash) => to_value(&hash),
|
|
_ => to_value(&H256::zero()),
|
|
}
|
|
})
|
|
}
|
|
}
|