diff --git a/Cargo.lock b/Cargo.lock
index b843ef534b17..4cbbb9d13ab0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,7 +16,7 @@ dependencies = [
  "dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.7.11",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -33,9 +33,9 @@ dependencies = [
  "polkadot-collator 0.7.11",
  "polkadot-parachain 0.7.11",
  "polkadot-primitives 0.7.11",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -1109,7 +1109,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "fork-tree"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1117,58 +1117,58 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "frame-metadata"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "frame-support"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "bitmask 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-metadata 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-support-procedural 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "once_cell 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-arithmetic 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tracing 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "frame-support-procedural"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support-procedural-tools 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1177,9 +1177,9 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1189,7 +1189,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1199,27 +1199,27 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -1529,7 +1529,7 @@ dependencies = [
 [[package]]
 name = "grafana-data-source"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "async-std 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2034,37 +2034,37 @@ name = "kusama-runtime"
 version = "0.7.11"
 dependencies = [
  "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-executive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-collective 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-elections-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-identity 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-im-online 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-membership 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-nicks 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-offences 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking-reward-curve 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-utility 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-collective 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-democracy 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-elections-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-identity 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-im-online 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-indices 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-membership 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-nicks 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-offences 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking-reward-curve 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-treasury 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-utility 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.7.11",
  "polkadot-primitives 0.7.11",
@@ -2074,22 +2074,22 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3006,301 +3006,301 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-babe"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-collective"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-democracy"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-identity"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "enumflags2 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-im-online"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-indices"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-membership"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-nicks"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-offences"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-randomness-collective-flip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3311,89 +3311,89 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-treasury"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "pallet-utility"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -3705,15 +3705,15 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-erasure-coding 0.7.11",
  "polkadot-primitives 0.7.11",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3732,9 +3732,9 @@ dependencies = [
  "polkadot-service 0.7.11",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-cli 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-cli 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-service 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "structopt 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.55 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3753,13 +3753,13 @@ dependencies = [
  "polkadot-primitives 0.7.11",
  "polkadot-service 0.7.11",
  "polkadot-validation 0.7.11",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3771,8 +3771,8 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-primitives 0.7.11",
  "reed-solomon-erasure 4.0.0 (git+https://github.com/paritytech/reed-solomon-erasure)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -3789,14 +3789,14 @@ dependencies = [
  "polkadot-erasure-coding 0.7.11",
  "polkadot-primitives 0.7.11",
  "polkadot-validation 0.7.11",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network-gossip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network-gossip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -3812,8 +3812,8 @@ dependencies = [
  "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "shared_memory 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmi 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3823,20 +3823,20 @@ name = "polkadot-primitives"
 version = "0.7.11"
 dependencies = [
  "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.7.11",
  "pretty_assertions 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-serializer 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -3844,14 +3844,14 @@ name = "polkadot-rpc"
 version = "0.7.11"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-transaction-payment-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-transaction-payment-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-primitives 0.7.11",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "substrate-frame-rpc-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "substrate-frame-rpc-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -3859,36 +3859,36 @@ name = "polkadot-runtime"
 version = "0.7.11"
 dependencies = [
  "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-executive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-collective 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-elections-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-identity 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-im-online 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-membership 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-nicks 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-offences 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking-reward-curve 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-collective 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-democracy 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-elections-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-identity 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-im-online 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-indices 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-membership 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-nicks 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-offences 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking-reward-curve 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-treasury 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.7.11",
  "polkadot-primitives 0.7.11",
@@ -3898,21 +3898,21 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3923,20 +3923,20 @@ name = "polkadot-runtime-common"
 version = "0.7.10"
 dependencies = [
  "bitvec 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking-reward-curve 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-randomness-collective-flip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking-reward-curve 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-treasury 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-parachain 0.7.11",
  "polkadot-primitives 0.7.11",
@@ -3944,15 +3944,15 @@ dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tiny-keccak 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -3961,17 +3961,17 @@ dependencies = [
 name = "polkadot-service"
 version = "0.7.11"
 dependencies = [
- "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex-literal 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "kusama-runtime 0.7.11",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-im-online 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-im-online 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-availability-store 0.7.11",
@@ -3980,33 +3980,33 @@ dependencies = [
  "polkadot-rpc 0.7.11",
  "polkadot-runtime 0.7.11",
  "polkadot-validation 0.7.11",
- "sc-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-db 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-service 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -4015,7 +4015,7 @@ version = "0.7.11"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-primitives 0.7.11",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -4028,7 +4028,7 @@ dependencies = [
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "polkadot-availability-store 0.7.11",
@@ -4036,21 +4036,21 @@ dependencies = [
  "polkadot-parachain 0.7.11",
  "polkadot-primitives 0.7.11",
  "polkadot-statement-table 0.7.11",
- "sc-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.2.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -4584,7 +4584,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4595,49 +4595,49 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "prost-build 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-chain-spec"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-chain-spec-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-chain-spec-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4648,7 +4648,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "app_dirs 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4663,18 +4663,18 @@ dependencies = [
  "names 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rpassword 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-tracing 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-service 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-tracing 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-panic-handler 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "structopt 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4683,7 +4683,7 @@ dependencies = [
 [[package]]
 name = "sc-client"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4694,29 +4694,29 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tracing 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-client-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4727,27 +4727,27 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-client-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "kvdb 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4757,25 +4757,25 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-state-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-state-db 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "fork-tree 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4788,64 +4788,64 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "pdqselect 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-consensus-slots 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-consensus-uncles 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-consensus-slots 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-consensus-uncles 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-consensus-slots"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-consensus-uncles"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-executor"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4854,56 +4854,56 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-executor-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor-wasmi 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor-wasmtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-executor-common 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor-wasmi 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor-wasmtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-panic-handler 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-serializer 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-serializer 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-executor-wasmi"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-executor-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-executor-common 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "cranelift-codegen 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cranelift-entity 0.50.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4913,11 +4913,11 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-wasm 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-executor-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-executor-common 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmtime-environ 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmtime-jit 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4927,10 +4927,10 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "finality-grandpa 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "fork-tree 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4938,41 +4938,41 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network-gossip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network-gossip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-keystore"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-network"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4980,7 +4980,7 @@ dependencies = [
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "fork-tree 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures-timer 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4993,21 +4993,21 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-hex 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-peerset 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog_derive 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-arithmetic 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5017,7 +5017,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5026,14 +5026,14 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5047,20 +5047,20 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "threadpool 1.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sc-peerset"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libp2p 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5071,7 +5071,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5080,27 +5080,27 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-rpc-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-rpc-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5113,16 +5113,16 @@ dependencies = [
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-rpc-server"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5131,49 +5131,49 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-service"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "exit-future 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "grafana-data-source 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "grafana-data-source 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-multiaddr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-chain-spec 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-client-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-rpc-server 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-tracing 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-chain-spec 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-client-db 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-rpc-server 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-tracing 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "sysinfo 0.9.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5184,18 +5184,18 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-telemetry"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5217,13 +5217,13 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "erased-serde 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "grafana-data-source 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "grafana-data-source 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
  "slog 2.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5233,35 +5233,35 @@ dependencies = [
 [[package]]
 name = "sc-transaction-graph"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sc-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sc-transaction-graph 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -5533,21 +5533,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "sp-api"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api-proc-macro 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-api-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5559,83 +5559,83 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "integer-sqrt 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "num-traits 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-debug-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-authority-discovery"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-authorship"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-block-builder"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-blockchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-consensus"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5644,33 +5644,33 @@ dependencies = [
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.8.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-core"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "base58 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5693,11 +5693,11 @@ dependencies = [
  "schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-debug-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-storage 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-bip39 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5709,7 +5709,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5719,89 +5719,89 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-storage 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-storage 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-finality-grandpa"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-finality-tracker"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-inherents"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-io"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-keyring"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sp-offchain"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-panic-handler"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "backtrace 0.3.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5810,26 +5810,26 @@ dependencies = [
 [[package]]
 name = "sp-phragmen"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-rpc"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-runtime"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5837,33 +5837,33 @@ dependencies = [
  "paste 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-arithmetic 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "environmental 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "primitive-types 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "Inflector 0.11.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro-crate 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5875,7 +5875,7 @@ dependencies = [
 [[package]]
 name = "sp-serializer"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.41 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5884,27 +5884,27 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-staking"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-state-machine"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -5912,10 +5912,10 @@ dependencies = [
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-panic-handler 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -5923,56 +5923,56 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 
 [[package]]
 name = "sp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-debug-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-timestamp"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-transaction-pool"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "derive_more 0.99.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "memory-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "trie-db 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "trie-root 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -5980,19 +5980,19 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-serde 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
  "impl-trait-for-tuples 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasmi 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -6096,21 +6096,21 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=polkadot-master#dacb199f89049d68376c03ffed3130e591276ef8"
+source = "git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery#bf750b6e3e2ea96440b8b646b7e1dd7f70a4c70e"
 dependencies = [
- "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "futures 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core-client 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-derive 14.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-scale-codec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
- "sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
- "sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)",
+ "sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
+ "sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)",
 ]
 
 [[package]]
@@ -7345,15 +7345,15 @@ dependencies = [
 "checksum fixedbitset 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "86d4de0081402f5e88cdac65c8dcdcc73118c1a7a465e2a05f0da05843a8ea33"
 "checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
-"checksum fork-tree 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-executive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-metadata 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-support 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-support-procedural 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-support-procedural-tools 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum fork-tree 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-executive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-metadata 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-support 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-support-procedural 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-support-procedural-tools 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-support-procedural-tools-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum frame-system-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum fs-swap 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "921d332c89b3b61a826de38c61ee5b6e02c56806cade1b0e5d81bd71f57a71bb"
 "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
 "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
@@ -7389,7 +7389,7 @@ dependencies = [
 "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
 "checksum globset 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "925aa2cac82d8834e2b2a4415b6f6879757fb5c0928fc445ae76461a12eed8f2"
 "checksum goblin 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5e6040506480da04a63de51a478e8021892d65d8411f29b2a422c2648bdd8bcb"
-"checksum grafana-data-source 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum grafana-data-source 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum h2 0.1.26 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b34c246847f938a410a03c5458c7fee2274436675e76d8b903c08efc29c462"
 "checksum h2 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b9433d71e471c1736fd5a61b671fc0b148d7a2992f666c958d03cd8feb3b88d1"
 "checksum hash-db 0.15.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a"
@@ -7519,31 +7519,31 @@ dependencies = [
 "checksum once_cell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "891f486f630e5c5a4916c7e16c4b24a53e78c860b646e9f8e005e4f16847bfed"
 "checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 "checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13"
-"checksum pallet-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-babe 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-balances 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-collective 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-democracy 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-elections-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-identity 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-im-online 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-indices 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-membership 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-nicks 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-offences 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-randomness-collective-flip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-staking-reward-curve 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-transaction-payment 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-transaction-payment-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-treasury 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum pallet-utility 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum pallet-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-babe 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-balances 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-collective 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-democracy 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-elections-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-identity 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-im-online 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-indices 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-membership 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-nicks 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-offences 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-randomness-collective-flip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-staking-reward-curve 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-transaction-payment 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-transaction-payment-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-transaction-payment-rpc-runtime-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-treasury 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum pallet-utility 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum parity-bytes 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0c276d76c5333b8c2579e02d49a06733a55b8282d2d9b13e8d53b6406bd7e30a"
 "checksum parity-multiaddr 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "045b3c7af871285146300da35b1932bb6e4639b66c7c98e85d06a32cbc4e8fa7"
 "checksum parity-multiaddr 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "82afcb7461eae5d122543d8be1c57d306ed89af2d6ff7f8b0f5a3cc8f7e511bc"
@@ -7633,36 +7633,36 @@ dependencies = [
 "checksum rw-stream-sink 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9cbe61c20455d3015b2bb7be39e1872310283b8e5a52f5b242b0ac7581fe78"
 "checksum ryu 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bfa8506c1de11c9c4e4c38863ccbe02a305c8188e85a05a784c9e11e1c3910c8"
 "checksum safe-mix 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7f7bf422d23a88c16d5090d455f182bc99c60af4df6a345c63428acf5129e347"
-"checksum sc-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-chain-spec 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-chain-spec-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-cli 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-client 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-client-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-client-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-consensus-slots 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-consensus-uncles 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-executor 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-executor-common 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-executor-wasmi 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-executor-wasmtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-keystore 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-network 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-network-gossip 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-peerset 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-rpc-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-rpc-server 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-service 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-state-db 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-telemetry 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-tracing 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-transaction-graph 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sc-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum sc-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-chain-spec 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-chain-spec-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-cli 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-client 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-client-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-client-db 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-consensus-slots 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-consensus-uncles 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-executor 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-executor-common 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-executor-wasmi 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-executor-wasmtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-keystore 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-network 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-network-gossip 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-peerset 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-rpc-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-rpc-server 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-service 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-state-db 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-telemetry 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-tracing 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-transaction-graph 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sc-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum schnorrkel 0.8.5 (registry+https://github.com/rust-lang/crates.io-index)" = "eacd8381b3c37840c9c9f40472af529e49975bdcbc24f83c31059fd6539023d3"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
@@ -7693,42 +7693,42 @@ dependencies = [
 "checksum snow 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "91eecae35b461ed26bda7a76bea2cc5bda2bf4b8dd06761879f19e6fdd50c2dd"
 "checksum soketto 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bceb1a3a15232d013d9a3b7cac9e5ce8e2313f348f01d4bc1097e5e53aa07095"
 "checksum sourcefile 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4bf77cb82ba8453b42b6ae1d692e4cdc92f9a47beaf89a847c8be83f4e328ad3"
-"checksum sp-api 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-api-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-application-crypto 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-arithmetic 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-authority-discovery 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-authorship 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-block-builder 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-blockchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-consensus 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-consensus-babe 0.8.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-core 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-debug-derive 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-externalities 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-finality-grandpa 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-finality-tracker 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-inherents 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-io 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-keyring 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-offchain 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-panic-handler 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-phragmen 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-rpc 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-runtime 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-runtime-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-serializer 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-session 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-staking 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-state-machine 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-std 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-storage 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-timestamp 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-transaction-pool 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-trie 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-version 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
-"checksum sp-wasm-interface 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum sp-api 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-api-proc-macro 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-application-crypto 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-arithmetic 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-authority-discovery 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-authorship 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-block-builder 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-blockchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-consensus 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-consensus-babe 0.8.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-core 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-debug-derive 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-externalities 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-finality-grandpa 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-finality-tracker 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-inherents 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-io 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-keyring 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-offchain 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-panic-handler 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-phragmen 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-rpc 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-runtime 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-runtime-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-runtime-interface-proc-macro 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-serializer 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-session 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-staking 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-state-machine 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-std 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-storage 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-timestamp 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-transaction-pool 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-trie 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-version 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
+"checksum sp-wasm-interface 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum spin 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"
 "checksum static_assertions 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
@@ -7741,7 +7741,7 @@ dependencies = [
 "checksum strum 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6138f8f88a16d90134763314e3fc76fa3ed6a7db4725d6acf9a3ef95a3188d22"
 "checksum strum_macros 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0054a7df764039a6cd8592b9de84be4bec368ff081d203a7d5371cbfa8e65c81"
 "checksum substrate-bip39 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3be511be555a3633e71739a79e4ddff6a6aaa6579fa6114182a51d72c3eb93c5"
-"checksum substrate-frame-rpc-system 2.0.0 (git+https://github.com/paritytech/substrate?branch=polkadot-master)" = "<none>"
+"checksum substrate-frame-rpc-system 2.0.0 (git+https://github.com/mxinden/substrate?branch=extract-gossip-authority-discovery)" = "<none>"
 "checksum substrate-wasm-builder-runner 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "bd48273fe9d7f92c1f7d6c1c537bb01c8068f925b47ad2cd8367e11dc32f8550"
 "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 "checksum subtle 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab3af2eb31c42e8f0ccf43548232556c42737e01a96db6e1777b0be108e79799"
diff --git a/availability-store/Cargo.toml b/availability-store/Cargo.toml
index 5650f36e678d..1b86e18c8ea9 100644
--- a/availability-store/Cargo.toml
+++ b/availability-store/Cargo.toml
@@ -15,15 +15,15 @@ futures = "0.3.1"
 tokio = { version = "0.2.4", features = ["rt-core"] }
 exit-future = "0.2.0"
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-network = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client = { package = "sc-client-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-client = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+keystore = { package = "sc-keystore", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 kvdb = "0.2.0"
 kvdb-memorydb = "0.2.0"
 
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index c7019a62e7c4..fe7e2af5a890 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -14,7 +14,7 @@ tokio = "0.1.22"
 futures = { version = "0.3.1", features = ["compat"] }
 futures01 = { package = "futures", version = "0.1.29" }
 structopt = "=0.3.7"
-cli = { package = "sc-cli", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+cli = { package = "sc-cli", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 service = { package = "polkadot-service", path = "../service", default-features = false }
 
 libp2p = { version = "0.13.1", default-features = false, optional = true }
@@ -24,8 +24,8 @@ console_log = { version = "0.1.2", optional = true }
 console_error_panic_hook = { version = "0.1.1", optional = true }
 js-sys = { version = "0.3.22", optional = true }
 kvdb-web = { version = "0.1.1", optional = true }
-substrate-service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", optional = true, default-features = false }
-substrate-network = { package = "sc-network", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", optional = true }
+substrate-service = { package = "sc-service", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", optional = true, default-features = false }
+substrate-network = { package = "sc-network", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", optional = true }
 
 # Imported just for the `wasm-bindgen` feature
 rand = { version = "0.7", features = ["wasm-bindgen"], optional = true }
diff --git a/collator/Cargo.toml b/collator/Cargo.toml
index 16d17e243e1a..383398180d14 100644
--- a/collator/Cargo.toml
+++ b/collator/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.1"
-client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client = { package = "sc-client", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client-api = { package = "sc-client-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+primitives = { package = "sp-core", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-network = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-cli = { path = "../cli" }
 polkadot-network = { path = "../network" }
@@ -23,4 +23,4 @@ tokio = "0.1.22"
 futures-timer = "1.0"
 
 [dev-dependencies]
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+keyring = { package = "sp-keyring", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
diff --git a/erasure-coding/Cargo.toml b/erasure-coding/Cargo.toml
index 2ed14904cfbd..e7b481765673 100644
--- a/erasure-coding/Cargo.toml
+++ b/erasure-coding/Cargo.toml
@@ -8,6 +8,6 @@ edition = "2018"
 primitives = { package = "polkadot-primitives", path = "../primitives" }
 reed_solomon = { package = "reed-solomon-erasure", git = "https://github.com/paritytech/reed-solomon-erasure" }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+trie = { package = "sp-trie", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 derive_more = "0.15.0"
diff --git a/network/Cargo.toml b/network/Cargo.toml
index c807f79979e3..3fc9b503c3a6 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -13,16 +13,16 @@ polkadot-validation = { path = "../validation" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-erasure-coding = { path = "../erasure-coding" }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-network-gossip = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-network = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-network-gossip = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 futures = "0.3.1"
 log = "0.4.8"
 exit-future = "0.2.0"
-sc-client = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sc-client = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
diff --git a/parachain/Cargo.toml b/parachain/Cargo.toml
index de62b99a93b6..a2a827f7fcf8 100644
--- a/parachain/Cargo.toml
+++ b/parachain/Cargo.toml
@@ -10,8 +10,8 @@ codec = { package = "parity-scale-codec", version = "1.1.0", default-features =
 wasmi = { version = "0.4.5", optional = true }
 derive_more = { version = "0.14.1", optional = true }
 serde = { version = "1.0.102", default-features = false, features = [ "derive" ] }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
+rstd = { package = "sp-std", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
 lazy_static = { version = "1.4.0", optional = true }
 parking_lot = { version = "0.7.1", optional = true }
 log = { version = "0.4.8", optional = true }
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index 6b7c6546a58b..14855715ca2d 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -7,20 +7,20 @@ edition = "2018"
 [dependencies]
 serde = { version = "1.0.102", optional = true, features = ["derive"] }
 parity-scale-codec = { version = "1.1.0", default-features = false, features = ["bit-vec", "derive"] }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-application-crypto = { package = "sp-application-crypto", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+primitives = { package = "sp-core", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+application-crypto = { package = "sp-application-crypto", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
+sp-version = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+rstd = { package = "sp-std", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 polkadot-parachain = { path = "../parachain", default-features = false }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+trie = { package = "sp-trie", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+babe = { package = "pallet-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
 [dev-dependencies]
-sp-serializer = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-serializer = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 pretty_assertions = "0.5.1"
 
 [features]
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index dba35bad3464..d544991d22eb 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -5,12 +5,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"
 
 [dependencies]
-client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+client = { package = "sc-client", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 jsonrpc-core = "14.0.3"
 polkadot-primitives = { path = "../primitives" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
-sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/paritytech/substrate", branch = "polkadot-master"  }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery"  }
+sc-rpc = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+txpool-api = { package = "sp-transaction-pool", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+frame-rpc-system = { package = "substrate-frame-rpc-system", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery"  }
+pallet-transaction-payment-rpc = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index a7b2eea716a8..4d87cb5c5481 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -12,21 +12,21 @@ rustc-hex = { version = "2.0.1", default-features = false }
 serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+rstd = { package = "sp-std", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-io = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-staking = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-core = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authorship = { package = "pallet-authorship", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+balances = { package = "pallet-balances", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+session = { package = "pallet-session", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+frame-support = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+staking = { package = "pallet-staking", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+system = { package = "frame-system", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
 polkadot-parachain = { path = "../../parachain", default-features = false }
@@ -35,12 +35,12 @@ polkadot-parachain = { path = "../../parachain", default-features = false }
 hex-literal = "0.2.1"
 libsecp256k1 = "0.3.2"
 tiny-keccak = "1.5.0"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+keyring = { package = "sp-keyring", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-trie = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+babe = { package = "pallet-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+pallet-staking-reward-curve = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+treasury = { package = "pallet-treasury", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 trie-db = "0.16.0"
 serde_json = "1.0.41"
 
diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml
index 381a5e2986c7..996fb77e567b 100644
--- a/runtime/kusama/Cargo.toml
+++ b/runtime/kusama/Cargo.toml
@@ -14,49 +14,49 @@ safe-mix = { version = "1.0.0", default-features = false }
 serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-version = { package = "sp-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+rstd = { package = "sp-std", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-io = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-staking = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-core = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-session = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+version = { package = "sp-version", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
-authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, features = ["migrate-authorities"], branch = "polkadot-master" }
-identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-utility = { package = "pallet-utility", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+authorship = { package = "pallet-authorship", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+babe = { package = "pallet-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+balances = { package = "pallet-balances", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+collective = { package = "pallet-collective", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+democracy = { package = "pallet-democracy", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+executive = { package = "frame-executive", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+grandpa = { package = "pallet-grandpa", git = "https://github.com/mxinden/substrate", default-features = false, features = ["migrate-authorities"], branch = "extract-gossip-authority-discovery" }
+identity = { package = "pallet-identity", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+im-online = { package = "pallet-im-online", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+indices = { package = "pallet-indices", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+membership = { package = "pallet-membership", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+nicks = { package = "pallet-nicks", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+offences = { package = "pallet-offences", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+session = { package = "pallet-session", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+frame-support = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+staking = { package = "pallet-staking", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+pallet-staking-reward-curve = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+system = { package = "frame-system", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+treasury = { package = "pallet-treasury", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+utility = { package = "pallet-utility", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -66,8 +66,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false }
 hex-literal = "0.2.1"
 libsecp256k1 = "0.3.2"
 tiny-keccak = "1.5.0"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+keyring = { package = "sp-keyring", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-trie = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 trie-db = "0.16.0"
 serde_json = "1.0.41"
 
diff --git a/runtime/polkadot/Cargo.toml b/runtime/polkadot/Cargo.toml
index be595a2236d3..96a557c7bc94 100644
--- a/runtime/polkadot/Cargo.toml
+++ b/runtime/polkadot/Cargo.toml
@@ -14,47 +14,47 @@ safe-mix = { version = "1.0.0", default-features = false }
 serde = { version = "1.0.102", default-features = false }
 serde_derive = { version = "1.0.102", optional = true }
 
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offchain-primitives = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-rstd = { package = "sp-std", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-staking = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-sp-session = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-version = { package = "sp-version", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+offchain-primitives = { package = "sp-offchain", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+rstd = { package = "sp-std", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-staking = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-core = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+sp-session = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+version = { package = "sp-version", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+block-builder-api = { package = "sp-block-builder", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
-authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-authorship = { package = "pallet-authorship", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-balances = { package = "pallet-balances", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-collective = { package = "pallet-collective", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-democracy = { package = "pallet-democracy", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-executive = { package = "frame-executive", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-grandpa = { package = "pallet-grandpa", git = "https://github.com/paritytech/substrate", default-features = false, features = ["migrate-authorities"], branch = "polkadot-master" }
-identity = { package = "pallet-identity", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-indices = { package = "pallet-indices", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-membership = { package = "pallet-membership", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-nicks = { package = "pallet-nicks", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-offences = { package = "pallet-offences", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-session = { package = "pallet-session", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-staking = { package = "pallet-staking", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-system = { package = "frame-system", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-timestamp = { package = "pallet-timestamp", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
-treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
+authority-discovery = { package = "pallet-authority-discovery", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+authorship = { package = "pallet-authorship", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+babe = { package = "pallet-babe", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+balances = { package = "pallet-balances", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+transaction-payment = { package = "pallet-transaction-payment", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+collective = { package = "pallet-collective", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+democracy = { package = "pallet-democracy", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+elections-phragmen = { package = "pallet-elections-phragmen", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+executive = { package = "frame-executive", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+finality-tracker = { package = "pallet-finality-tracker", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+grandpa = { package = "pallet-grandpa", git = "https://github.com/mxinden/substrate", default-features = false, features = ["migrate-authorities"], branch = "extract-gossip-authority-discovery" }
+identity = { package = "pallet-identity", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+im-online = { package = "pallet-im-online", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+indices = { package = "pallet-indices", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+membership = { package = "pallet-membership", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+nicks = { package = "pallet-nicks", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+offences = { package = "pallet-offences", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+session = { package = "pallet-session", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+frame-support = { git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+staking = { package = "pallet-staking", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+pallet-staking-reward-curve = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+system = { package = "frame-system", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+timestamp = { package = "pallet-timestamp", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
+treasury = { package = "pallet-treasury", git = "https://github.com/mxinden/substrate", default-features = false, branch = "extract-gossip-authority-discovery" }
 
 runtime-common = { package = "polkadot-runtime-common", path = "../common", default-features = false }
 primitives = { package = "polkadot-primitives", path = "../../primitives", default-features = false }
@@ -64,8 +64,8 @@ polkadot-parachain = { path = "../../parachain", default-features = false }
 hex-literal = "0.2.1"
 libsecp256k1 = "0.3.2"
 tiny-keccak = "1.5.0"
-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+keyring = { package = "sp-keyring", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-trie = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 trie-db = "0.16.0"
 serde_json = "1.0.41"
 
diff --git a/service/Cargo.toml b/service/Cargo.toml
index 39efab8e52bc..2ceee496bba2 100644
--- a/service/Cargo.toml
+++ b/service/Cargo.toml
@@ -19,38 +19,38 @@ polkadot-runtime = { path = "../runtime/polkadot" }
 kusama-runtime = { path = "../runtime/kusama" }
 polkadot-network = { path = "../network"  }
 polkadot-rpc = { path = "../rpc" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-db = { package = "sc-client-db", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-network = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus_common = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-service = { package = "sc-service", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-telemetry = { package = "sc-telemetry", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sc-keystore = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-pallet-babe = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-im-online = { package = "pallet-im-online", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe = { package = "sc-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-io = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-runtime = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+primitives = { package = "sp-core", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client = { package = "sc-client", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client-api = { package = "sc-client-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client-db = { package = "sc-client-db", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-executor = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-network = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+consensus_common = { package = "sp-consensus", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+grandpa_primitives = { package = "sp-finality-grandpa", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+service = { package = "sc-service", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+telemetry = { package = "sc-telemetry", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-transaction-pool = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-transaction-pool = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sc-keystore = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+pallet-babe = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+pallet-staking = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+im-online = { package = "pallet-im-online", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+authority-discovery = { package = "sc-authority-discovery", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+authority-discovery-primitives = { package = "sp-authority-discovery", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+babe = { package = "sc-consensus-babe", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-block-builder = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+system_rpc_runtime_api = { package = "frame-system-rpc-runtime-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 codec = { package = "parity-scale-codec", version = "1.1.0" }
-sp-session = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-offchain = { package = "sp-offchain", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-session = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-offchain = { package = "sp-offchain", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 
 [features]
 default = ["rocksdb"]
diff --git a/statement-table/Cargo.toml b/statement-table/Cargo.toml
index e48a30e344d8..1219dff360a8 100644
--- a/statement-table/Cargo.toml
+++ b/statement-table/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.1.0", default-features = false, features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 primitives = { package = "polkadot-primitives", path = "../primitives" }
diff --git a/test-parachains/adder/Cargo.toml b/test-parachains/adder/Cargo.toml
index a85bc8ad25ac..ba89f87bdbe2 100644
--- a/test-parachains/adder/Cargo.toml
+++ b/test-parachains/adder/Cargo.toml
@@ -13,7 +13,7 @@ tiny-keccak = "1.5.0"
 dlmalloc = { version = "0.1.3", features = [ "global" ] }
 
 # We need to make sure the global allocator is disabled until we have support of full substrate externalities
-runtime-io = { package = "sp-io", git = "https://github.com/paritytech/substrate", branch = "polkadot-master", default-features = false, features = [ "disable_allocator" ] }
+runtime-io = { package = "sp-io", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery", default-features = false, features = [ "disable_allocator" ] }
 
 [build-dependencies]
 wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.4" }
diff --git a/test-parachains/adder/collator/Cargo.toml b/test-parachains/adder/collator/Cargo.toml
index b694bd6f937f..f9b29b617078 100644
--- a/test-parachains/adder/collator/Cargo.toml
+++ b/test-parachains/adder/collator/Cargo.toml
@@ -9,9 +9,9 @@ adder = { path = ".." }
 parachain = { package = "polkadot-parachain", path = "../../../parachain" }
 collator = { package = "polkadot-collator", path = "../../../collator" }
 primitives = { package = "polkadot-primitives", path = "../../../primitives" }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "sc-client", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client-api = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-core = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client = { package = "sc-client", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client-api = { package = "sc-client-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 parking_lot = "0.9.0"
 ctrlc = { version = "3.1.3", features = ["termination"] }
 futures = "0.3.1"
diff --git a/validation/Cargo.toml b/validation/Cargo.toml
index 9d115f64e5ad..3106957c025c 100644
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@@ -19,22 +19,22 @@ parachain = { package = "polkadot-parachain", path = "../parachain" }
 polkadot-primitives = { path = "../primitives" }
 polkadot-erasure-coding = { path = "../erasure-coding" }
 table = { package = "polkadot-statement-table", path = "../statement-table" }
-grandpa = { package = "sc-finality-grandpa", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-inherents = { package = "sp-inherents", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-consensus = { package = "sp-consensus", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-primitives = { package = "sp-core", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-txpool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-client = { package = "sc-client-api", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-sp-timestamp = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-block-builder = { package = "sc-block-builder", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-trie = { package = "sp-trie", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-runtime_primitives = { package = "sp-runtime", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+grandpa = { package = "sc-finality-grandpa", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+inherents = { package = "sp-inherents", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+consensus = { package = "sp-consensus", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+primitives = { package = "sp-core", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+txpool-api = { package = "sp-transaction-pool", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+client = { package = "sc-client-api", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-blockchain = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-api = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+sp-timestamp = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+block-builder = { package = "sc-block-builder", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+trie = { package = "sp-trie", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+runtime_primitives = { package = "sp-runtime", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 bitvec = { version = "0.15.2", default-features = false, features = ["alloc"] }
-runtime_babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
-keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+runtime_babe = { package = "pallet-babe", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+babe-primitives = { package = "sp-consensus-babe", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
+keystore = { package = "sc-keystore", git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }
 
 [dev-dependencies]
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
+sp-keyring = { git = "https://github.com/mxinden/substrate", branch = "extract-gossip-authority-discovery" }