Upstream merges

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,14 @@
 _Before filing a new issue, please **provide the following information**._
 
+_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
+_You can find mode info on the reporting process in [SECURITY.md](https://github.com/paritytech/parity-ethereum/blob/master/SECURITY.md)_
+
+
 - **Parity Ethereum version**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes
-- **Network**: ethereum / ropsten / kovan / ...
+- **Network**: ethereum / ropsten / goerli / ...
 - **Restarted**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._

.gitlab-ci.yml

@@ -33,7 +33,7 @@ variables:
 
 .docker-cache-status:              &docker-cache-status
   variables:
-    CARGO_HOME:                    "/cargo/${CI_JOB_NAME}"
+    CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
   before_script:
     - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server
     - sccache -s
@@ -97,23 +97,24 @@ test-linux:
 
 build-android:
   stage:                           build
-  image:                           parity/rust-android:gitlab-ci
+  image:                           parity/rust-parity-ethereum-android-build:stretch
   variables:
     CARGO_TARGET:                  armv7-linux-androideabi
+  <<:                              *docker-cache-status
+  <<:                              *collect_artifacts
   script:
     - scripts/gitlab/build-linux.sh
   tags:
     - linux-docker
-  <<:                              *collect_artifacts
 
 build-linux:                       &build-linux
   stage:                           build
   only:                            *releaseable_branches
   <<:                              *docker-cache-status
+  <<:                              *collect_artifacts
   script:
     - scripts/gitlab/build-linux.sh
     - sccache -s
-  <<:                              *collect_artifacts
 
 build-linux-i386:
   <<:                              *build-linux
@@ -136,6 +137,7 @@ build-linux-armhf:
 build-darwin:
   stage:                           build
   only:                            *releaseable_branches
+  <<:                              *collect_artifacts
   variables:
     CARGO_TARGET:                  x86_64-apple-darwin
     CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
@@ -145,19 +147,19 @@ build-darwin:
     - scripts/gitlab/build-linux.sh
   tags:
     - rust-osx
-  <<:                              *collect_artifacts
 
 build-windows:
   stage:                           build
+  <<:                              *collect_artifacts
   only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
-    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+    CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
+    GIT_SUBMODULE_STRATEGY:        none
   script:
     - sh scripts/gitlab/build-windows.sh
   tags:
     - rust-windows
-  <<:                              *collect_artifacts
 
 publish-docker:
   stage:                           publish
@@ -173,6 +175,7 @@ publish-docker:
 publish-snap:                      &publish-snap
   stage:                           publish
   only:                            *releaseable_branches
+  <<:                              *collect_artifacts
   image:                           snapcore/snapcraft
   variables:
     BUILD_ARCH:                    amd64
@@ -183,7 +186,6 @@ publish-snap:                      &publish-snap
     - linux-docker
   script:
     - scripts/gitlab/publish-snap.sh
-  <<:                              *collect_artifacts
 
 publish-snap-i386:
   <<:                              *publish-snap
@@ -247,6 +249,7 @@ publish-awss3-release:
 
 publish-docs:
   stage:                            publish
+  image:                            parity/rust-parity-ethereum-docs:xenial
   only:
     - tags
   except:
@@ -256,4 +259,3 @@ publish-docs:
     - scripts/gitlab/publish-docs.sh
   tags:
     - linux-docker
-

Cargo.toml

@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.5.0"
+version = "2.6.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

ethcore/Cargo.toml

@@ -39,7 +39,7 @@ keccak-hasher = { path = "../util/keccak-hasher" }
 kvdb = "0.1"
 kvdb-memorydb = "0.1"
 kvdb-rocksdb = { version = "0.1.3", optional = true }
-lazy_static = "1.0"
+lazy_static = "1.2.0"
 len-caching-lock = { path = "../util/len-caching-lock" }
 log = "0.4"
 lru-cache = "0.1"

ethcore/light/src/client/mod.rs

@@ -34,6 +34,7 @@ use common_types::blockchain_info::BlockChainInfo;
 use common_types::encoded;
 use common_types::header::Header;
 use common_types::ids::BlockId;
+use common_types::verification_queue_info::VerificationQueueInfo as BlockQueueInfo;
 
 use kvdb::KeyValueDB;
 
@@ -91,6 +92,9 @@ pub trait LightChainClient: Send + Sync {
 	/// Attempt to get a block hash by block id.
 	fn block_hash(&self, id: BlockId) -> Option<H256>;
 
+	/// Get block queue information.
+	fn queue_info(&self) -> BlockQueueInfo;
+
 	/// Attempt to get block header by block id.
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
 
@@ -125,9 +129,6 @@ pub trait LightChainClient: Send + Sync {
 	/// Flush the queue.
 	fn flush_queue(&self);
 
-	/// Get queue info.
-	fn queue_info(&self) -> queue::QueueInfo;
-
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;
 
@@ -534,13 +535,18 @@ impl<T: ChainDataFetcher> Client<T> {
 	}
 }
 
+
 impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 	fn add_listener(&self, listener: Weak<LightChainNotify>) {
 		Client::add_listener(self, listener)
 	}
 
 	fn chain_info(&self) -> BlockChainInfo { Client::chain_info(self) }
 
+	fn queue_info(&self) -> queue::QueueInfo {
+		self.queue.queue_info()
+	}
+
 	fn queue_header(&self, header: Header) -> EthcoreResult<H256> {
 		self.import_header(header)
 	}
@@ -600,10 +606,6 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::flush_queue(self);
 	}
 
-	fn queue_info(&self) -> queue::QueueInfo {
-		self.queue.queue_info()
-	}
-
 	fn cht_root(&self, i: usize) -> Option<H256> {
 		Client::cht_root(self, i)
 	}

ethcore/light/src/on_demand/mod.rs

@@ -94,6 +94,24 @@ pub mod error {
 	}
 }
 
+/// Public interface for performing network requests `OnDemand`
+pub trait OnDemandRequester: Send + Sync {
+	/// Submit a strongly-typed batch of requests.
+	///
+	/// Fails if back-reference are not coherent.
+	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
+	where
+		T: request::RequestAdapter;
+
+	/// Submit a vector of requests to be processed together.
+	///
+	/// Fails if back-references are not coherent.
+	/// The returned vector of responses will correspond to the requests exactly.
+	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
+		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>;
+}
+
+
 // relevant peer info.
 #[derive(Debug, Clone, PartialEq, Eq)]
 struct Peer {
@@ -355,71 +373,8 @@ pub struct OnDemand {
 	request_number_of_consecutive_errors: usize
 }
 
-impl OnDemand {
-
-	/// Create a new `OnDemand` service with the given cache.
-	pub fn new(
-		cache: Arc<Mutex<Cache>>,
-		response_time_window: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-
-		Self {
-			pending: RwLock::new(Vec::new()),
-			peers: RwLock::new(HashMap::new()),
-			in_transit: RwLock::new(HashMap::new()),
-			cache,
-			no_immediate_dispatch: false,
-			response_time_window: Self::sanitize_circuit_breaker_input(response_time_window, "Response time window"),
-			request_backoff_start: Self::sanitize_circuit_breaker_input(request_backoff_start, "Request initial backoff time window"),
-			request_backoff_max: Self::sanitize_circuit_breaker_input(request_backoff_max, "Request maximum backoff time window"),
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		}
-	}
-
-	fn sanitize_circuit_breaker_input(dur: Duration, name: &'static str) -> Duration {
-		if dur.as_secs() < 1 {
-			warn!(target: "on_demand",
-				"{} is too short must be at least 1 second, configuring it to 1 second", name);
-			Duration::from_secs(1)
-		} else {
-			dur
-		}
-	}
-
-	// make a test version: this doesn't dispatch pending requests
-	// until you trigger it manually.
-	#[cfg(test)]
-	fn new_test(
-		cache: Arc<Mutex<Cache>>,
-		request_ttl: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-		let mut me = OnDemand::new(
-			cache,
-			request_ttl,
-			request_backoff_start,
-			request_backoff_max,
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		);
-		me.no_immediate_dispatch = true;
-
-		me
-	}
-
-	/// Submit a vector of requests to be processed together.
-	///
-	/// Fails if back-references are not coherent.
-	/// The returned vector of responses will correspond to the requests exactly.
-	pub fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
+impl OnDemandRequester for OnDemand {
+	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
 		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>
 	{
 		let (sender, receiver) = oneshot::channel();
@@ -475,10 +430,7 @@ impl OnDemand {
 		Ok(receiver)
 	}
 
-	/// Submit a strongly-typed batch of requests.
-	///
-	/// Fails if back-reference are not coherent.
-	pub fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
+	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
 		where T: request::RequestAdapter
 	{
 		self.request_raw(ctx, requests.make_requests()).map(|recv| OnResponses {
@@ -487,6 +439,69 @@ impl OnDemand {
 		})
 	}
 
+}
+
+impl OnDemand {
+
+	/// Create a new `OnDemand` service with the given cache.
+	pub fn new(
+		cache: Arc<Mutex<Cache>>,
+		response_time_window: Duration,
+		request_backoff_start: Duration,
+		request_backoff_max: Duration,
+		request_backoff_rounds_max: usize,
+		request_number_of_consecutive_errors: usize,
+	) -> Self {
+
+		Self {
+			pending: RwLock::new(Vec::new()),
+			peers: RwLock::new(HashMap::new()),
+			in_transit: RwLock::new(HashMap::new()),
+			cache,
+			no_immediate_dispatch: false,
+			response_time_window: Self::sanitize_circuit_breaker_input(response_time_window, "Response time window"),
+			request_backoff_start: Self::sanitize_circuit_breaker_input(request_backoff_start, "Request initial backoff time window"),
+			request_backoff_max: Self::sanitize_circuit_breaker_input(request_backoff_max, "Request maximum backoff time window"),
+			request_backoff_rounds_max,
+			request_number_of_consecutive_errors,
+		}
+	}
+
+	fn sanitize_circuit_breaker_input(dur: Duration, name: &'static str) -> Duration {
+		if dur.as_secs() < 1 {
+			warn!(target: "on_demand",
+				"{} is too short must be at least 1 second, configuring it to 1 second", name);
+			Duration::from_secs(1)
+		} else {
+			dur
+		}
+	}
+
+	// make a test version: this doesn't dispatch pending requests
+	// until you trigger it manually.
+	#[cfg(test)]
+	fn new_test(
+		cache: Arc<Mutex<Cache>>,
+		request_ttl: Duration,
+		request_backoff_start: Duration,
+		request_backoff_max: Duration,
+		request_backoff_rounds_max: usize,
+		request_number_of_consecutive_errors: usize,
+	) -> Self {
+		let mut me = OnDemand::new(
+			cache,
+			request_ttl,
+			request_backoff_start,
+			request_backoff_max,
+			request_backoff_rounds_max,
+			request_number_of_consecutive_errors,
+		);
+		me.no_immediate_dispatch = true;
+
+		me
+	}
+
+
 	// maybe dispatch pending requests.
 	// sometimes
 	fn attempt_dispatch(&self, ctx: &BasicContext) {

ethcore/light/src/on_demand/tests.rs

@@ -29,7 +29,7 @@ use std::sync::Arc;
 use std::time::{Duration, Instant};
 use std::thread;
 
-use super::{request, OnDemand, Peer, HeaderRef};
+use super::{request, OnDemand, OnDemandRequester, Peer, HeaderRef};
 
 // useful contexts to give the service.
 enum Context {