From 4d2d100f216584972bf1470783bbda3a29ce5444 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 7 Apr 2020 20:39:50 +0200
Subject: [PATCH 1/4] service/src/lib: Enable authority discovery on sentry
 nodes

When run as a sentry node, the authority discovery module does not
publish any addresses to the dht, but still discovers validators and
sentry nodes of validators.
---
 service/src/lib.rs | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/service/src/lib.rs b/service/src/lib.rs
index c95613d91220..09abc1308aa9 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -383,7 +383,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(
 		service.spawn_task_handle(),
 	).map_err(|e| format!("Could not spawn network worker: {:?}", e))?;
 
-	if let Role::Authority { sentry_nodes } = &role {
+	if let Role::Authority { .. } = &role {
 		let availability_store = {
 			use std::path::PathBuf;
 
@@ -454,22 +454,41 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(
 
 		let babe = babe::start_babe(babe_config)?;
 		service.spawn_essential_task("babe", babe);
+	}
 
+	if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
 		if authority_discovery_enabled {
+			let sentries;
+			let authority_discovery_role;
+
+			match role {
+				Role::Authority { ref sentry_nodes } => {
+					sentries = sentry_nodes.clone();
+					authority_discovery_role = authority_discovery::Role::Authority (
+						service.keystore(),
+					);
+				}
+				Role::Sentry {..} => {
+					sentries = vec![];
+					authority_discovery_role = authority_discovery::Role::Sentry;
+				}
+				_ => unreachable!("Due to outer matches! constraint; qed.")
+			}
+
 			let network = service.network();
-			let network_event_stream = network.event_stream();
-			let dht_event_stream = network_event_stream.filter_map(|e| async move { match e {
+			let dht_event_stream = network.event_stream().filter_map(|e| async move { match e {
 				Event::Dht(e) => Some(e),
 				_ => None,
 			}}).boxed();
 			let authority_discovery = authority_discovery::AuthorityDiscovery::new(
 				service.client(),
 				network,
-				sentry_nodes.clone(),
-				service.keystore(),
+				sentries,
 				dht_event_stream,
+				authority_discovery_role,
 				service.prometheus_registry(),
 			);
+
 			service.spawn_task("authority-discovery", authority_discovery);
 		}
 	}

From ce445fa1befa3fad8626c7c2542d0cda1f032c6f Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 16 Apr 2020 20:34:50 +0200
Subject: [PATCH 2/4] bin/node/cli/src/service: Use expressions instead of
 statements

---
 service/src/lib.rs | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/service/src/lib.rs b/service/src/lib.rs
index fb505394285e..51e384f65d29 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -502,22 +502,19 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(
 
 	if matches!(role, Role::Authority{..} | Role::Sentry{..}) {
 		if authority_discovery_enabled {
-			let sentries;
-			let authority_discovery_role;
-
-			match role {
-				Role::Authority { ref sentry_nodes } => {
-					sentries = sentry_nodes.clone();
+			let (sentries, authority_discovery_role) = match role {
+				Role::Authority { ref sentry_nodes } => (
+					sentry_nodes.clone(),
 					authority_discovery_role = authority_discovery::Role::Authority (
 						service.keystore(),
-					);
-				}
-				Role::Sentry {..} => {
-					sentries = vec![];
-					authority_discovery_role = authority_discovery::Role::Sentry;
-				}
-				_ => unreachable!("Due to outer matches! constraint; qed.")
-			}
+					),
+				),
+				Role::Sentry {..} => (
+					vec![],
+					authority_discovery::Role::Sentry,
+				),
+				_ => unreachable!("Due to outer matches! constraint; qed."),
+			};
 
 			let network = service.network();
 			let network_event_stream = network.event_stream("authority-discovery");

From 32f5f381cdd096d6043e7701ce7c2539ac9e5906 Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 16 Apr 2020 20:39:55 +0200
Subject: [PATCH 3/4] Cargo.lock: Run `cargo update`

---
 Cargo.lock | 307 ++++++++++++++++++++++-------------------------------
 1 file changed, 129 insertions(+), 178 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 85406fd71241..8a03da06408a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1095,33 +1095,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "ethbloom"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e7abcddbdd5db30aeed4deb586adc4824e6c247e2f7238d1187f752893f096b"
-dependencies = [
- "crunchy",
- "fixed-hash",
- "impl-rlp",
- "impl-serde 0.3.0",
- "tiny-keccak 2.0.2",
-]
-
-[[package]]
-name = "ethereum-types"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "964c23cdee0ca07d5be2a628b46d5c11a2134ce554a8c16d8dbc2db647e4fd4d"
-dependencies = [
- "ethbloom",
- "fixed-hash",
- "impl-rlp",
- "impl-serde 0.3.0",
- "primitive-types",
- "uint",
-]
-
 [[package]]
 name = "exit-future"
 version = "0.2.0"
@@ -1254,7 +1227,7 @@ checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 [[package]]
 name = "fork-tree"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -1262,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1279,7 +1252,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "parity-scale-codec",
@@ -1298,7 +1271,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1311,7 +1284,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata"
 version = "11.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -1322,7 +1295,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "bitmask",
  "frame-metadata",
@@ -1346,7 +1319,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support-procedural-tools",
  "proc-macro2 1.0.10",
@@ -1357,7 +1330,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -1369,7 +1342,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -1379,7 +1352,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -1395,7 +1368,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -1988,15 +1961,6 @@ dependencies = [
  "parity-scale-codec",
 ]
 
-[[package]]
-name = "impl-rlp"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5"
-dependencies = [
- "rlp",
-]
-
 [[package]]
 name = "impl-serde"
 version = "0.2.3"
@@ -3286,7 +3250,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3304,7 +3268,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3321,7 +3285,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3342,7 +3306,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3357,7 +3321,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3373,7 +3337,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3388,7 +3352,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3402,7 +3366,7 @@ dependencies = [
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3418,7 +3382,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3436,7 +3400,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -3452,7 +3416,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3471,7 +3435,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3487,7 +3451,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3501,7 +3465,7 @@ dependencies = [
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3515,7 +3479,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3530,7 +3494,7 @@ dependencies = [
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3543,7 +3507,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3558,7 +3522,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3573,7 +3537,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3591,7 +3555,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3606,7 +3570,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3627,7 +3591,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -3638,7 +3602,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3652,7 +3616,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3669,7 +3633,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3682,7 +3646,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-core-client",
@@ -3700,7 +3664,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3713,7 +3677,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3727,7 +3691,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3742,7 +3706,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "enumflags2",
  "frame-support",
@@ -3756,9 +3720,9 @@ dependencies = [
 
 [[package]]
 name = "parity-db"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4174d70be686b0d7cdee964b2d723e1461e28390c8804f01efc907d81043be9"
+checksum = "288f7e4d049b6c9adeb8a69deaa9a4085ec601a1dbf36fe4fd1dd686f44b12cc"
 dependencies = [
  "blake2-rfc",
  "libc",
@@ -3856,11 +3820,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6e2583649a3ca84894d1d71da249abcfda54d5aca24733d72ca10d0f02361c"
 dependencies = [
  "cfg-if",
- "ethereum-types",
- "hashbrown",
  "impl-trait-for-tuples",
  "jemallocator",
- "lru",
  "parity-util-mem-derive",
  "parking_lot 0.10.2",
  "primitive-types",
@@ -4593,7 +4554,6 @@ checksum = "e5e4b9943a2da369aec5e96f7c10ebc74fcf434d39590d974b0a3460e6f67fbb"
 dependencies = [
  "fixed-hash",
  "impl-codec",
- "impl-rlp",
  "impl-serde 0.3.0",
  "uint",
 ]
@@ -5116,15 +5076,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cabe4fa914dec5870285fa7f71f602645da47c486e68486d2b4ceb4a343e90ac"
 
-[[package]]
-name = "rlp"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7d3f9bed94764eac15b8f14af59fac420c236adaff743b7bcc88e265cb4345"
-dependencies = [
- "rustc-hex",
-]
-
 [[package]]
 name = "rocksdb"
 version = "0.13.0"
@@ -5244,7 +5195,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "bytes 0.5.4",
  "derive_more 0.99.5",
@@ -5271,7 +5222,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -5287,7 +5238,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "impl-trait-for-tuples",
  "sc-chain-spec-derive",
@@ -5303,7 +5254,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -5314,7 +5265,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "ansi_term 0.12.1",
  "app_dirs",
@@ -5356,7 +5307,7 @@ dependencies = [
 [[package]]
 name = "sc-client"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5393,7 +5344,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "fnv",
@@ -5427,7 +5378,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "blake2-rfc",
  "hash-db",
@@ -5457,7 +5408,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "fork-tree",
@@ -5499,7 +5450,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -5512,7 +5463,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5533,7 +5484,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "log 0.4.8",
  "sc-client-api",
@@ -5547,7 +5498,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "lazy_static",
@@ -5574,7 +5525,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -5591,7 +5542,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5606,7 +5557,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "cranelift-codegen",
  "cranelift-wasm",
@@ -5627,7 +5578,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "assert_matches",
  "finality-grandpa",
@@ -5663,7 +5614,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "ansi_term 0.12.1",
  "futures 0.3.4",
@@ -5680,7 +5631,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "hex",
@@ -5695,7 +5646,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "bitflags",
  "bytes 0.5.4",
@@ -5747,7 +5698,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "futures-timer 3.0.2",
@@ -5763,7 +5714,7 @@ dependencies = [
 [[package]]
 name = "sc-network-test"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "env_logger 0.7.1",
  "futures 0.3.4",
@@ -5789,7 +5740,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "bytes 0.5.4",
  "fnv",
@@ -5816,7 +5767,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "libp2p",
@@ -5829,7 +5780,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -5862,7 +5813,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -5886,7 +5837,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "jsonrpc-core",
  "jsonrpc-http-server",
@@ -5901,7 +5852,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "exit-future",
@@ -5952,7 +5903,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "log 0.4.8",
  "parity-scale-codec",
@@ -5966,7 +5917,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "bytes 0.5.4",
  "futures 0.3.4",
@@ -5988,7 +5939,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "erased-serde",
  "log 0.4.8",
@@ -6003,7 +5954,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6023,7 +5974,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6406,7 +6357,7 @@ dependencies = [
 [[package]]
 name = "sp-allocator"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6418,7 +6369,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "hash-db",
  "parity-scale-codec",
@@ -6433,7 +6384,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "blake2-rfc",
  "proc-macro-crate",
@@ -6445,7 +6396,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6457,7 +6408,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "integer-sqrt",
  "num-traits 0.2.11",
@@ -6471,7 +6422,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6483,7 +6434,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6494,7 +6445,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6506,7 +6457,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "log 0.4.8",
@@ -6522,7 +6473,7 @@ dependencies = [
 [[package]]
 name = "sp-chain-spec"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "serde",
  "serde_json",
@@ -6531,7 +6482,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6554,7 +6505,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6568,7 +6519,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6584,7 +6535,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "schnorrkel",
@@ -6596,7 +6547,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "base58",
  "blake2-rfc",
@@ -6636,7 +6587,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "kvdb",
  "parking_lot 0.10.2",
@@ -6645,7 +6596,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "proc-macro2 1.0.10",
  "quote 1.0.3",
@@ -6655,7 +6606,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "environmental",
  "sp-std",
@@ -6665,7 +6616,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6678,7 +6629,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-inherents",
@@ -6688,7 +6639,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "parity-scale-codec",
@@ -6700,7 +6651,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "hash-db",
  "libsecp256k1",
@@ -6718,7 +6669,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -6729,7 +6680,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -6738,7 +6689,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "backtrace",
  "log 0.4.8",
@@ -6747,7 +6698,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -6759,7 +6710,7 @@ dependencies = [
 [[package]]
 name = "sp-phragmen-compact"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2 1.0.10",
@@ -6770,7 +6721,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "serde",
  "sp-core",
@@ -6779,7 +6730,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "hash256-std-hasher",
  "impl-trait-for-tuples",
@@ -6800,7 +6751,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -6814,7 +6765,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -6826,7 +6777,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "serde",
  "serde_json",
@@ -6835,7 +6786,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -6846,7 +6797,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "parity-scale-codec",
  "sp-runtime",
@@ -6856,7 +6807,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "hash-db",
  "log 0.4.8",
@@ -6875,12 +6826,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "impl-serde 0.2.3",
  "serde",
@@ -6891,7 +6842,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -6905,7 +6856,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "derive_more 0.99.5",
  "futures 0.3.4",
@@ -6920,7 +6871,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "hash-db",
  "memory-db",
@@ -6934,7 +6885,7 @@ dependencies = [
 [[package]]
 name = "sp-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "futures-core",
@@ -6945,7 +6896,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "impl-serde 0.2.3",
  "parity-scale-codec",
@@ -6957,7 +6908,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -7085,7 +7036,7 @@ dependencies = [
 [[package]]
 name = "substrate-browser-utils"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "chrono",
  "clear_on_drop",
@@ -7112,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "platforms",
 ]
@@ -7120,7 +7071,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.4",
@@ -7141,7 +7092,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.8.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "async-std",
  "derive_more 0.99.5",
@@ -7155,7 +7106,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "hash-db",
@@ -7175,7 +7126,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "cfg-if",
  "frame-executive",
@@ -7214,7 +7165,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-runtime-client"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 dependencies = [
  "futures 0.3.4",
  "parity-scale-codec",
@@ -7232,7 +7183,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder-runner"
 version = "1.0.5"
-source = "git+https://github.com/paritytech/substrate#710722f02f372601b2dae178d66654b8cb372ab5"
+source = "git+https://github.com/paritytech/substrate#75134a2f11edd12581264e757c5fc833f8fbae77"
 
 [[package]]
 name = "substrate-wasm-builder-runner"
@@ -7388,9 +7339,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.12.0"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ccb41798287e8e299a701b5560d886d6ca2c3e7115e9ea2cb68c123aec339b7"
+checksum = "5a0338198966bde7feb14b011a33d404a62a6e03b843352c71512a2a002634b7"
 dependencies = [
  "cfg-if",
  "doc-comment",

From a91513e3945e52f9c8a4987acde5407ebf47950a Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Thu, 16 Apr 2020 21:10:19 +0200
Subject: [PATCH 4/4] service/src/lib: Fix compile error

---
 service/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/src/lib.rs b/service/src/lib.rs
index 51e384f65d29..36503c313dc4 100644
--- a/service/src/lib.rs
+++ b/service/src/lib.rs
@@ -505,7 +505,7 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(
 			let (sentries, authority_discovery_role) = match role {
 				Role::Authority { ref sentry_nodes } => (
 					sentry_nodes.clone(),
-					authority_discovery_role = authority_discovery::Role::Authority (
+					authority_discovery::Role::Authority (
 						service.keystore(),
 					),
 				),