* 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
125 lines
3.8 KiB
Rust
125 lines
3.8 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/>.
|
|
|
|
//! Transactions Confirmations rpc implementation
|
|
|
|
use std::sync::{Arc, Weak};
|
|
use jsonrpc_core::*;
|
|
use ethcore::account_provider::AccountProvider;
|
|
use ethcore::client::MiningBlockChainClient;
|
|
use ethcore::miner::MinerService;
|
|
use v1::traits::Signer;
|
|
use v1::types::{TransactionModification, ConfirmationRequest, U256};
|
|
use v1::helpers::{errors, SignerService, SigningQueue, ConfirmationPayload};
|
|
use v1::helpers::dispatch::{sign_and_dispatch, sign, decrypt};
|
|
|
|
/// Transactions confirmation (personal) rpc implementation.
|
|
pub struct SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
signer: Weak<SignerService>,
|
|
accounts: Weak<AccountProvider>,
|
|
client: Weak<C>,
|
|
miner: Weak<M>,
|
|
}
|
|
|
|
impl<C: 'static, M: 'static> SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
|
|
/// Create new instance of signer client.
|
|
pub fn new(
|
|
store: &Arc<AccountProvider>,
|
|
client: &Arc<C>,
|
|
miner: &Arc<M>,
|
|
signer: &Arc<SignerService>,
|
|
) -> Self {
|
|
SignerClient {
|
|
signer: Arc::downgrade(signer),
|
|
accounts: Arc::downgrade(store),
|
|
client: Arc::downgrade(client),
|
|
miner: Arc::downgrade(miner),
|
|
}
|
|
}
|
|
|
|
fn active(&self) -> Result<(), Error> {
|
|
// TODO: only call every 30s at most.
|
|
take_weak!(self.client).keep_alive();
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockChainClient, M: MinerService {
|
|
|
|
fn requests_to_confirm(&self) -> Result<Vec<ConfirmationRequest>, Error> {
|
|
try!(self.active());
|
|
let signer = take_weak!(self.signer);
|
|
|
|
Ok(signer.requests()
|
|
.into_iter()
|
|
.map(Into::into)
|
|
.collect()
|
|
)
|
|
}
|
|
|
|
// TODO [ToDr] TransactionModification is redundant for some calls
|
|
// might be better to replace it in future
|
|
fn confirm_request(&self, id: U256, modification: TransactionModification, pass: String) -> Result<Value, Error> {
|
|
try!(self.active());
|
|
|
|
let id = id.into();
|
|
let accounts = take_weak!(self.accounts);
|
|
let signer = take_weak!(self.signer);
|
|
let client = take_weak!(self.client);
|
|
let miner = take_weak!(self.miner);
|
|
|
|
signer.peek(&id).map(|confirmation| {
|
|
let result = match confirmation.payload {
|
|
ConfirmationPayload::Transaction(mut request) => {
|
|
// apply modification
|
|
if let Some(gas_price) = modification.gas_price {
|
|
request.gas_price = gas_price.into();
|
|
}
|
|
sign_and_dispatch(&*client, &*miner, &*accounts, request.into(), Some(pass)).map(to_value)
|
|
},
|
|
ConfirmationPayload::Sign(address, hash) => {
|
|
sign(&*accounts, address, Some(pass), hash)
|
|
},
|
|
ConfirmationPayload::Decrypt(address, msg) => {
|
|
decrypt(&*accounts, address, Some(pass), msg)
|
|
},
|
|
};
|
|
if let Ok(ref response) = result {
|
|
signer.request_confirmed(id, Ok(response.clone()));
|
|
}
|
|
result
|
|
}).unwrap_or_else(|| Err(errors::invalid_params("Unknown RequestID", id)))
|
|
}
|
|
|
|
fn reject_request(&self, id: U256) -> Result<bool, Error> {
|
|
try!(self.active());
|
|
let signer = take_weak!(self.signer);
|
|
|
|
let res = signer.request_rejected(id.into());
|
|
Ok(res.is_some())
|
|
}
|
|
|
|
fn generate_token(&self) -> Result<String, Error> {
|
|
try!(self.active());
|
|
let signer = take_weak!(self.signer);
|
|
|
|
signer.generate_token()
|
|
.map_err(|e| errors::token(e))
|
|
}
|
|
}
|
|
|