6654d02163
* Trace precompiled contracts when the transfer value is not zero (#8486) * Trace precompiled contracts when the transfer value is not zero * Add tests for precompiled CALL tracing * Use byzantium test machine for the new test * Add notes in comments on why we don't trace all precompileds * Use is_transferred instead of transferred * Return error if RLP size of transaction exceeds the limit (#8473) * Return error if RLP size of transaction exceeds the limit * Review comments fixed * RLP check moved to verifier, corresponding pool test added * Don't block sync when importing old blocks (#8530) * Alter IO queueing. * Don't require IoMessages to be Clone * Ancient blocks imported via IoChannel. * Get rid of private transactions io message. * Get rid of deadlock and fix disconnected handler. * Revert to old disconnect condition. * Fix tests. * Fix deadlock. * Refactoring `ethcore-sync` - Fixing warp-sync barrier (#8543) * Start dividing sync chain : first supplier method * WIP - updated chain sync supplier * Finish refactoring the Chain Sync Supplier * Create Chain Sync Requester * Add Propagator for Chain Sync * Add the Chain Sync Handler * Move tests from mod -> handler * Move tests to propagator * Refactor SyncRequester arguments * Refactoring peer fork header handler * Fix wrong highest block number in snapshot sync * Small refactor... * Address PR grumbles * Retry failed CI job * Fix tests * PR Grumbles * Handle socket address parsing errors (#8545) Unpack errors and check for io::ErrorKind::InvalidInput and return our own AddressParse error. Remove the foreign link to std::net::AddrParseError and add an `impl From` for that error. Test parsing properly. * Fix packet count when talking with PAR2 peers (#8555) * Support diferent packet counts in different protocol versions. * Fix light timeouts and eclipse protection. * Fix devp2p tests. * Fix whisper-cli compilation. * Fix compilation. * Fix ethcore-sync tests. * Revert "Fix light timeouts and eclipse protection." This reverts commit 06285ea8c1d9d184d809f64b5507aece633da6cc. * Increase timeouts. * Add whisper CLI to the pipelines (#8578) * Add whisper CLI to the pipelines * Address todo, ref #8579 * Rename `whisper-cli binary` to `whisper` (#8579) * rename whisper-cli binary to whisper * fix tests * Remove manually added text to the errors (#8595) These messages were confusing for the users especially the help message. * Fix account list double 0x display (#8596) * Remove unused self import * Fix account list double 0x display * Fix BlockReward contract "arithmetic operation overflow" (#8611) * Fix BlockReward contract "arithmetic operation overflow" * Add docs on how execute_as_system works * Fix typo * Rlp decode returns Result (#8527) rlp::decode returns Result Make a best effort to handle decoding errors gracefully throughout the code, using `expect` where the value is guaranteed to be valid (and in other places where it makes sense). * Remove expect (#8536) * Remove expect and propagate rlp::DecoderErrors as TrieErrors * Decoding headers can fail (#8570) * rlp::decode returns Result * Fix journaldb to handle rlp::decode Result * Fix ethcore to work with rlp::decode returning Result * Light client handles rlp::decode returning Result * Fix tests in rlp_derive * Fix tests * Cleanup * cleanup * Allow panic rather than breaking out of iterator * Let decoding failures when reading from disk blow up * syntax * Fix the trivial grumbles * Fix failing tests * Make Account::from_rlp return Result * Syntx, sigh * Temp-fix for decoding failures * Header::decode returns Result Handle new return type throughout the code base. * Do not continue reading from the DB when a value could not be read * Fix tests * Handle header decoding in light_sync * Handling header decoding errors * Let the DecodeError bubble up unchanged * Remove redundant error conversion * fix compiler warning (#8590) * Attempt to fix intermittent test failures (#8584) Occasionally should_return_correct_nonces_when_dropped_because_of_limit fails, possibly because of multiple threads competing to finish. See CI logs here for an example: https://gitlab.parity.io/parity/parity/-/jobs/86738 * block_header can fail so return Result (#8581) * block_header can fail so return Result * Restore previous return type based on feedback * Fix failing doc tests running on non-code * Block::decode() returns Result (#8586) * Gitlab test script fixes (#8573) * Exclude /docs from modified files. * Ensure all references in the working tree are available * Remove duplicated line from test script
189 lines
5.6 KiB
Rust
189 lines
5.6 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/>.
|
|
|
|
use network::{Error, NetworkConfiguration, NetworkProtocolHandler, NonReservedPeerMode};
|
|
use network::{NetworkContext, PeerId, ProtocolId, NetworkIoMessage};
|
|
use host::Host;
|
|
use io::*;
|
|
use parking_lot::RwLock;
|
|
use std::sync::Arc;
|
|
use ansi_term::Colour;
|
|
use connection_filter::ConnectionFilter;
|
|
|
|
struct HostHandler {
|
|
public_url: RwLock<Option<String>>
|
|
}
|
|
|
|
impl IoHandler<NetworkIoMessage> for HostHandler {
|
|
fn message(&self, _io: &IoContext<NetworkIoMessage>, message: &NetworkIoMessage) {
|
|
if let NetworkIoMessage::NetworkStarted(ref public_url) = *message {
|
|
let mut url = self.public_url.write();
|
|
if url.as_ref().map_or(true, |uref| uref != public_url) {
|
|
info!(target: "network", "Public node URL: {}", Colour::White.bold().paint(public_url.as_ref()));
|
|
}
|
|
*url = Some(public_url.to_owned());
|
|
}
|
|
}
|
|
}
|
|
|
|
/// IO Service with networking
|
|
/// `Message` defines a notification data type.
|
|
pub struct NetworkService {
|
|
io_service: IoService<NetworkIoMessage>,
|
|
host_info: String,
|
|
host: RwLock<Option<Arc<Host>>>,
|
|
host_handler: Arc<HostHandler>,
|
|
config: NetworkConfiguration,
|
|
filter: Option<Arc<ConnectionFilter>>,
|
|
}
|
|
|
|
impl NetworkService {
|
|
/// Starts IO event loop
|
|
pub fn new(config: NetworkConfiguration, filter: Option<Arc<ConnectionFilter>>) -> Result<NetworkService, Error> {
|
|
let host_handler = Arc::new(HostHandler { public_url: RwLock::new(None) });
|
|
let io_service = IoService::<NetworkIoMessage>::start()?;
|
|
|
|
Ok(NetworkService {
|
|
io_service: io_service,
|
|
host_info: config.client_version.clone(),
|
|
host: RwLock::new(None),
|
|
config: config,
|
|
host_handler: host_handler,
|
|
filter: filter,
|
|
})
|
|
}
|
|
|
|
/// Regiter a new protocol handler with the event loop.
|
|
pub fn register_protocol(
|
|
&self,
|
|
handler: Arc<NetworkProtocolHandler + Send + Sync>,
|
|
protocol: ProtocolId,
|
|
// version id + packet count
|
|
versions: &[(u8, u8)]
|
|
) -> Result<(), Error> {
|
|
self.io_service.send_message(NetworkIoMessage::AddHandler {
|
|
handler,
|
|
protocol,
|
|
versions: versions.to_vec(),
|
|
})?;
|
|
Ok(())
|
|
}
|
|
|
|
/// Returns host identifier string as advertised to other peers
|
|
pub fn host_info(&self) -> String {
|
|
self.host_info.clone()
|
|
}
|
|
|
|
/// Returns underlying io service.
|
|
pub fn io(&self) -> &IoService<NetworkIoMessage> {
|
|
&self.io_service
|
|
}
|
|
|
|
/// Returns network configuration.
|
|
pub fn config(&self) -> &NetworkConfiguration {
|
|
&self.config
|
|
}
|
|
|
|
/// Returns external url if available.
|
|
pub fn external_url(&self) -> Option<String> {
|
|
let host = self.host.read();
|
|
host.as_ref().and_then(|h| h.external_url())
|
|
}
|
|
|
|
/// Returns external url if available.
|
|
pub fn local_url(&self) -> Option<String> {
|
|
let host = self.host.read();
|
|
host.as_ref().map(|h| h.local_url())
|
|
}
|
|
|
|
/// Start network IO
|
|
pub fn start(&self) -> Result<(), Error> {
|
|
let mut host = self.host.write();
|
|
if host.is_none() {
|
|
let h = Arc::new(Host::new(self.config.clone(), self.filter.clone())?);
|
|
self.io_service.register_handler(h.clone())?;
|
|
*host = Some(h);
|
|
}
|
|
|
|
if self.host_handler.public_url.read().is_none() {
|
|
self.io_service.register_handler(self.host_handler.clone())?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Stop network IO
|
|
pub fn stop(&self) -> Result<(), Error> {
|
|
let mut host = self.host.write();
|
|
if let Some(ref host) = *host {
|
|
let io = IoContext::new(self.io_service.channel(), 0); //TODO: take token id from host
|
|
host.stop(&io)?;
|
|
}
|
|
*host = None;
|
|
Ok(())
|
|
}
|
|
|
|
/// Get a list of all connected peers by id.
|
|
pub fn connected_peers(&self) -> Vec<PeerId> {
|
|
self.host.read().as_ref().map(|h| h.connected_peers()).unwrap_or_else(Vec::new)
|
|
}
|
|
|
|
/// Try to add a reserved peer.
|
|
pub fn add_reserved_peer(&self, peer: &str) -> Result<(), Error> {
|
|
let host = self.host.read();
|
|
if let Some(ref host) = *host {
|
|
host.add_reserved_node(peer)
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Try to remove a reserved peer.
|
|
pub fn remove_reserved_peer(&self, peer: &str) -> Result<(), Error> {
|
|
let host = self.host.read();
|
|
if let Some(ref host) = *host {
|
|
host.remove_reserved_node(peer)
|
|
} else {
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
/// Set the non-reserved peer mode.
|
|
pub fn set_non_reserved_mode(&self, mode: NonReservedPeerMode) {
|
|
let host = self.host.read();
|
|
if let Some(ref host) = *host {
|
|
let io_ctxt = IoContext::new(self.io_service.channel(), 0);
|
|
host.set_non_reserved_mode(mode, &io_ctxt);
|
|
}
|
|
}
|
|
|
|
/// Executes action in the network context
|
|
pub fn with_context<F>(&self, protocol: ProtocolId, action: F) where F: FnOnce(&NetworkContext) {
|
|
let io = IoContext::new(self.io_service.channel(), 0);
|
|
let host = self.host.read();
|
|
if let Some(ref host) = host.as_ref() {
|
|
host.with_context(protocol, &io, action);
|
|
};
|
|
}
|
|
|
|
/// Evaluates function in the network context
|
|
pub fn with_context_eval<F, T>(&self, protocol: ProtocolId, action: F) -> Option<T> where F: FnOnce(&NetworkContext) -> T {
|
|
let io = IoContext::new(self.io_service.channel(), 0);
|
|
let host = self.host.read();
|
|
host.as_ref().map(|ref host| host.with_context_eval(protocol, &io, action))
|
|
}
|
|
}
|