1cd93e4ceb
* Implementation of Verifier, Scoring and Ready. * Queue in progress. * TransactionPool. * Prepare for txpool release. * Miner refactor [WiP] * WiP reworking miner. * Make it compile. * Add some docs. * Split blockchain access to a separate file. * Work on miner API. * Fix ethcore tests. * Refactor miner interface for sealing/work packages. * Implement next nonce. * RPC compiles. * Implement couple of missing methdods for RPC. * Add transaction queue listeners. * Compiles! * Clean-up and parallelize. * Get rid of RefCell in header. * Revert "Get rid of RefCell in header." This reverts commit 0f2424c9b7319a786e1565ea2a8a6d801a21b4fb. * Override Sync requirement. * Fix status display. * Unify logging. * Extract some cheap checks. * Measurements and optimizations. * Fix scoring bug, heap size of bug and add cache * Disable tx queueing and parallel verification. * Make ethcore and ethcore-miner compile again. * Make RPC compile again. * Bunch of txpool tests. * Migrate transaction queue tests. * Nonce Cap * Nonce cap cache and tests. * Remove stale future transactions from the queue. * Optimize scoring and write some tests. * Simple penalization. * Clean up and support for different scoring algorithms. * Add CLI parameters for the new queue. * Remove banning queue. * Disable debug build. * Change per_sender limit to be 1% instead of 5% * Avoid cloning when propagating transactions. * Remove old todo. * Post-review fixes. * Fix miner options default. * Implement back ready transactions for light client. * Get rid of from_pending_block * Pass rejection reason. * Add more details to drop. * Rollback heap size of. * Avoid cloning hashes when propagating and include more details on rejection. * Fix tests. * Introduce nonces cache. * Remove uneccessary hashes allocation. * Lower the mem limit. * Re-enable parallel verification. * Add miner log. Don't check the type if not below min_gas_price. * Add more traces, fix disabling miner. * Fix creating pending blocks twice on AuRa authorities. * Fix tests. * re-use pending blocks in AuRa * Use reseal_min_period to prevent too frequent update_sealing. * Fix log to contain hash not sender. * Optimize local transactions. * Fix aura tests. * Update locks comments. * Get rid of unsafe Sync impl. * Review fixes. * Remove excessive matches. * Fix compilation errors. * Use new pool in private transactions. * Fix private-tx test. * Fix secret store tests. * Actually use gas_floor_target * Fix config tests. * Fix pool tests. * Address grumbles.
214 lines
6.0 KiB
Rust
214 lines
6.0 KiB
Rust
// Copyright 2015-2017 Parity Technologies (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/>.
|
|
|
|
/// Parity-specific rpc interface for operations altering the settings.
|
|
use std::io;
|
|
use std::sync::Arc;
|
|
|
|
use ethcore::client::BlockChainClient;
|
|
use ethcore::miner::MinerService;
|
|
use ethcore::mode::Mode;
|
|
use sync::ManageNetwork;
|
|
use fetch::{self, Fetch};
|
|
use futures_cpupool::CpuPool;
|
|
use hash::keccak_buffer;
|
|
use updater::{Service as UpdateService};
|
|
|
|
use jsonrpc_core::{BoxFuture, Result};
|
|
use jsonrpc_core::futures::Future;
|
|
use v1::helpers::dapps::DappsService;
|
|
use v1::helpers::errors;
|
|
use v1::traits::ParitySet;
|
|
use v1::types::{Bytes, H160, H256, U256, ReleaseInfo, Transaction, LocalDapp};
|
|
|
|
/// Parity-specific rpc interface for operations altering the settings.
|
|
pub struct ParitySetClient<C, M, U, F = fetch::Client> {
|
|
client: Arc<C>,
|
|
miner: Arc<M>,
|
|
updater: Arc<U>,
|
|
net: Arc<ManageNetwork>,
|
|
dapps: Option<Arc<DappsService>>,
|
|
fetch: F,
|
|
pool: CpuPool,
|
|
eip86_transition: u64,
|
|
}
|
|
|
|
impl<C, M, U, F> ParitySetClient<C, M, U, F>
|
|
where C: BlockChainClient + 'static,
|
|
{
|
|
/// Creates new `ParitySetClient` with given `Fetch`.
|
|
pub fn new(
|
|
client: &Arc<C>,
|
|
miner: &Arc<M>,
|
|
updater: &Arc<U>,
|
|
net: &Arc<ManageNetwork>,
|
|
dapps: Option<Arc<DappsService>>,
|
|
fetch: F,
|
|
pool: CpuPool,
|
|
) -> Self {
|
|
ParitySetClient {
|
|
client: client.clone(),
|
|
miner: miner.clone(),
|
|
updater: updater.clone(),
|
|
net: net.clone(),
|
|
dapps: dapps,
|
|
fetch: fetch,
|
|
pool: pool,
|
|
eip86_transition: client.eip86_transition(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<C, M, U, F> ParitySet for ParitySetClient<C, M, U, F> where
|
|
C: BlockChainClient + 'static,
|
|
M: MinerService + 'static,
|
|
U: UpdateService + 'static,
|
|
F: Fetch + 'static,
|
|
{
|
|
|
|
fn set_min_gas_price(&self, _gas_price: U256) -> Result<bool> {
|
|
warn!("setMinGasPrice is deprecated. Ignoring request.");
|
|
Ok(false)
|
|
}
|
|
|
|
fn set_transactions_limit(&self, _limit: usize) -> Result<bool> {
|
|
warn!("setTransactionsLimit is deprecated. Ignoring request.");
|
|
Ok(false)
|
|
}
|
|
|
|
fn set_tx_gas_limit(&self, _limit: U256) -> Result<bool> {
|
|
warn!("setTxGasLimit is deprecated. Ignoring request.");
|
|
Ok(false)
|
|
}
|
|
|
|
fn set_gas_floor_target(&self, target: U256) -> Result<bool> {
|
|
let mut range = self.miner.authoring_params().gas_range_target.clone();
|
|
range.0 = target.into();
|
|
self.miner.set_gas_range_target(range);
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_gas_ceil_target(&self, target: U256) -> Result<bool> {
|
|
let mut range = self.miner.authoring_params().gas_range_target.clone();
|
|
range.1 = target.into();
|
|
self.miner.set_gas_range_target(range);
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_extra_data(&self, extra_data: Bytes) -> Result<bool> {
|
|
self.miner.set_extra_data(extra_data.into_vec());
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_author(&self, address: H160) -> Result<bool> {
|
|
self.miner.set_author(address.into(), None).map_err(Into::into).map_err(errors::password)?;
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_engine_signer(&self, address: H160, password: String) -> Result<bool> {
|
|
self.miner.set_author(address.into(), Some(password)).map_err(Into::into).map_err(errors::password)?;
|
|
Ok(true)
|
|
}
|
|
|
|
fn add_reserved_peer(&self, peer: String) -> Result<bool> {
|
|
match self.net.add_reserved_peer(peer) {
|
|
Ok(()) => Ok(true),
|
|
Err(e) => Err(errors::invalid_params("Peer address", e)),
|
|
}
|
|
}
|
|
|
|
fn remove_reserved_peer(&self, peer: String) -> Result<bool> {
|
|
match self.net.remove_reserved_peer(peer) {
|
|
Ok(()) => Ok(true),
|
|
Err(e) => Err(errors::invalid_params("Peer address", e)),
|
|
}
|
|
}
|
|
|
|
fn drop_non_reserved_peers(&self) -> Result<bool> {
|
|
self.net.deny_unreserved_peers();
|
|
Ok(true)
|
|
}
|
|
|
|
fn accept_non_reserved_peers(&self) -> Result<bool> {
|
|
self.net.accept_unreserved_peers();
|
|
Ok(true)
|
|
}
|
|
|
|
fn start_network(&self) -> Result<bool> {
|
|
self.net.start_network();
|
|
Ok(true)
|
|
}
|
|
|
|
fn stop_network(&self) -> Result<bool> {
|
|
self.net.stop_network();
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_mode(&self, mode: String) -> Result<bool> {
|
|
self.client.set_mode(match mode.as_str() {
|
|
"offline" => Mode::Off,
|
|
"dark" => Mode::Dark(300),
|
|
"passive" => Mode::Passive(300, 3600),
|
|
"active" => Mode::Active,
|
|
e => { return Err(errors::invalid_params("mode", e.to_owned())); },
|
|
});
|
|
Ok(true)
|
|
}
|
|
|
|
fn set_spec_name(&self, spec_name: String) -> Result<bool> {
|
|
self.client.set_spec_name(spec_name);
|
|
Ok(true)
|
|
}
|
|
|
|
fn hash_content(&self, url: String) -> BoxFuture<H256> {
|
|
let future = self.fetch.get(&url, Default::default()).then(move |result| {
|
|
result
|
|
.map_err(errors::fetch)
|
|
.and_then(move |response| {
|
|
let mut reader = io::BufReader::new(fetch::BodyReader::new(response));
|
|
keccak_buffer(&mut reader).map_err(errors::fetch)
|
|
})
|
|
.map(Into::into)
|
|
});
|
|
Box::new(self.pool.spawn(future))
|
|
}
|
|
|
|
fn dapps_refresh(&self) -> Result<bool> {
|
|
self.dapps.as_ref().map(|dapps| dapps.refresh_local_dapps()).ok_or_else(errors::dapps_disabled)
|
|
}
|
|
|
|
fn dapps_list(&self) -> Result<Vec<LocalDapp>> {
|
|
self.dapps.as_ref().map(|dapps| dapps.list_dapps()).ok_or_else(errors::dapps_disabled)
|
|
}
|
|
|
|
fn upgrade_ready(&self) -> Result<Option<ReleaseInfo>> {
|
|
Ok(self.updater.upgrade_ready().map(Into::into))
|
|
}
|
|
|
|
fn execute_upgrade(&self) -> Result<bool> {
|
|
Ok(self.updater.execute_upgrade())
|
|
}
|
|
|
|
fn remove_transaction(&self, hash: H256) -> Result<Option<Transaction>> {
|
|
let block_number = self.client.chain_info().best_block_number;
|
|
let hash = hash.into();
|
|
|
|
Ok(self.miner.remove_transaction(&hash)
|
|
.map(|t| Transaction::from_pending(t.pending().clone(), block_number + 1, self.eip86_transition))
|
|
)
|
|
}
|
|
}
|