diff --git a/Cargo.lock b/Cargo.lock
index 46d278467f..427217446e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1006,13 +1006,13 @@ dependencies = [
 [[package]]
 name = "enr"
 version = "0.1.0-alpha.3"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1132,7 +1132,7 @@ dependencies = [
  "hashmap_delay 0.2.0",
  "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "lighthouse_metrics 0.2.0",
  "lru 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1933,34 +1933,34 @@ dependencies = [
 [[package]]
 name = "libp2p"
 version = "0.13.2"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-core-derive 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-deflate 0.5.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-discv5 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-dns 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-floodsub 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-gossipsub 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-identify 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-kad 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-mdns 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-mplex 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-noise 0.11.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-ping 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-plaintext 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-secio 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-tcp 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-uds 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-wasm-ext 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-websocket 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-yamux 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-core-derive 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-deflate 0.5.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-discv5 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-dns 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-floodsub 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-gossipsub 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-identify 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-kad 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-mdns 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-mplex 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-noise 0.11.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-ping 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-plaintext 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-secio 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-tcp 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-uds 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-wasm-ext 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-websocket 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-yamux 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1972,7 +1972,7 @@ dependencies = [
 [[package]]
 name = "libp2p-core"
 version = "0.13.2"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "asn1_der 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1984,15 +1984,15 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "multistream-select 0.6.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "multistream-select 0.6.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.16.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2007,7 +2007,7 @@ dependencies = [
 [[package]]
 name = "libp2p-core-derive"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "quote 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2016,34 +2016,34 @@ dependencies = [
 [[package]]
 name = "libp2p-deflate"
 version = "0.5.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "flate2 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-discv5"
 version = "0.1.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "arrayvec 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "bigint 4.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "enr 0.1.0-alpha.3 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "enr 0.1.0-alpha.3 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "hex 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "hkdf 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "openssl 0.10.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2058,10 +2058,10 @@ dependencies = [
 [[package]]
 name = "libp2p-dns"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-dns-unofficial 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2069,15 +2069,15 @@ dependencies = [
 [[package]]
 name = "libp2p-floodsub"
 version = "0.13.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "cuckoofilter 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2087,7 +2087,7 @@ dependencies = [
 [[package]]
 name = "libp2p-gossipsub"
 version = "0.1.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2095,8 +2095,8 @@ 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)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "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)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2112,14 +2112,14 @@ dependencies = [
 [[package]]
 name = "libp2p-identify"
 version = "0.13.2"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2131,18 +2131,18 @@ dependencies = [
 [[package]]
 name = "libp2p-kad"
 version = "0.13.2"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2158,16 +2158,16 @@ dependencies = [
 [[package]]
 name = "libp2p-mdns"
 version = "0.13.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "data-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "dns-parser 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2180,12 +2180,12 @@ dependencies = [
 [[package]]
 name = "libp2p-mplex"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "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)",
  "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2196,13 +2196,13 @@ dependencies = [
 [[package]]
 name = "libp2p-noise"
 version = "0.11.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "curve25519-dalek 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2216,14 +2216,14 @@ dependencies = [
 [[package]]
 name = "libp2p-ping"
 version = "0.13.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
- "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
+ "libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2233,14 +2233,14 @@ dependencies = [
 [[package]]
 name = "libp2p-plaintext"
 version = "0.13.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2248,7 +2248,7 @@ dependencies = [
 [[package]]
 name = "libp2p-secio"
 version = "0.13.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2257,13 +2257,13 @@ dependencies = [
  "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "ring 0.16.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "sha2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2277,10 +2277,10 @@ dependencies = [
 [[package]]
 name = "libp2p-swarm"
 version = "0.3.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2290,13 +2290,13 @@ dependencies = [
 [[package]]
 name = "libp2p-tcp"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
  "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipnet 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2306,10 +2306,10 @@ dependencies = [
 [[package]]
 name = "libp2p-uds"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2317,11 +2317,11 @@ dependencies = [
 [[package]]
 name = "libp2p-wasm-ext"
 version = "0.6.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
  "js-sys 0.3.37 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "wasm-bindgen 0.2.60 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2331,13 +2331,13 @@ dependencies = [
 [[package]]
 name = "libp2p-websocket"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "soketto 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2349,10 +2349,10 @@ dependencies = [
 [[package]]
 name = "libp2p-yamux"
 version = "0.13.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "yamux 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2614,7 +2614,7 @@ dependencies = [
 [[package]]
 name = "multistream-select"
 version = "0.6.1"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
@@ -2831,14 +2831,14 @@ dependencies = [
 [[package]]
 name = "parity-multiaddr"
 version = "0.6.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "arrayref 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
  "data-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)",
+ "parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)",
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.106 (registry+https://github.com/rust-lang/crates.io-index)",
  "unsigned-varint 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2848,7 +2848,7 @@ dependencies = [
 [[package]]
 name = "parity-multihash"
 version = "0.2.0"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 dependencies = [
  "blake2 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3561,7 +3561,7 @@ dependencies = [
 [[package]]
 name = "rw-stream-sink"
 version = "0.1.2"
-source = "git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234#2b6d002161f142b1db350f6d1302b4a84a1d4234"
+source = "git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed#8517d93012e9a5cc1d61fbee52c8da59727347ed"
 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)",
@@ -5264,7 +5264,7 @@ dependencies = [
 "checksum ed25519-dalek 1.0.0-pre.3 (registry+https://github.com/rust-lang/crates.io-index)" = "978710b352437433c97b2bff193f2fb1dfd58a093f863dd95e225a19baa599a2"
 "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3"
 "checksum encoding_rs 0.8.22 (registry+https://github.com/rust-lang/crates.io-index)" = "cd8d03faa7fe0c1431609dfad7bbe827af30f82e1e2ae6f7ee4fca6bd764bc28"
-"checksum enr 0.1.0-alpha.3 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
+"checksum enr 0.1.0-alpha.3 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
 "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3"
 "checksum env_logger 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
 "checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd"
@@ -5337,28 +5337,28 @@ dependencies = [
 "checksum leveldb-sys 2.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71f46429bb70612c3e939aaeed27ffd31a24a773d21728a1a426e4089d6778d2"
 "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005"
 "checksum libflate 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)" = "d9135df43b1f5d0e333385cb6e7897ecd1a43d7d11b91ac003f4d2c2d2401fdd"
-"checksum libp2p 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-core-derive 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-deflate 0.5.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-discv5 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-dns 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-floodsub 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-gossipsub 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-identify 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-kad 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-mdns 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-mplex 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-noise 0.11.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-ping 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-plaintext 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-secio 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-tcp 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-uds 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-wasm-ext 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-websocket 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum libp2p-yamux 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
+"checksum libp2p 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-core 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-core-derive 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-deflate 0.5.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-discv5 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-dns 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-floodsub 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-gossipsub 0.1.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-identify 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-kad 0.13.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-mdns 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-mplex 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-noise 0.11.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-ping 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-plaintext 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-secio 0.13.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-swarm 0.3.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-tcp 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-uds 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-wasm-ext 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-websocket 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum libp2p-yamux 0.13.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
 "checksum libsecp256k1 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "1fc1e2c808481a63dc6da2074752fdd4336a3c8fcc68b83db6f1fd5224ae7962"
 "checksum libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "2eb5e43362e38e2bca2fd5f5134c4d4564a23a5c28e9b95411652021a8675ebe"
 "checksum linked-hash-map 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ae91b68aebc4ddb91978b11a1b02ddd8602a05ec19002801c5666000e05e0f83"
@@ -5382,7 +5382,7 @@ dependencies = [
 "checksum mio-extras 2.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
 "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum multistream-select 0.6.1 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
+"checksum multistream-select 0.6.1 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
 "checksum native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nix 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
@@ -5399,8 +5399,8 @@ dependencies = [
 "checksum openssl-sys 0.9.55 (registry+https://github.com/rust-lang/crates.io-index)" = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8"
 "checksum owning_ref 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
 "checksum parity-codec 3.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "2b9df1283109f542d8852cd6b30e9341acc2137481eb6157d2e62af68b0afec9"
-"checksum parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
-"checksum parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
+"checksum parity-multiaddr 0.6.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
+"checksum parity-multihash 0.2.0 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
 "checksum parity-scale-codec 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "329c8f7f4244ddb5c37c103641027a76c530e65e8e4b8240b29f81ea40508b17"
 "checksum parity-send-wrapper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa9777aa91b8ad9dd5aaa04a9b6bcb02c7f1deb952fca5a66034d5e63afc5c6f"
 "checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
@@ -5466,7 +5466,7 @@ dependencies = [
 "checksum rustc-hex 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rustls 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b25a18b1bf7387f0145e7f8324e700805aade3842dd3db2e74e4cdeb4677c09e"
-"checksum rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=2b6d002161f142b1db350f6d1302b4a84a1d4234)" = "<none>"
+"checksum rw-stream-sink 0.1.2 (git+https://github.com/SigP/rust-libp2p?rev=8517d93012e9a5cc1d61fbee52c8da59727347ed)" = "<none>"
 "checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76"
 "checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
 "checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
diff --git a/beacon_node/eth2-libp2p/tests/common/mod.rs b/beacon_node/eth2-libp2p/tests/common/mod.rs
index 51450854e7..45168c2e6d 100644
--- a/beacon_node/eth2-libp2p/tests/common/mod.rs
+++ b/beacon_node/eth2-libp2p/tests/common/mod.rs
@@ -78,11 +78,11 @@ pub fn build_config(
 }
 
 pub fn build_libp2p_instance(
-    port: u16,
     boot_nodes: Vec<Enr>,
     secret_key: Option<String>,
     log: slog::Logger,
 ) -> LibP2PService<E> {
+    let port = unused_port("tcp").unwrap();
     let config = build_config(port, boot_nodes, secret_key);
     // launch libp2p service
     LibP2PService::new(&config, EnrForkId::default(), log.clone())
@@ -101,8 +101,7 @@ pub fn get_enr(node: &LibP2PService<E>) -> Enr {
 #[allow(dead_code)]
 pub fn build_full_mesh(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
     let mut nodes: Vec<LibP2PService<E>> = (0..n)
-        .map(|_| unused_port("tcp").unwrap())
-        .map(|p| build_libp2p_instance(p, vec![], None, log.clone()))
+        .map(|_| build_libp2p_instance(vec![], None, log.clone()))
         .collect();
     let multiaddrs: Vec<Multiaddr> = nodes
         .iter()
@@ -125,15 +124,12 @@ pub fn build_full_mesh(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
 // Constructs a pair of nodes with seperate loggers. The sender dials the receiver.
 // This returns a (sender, receiver) pair.
 #[allow(dead_code)]
-pub fn build_node_pair(
-    log: &slog::Logger,
-    start_port: u16,
-) -> (LibP2PService<E>, LibP2PService<E>) {
+pub fn build_node_pair(log: &slog::Logger) -> (LibP2PService<E>, LibP2PService<E>) {
     let sender_log = log.new(o!("who" => "sender"));
     let receiver_log = log.new(o!("who" => "receiver"));
 
-    let mut sender = build_libp2p_instance(start_port, vec![], None, sender_log);
-    let receiver = build_libp2p_instance(start_port + 1, vec![], None, receiver_log);
+    let mut sender = build_libp2p_instance(vec![], None, sender_log);
+    let receiver = build_libp2p_instance(vec![], None, receiver_log);
 
     let receiver_multiaddr = receiver.swarm.discovery().local_enr().clone().multiaddr()[1].clone();
     match libp2p::Swarm::dial_addr(&mut sender.swarm, receiver_multiaddr) {
@@ -147,8 +143,7 @@ pub fn build_node_pair(
 #[allow(dead_code)]
 pub fn build_linear(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
     let mut nodes: Vec<LibP2PService<E>> = (0..n)
-        .map(|_| unused_port("tcp").unwrap())
-        .map(|p| build_libp2p_instance(p, vec![], None, log.clone()))
+        .map(|_| build_libp2p_instance(vec![], None, log.clone()))
         .collect();
     let multiaddrs: Vec<Multiaddr> = nodes
         .iter()
diff --git a/beacon_node/eth2-libp2p/tests/rpc_tests.rs b/beacon_node/eth2-libp2p/tests/rpc_tests.rs
index 8447599e17..74a0a7a1b7 100644
--- a/beacon_node/eth2-libp2p/tests/rpc_tests.rs
+++ b/beacon_node/eth2-libp2p/tests/rpc_tests.rs
@@ -25,8 +25,7 @@ fn test_status_rpc() {
     let log = common::build_log(log_level, enable_logging);
 
     // get sender/receiver
-    let port = common::unused_port("tcp").unwrap();
-    let (mut sender, mut receiver) = common::build_node_pair(&log, port);
+    let (mut sender, mut receiver) = common::build_node_pair(&log);
 
     // Dummy STATUS RPC message
     let rpc_request = RPCRequest::Status(StatusMessage {
@@ -141,8 +140,7 @@ fn test_blocks_by_range_chunked_rpc() {
     let log = common::build_log(log_level, enable_logging);
 
     // get sender/receiver
-    let port = common::unused_port("tcp").unwrap();
-    let (mut sender, mut receiver) = common::build_node_pair(&log, port);
+    let (mut sender, mut receiver) = common::build_node_pair(&log);
 
     // BlocksByRange Request
     let rpc_request = RPCRequest::BlocksByRange(BlocksByRangeRequest {
@@ -277,8 +275,7 @@ fn test_blocks_by_range_single_empty_rpc() {
     let log = common::build_log(log_level, enable_logging);
 
     // get sender/receiver
-    let port = common::unused_port("tcp").unwrap();
-    let (mut sender, mut receiver) = common::build_node_pair(&log, port);
+    let (mut sender, mut receiver) = common::build_node_pair(&log);
 
     // BlocksByRange Request
     let rpc_request = RPCRequest::BlocksByRange(BlocksByRangeRequest {
@@ -414,8 +411,7 @@ fn test_blocks_by_root_chunked_rpc() {
     let spec = E::default_spec();
 
     // get sender/receiver
-    let port = common::unused_port("tcp").unwrap();
-    let (mut sender, mut receiver) = common::build_node_pair(&log, port);
+    let (mut sender, mut receiver) = common::build_node_pair(&log);
 
     // BlocksByRoot Request
     let rpc_request = RPCRequest::BlocksByRoot(BlocksByRootRequest {
@@ -543,8 +539,7 @@ fn test_goodbye_rpc() {
     let log = common::build_log(log_level, enable_logging);
 
     // get sender/receiver
-    let port = common::unused_port("tcp").unwrap();
-    let (mut sender, mut receiver) = common::build_node_pair(&log, port);
+    let (mut sender, mut receiver) = common::build_node_pair(&log);
 
     // Goodbye Request
     let rpc_request = RPCRequest::Goodbye(GoodbyeReason::ClientShutdown);
diff --git a/beacon_node/network/src/router/mod.rs b/beacon_node/network/src/router/mod.rs
index 073b38cc2f..7929403aa9 100644
--- a/beacon_node/network/src/router/mod.rs
+++ b/beacon_node/network/src/router/mod.rs
@@ -60,7 +60,7 @@ impl<T: BeaconChainTypes> Router<T> {
         executor: &tokio::runtime::TaskExecutor,
         log: slog::Logger,
     ) -> error::Result<mpsc::UnboundedSender<RouterMessage<T::EthSpec>>> {
-        let message_handler_log = log.new(o!("service"=> "msg_handler"));
+        let message_handler_log = log.new(o!("service"=> "router"));
         trace!(message_handler_log, "Service starting");
 
         let (handler_send, handler_recv) = mpsc::unbounded_channel();
@@ -262,16 +262,18 @@ impl<T: BeaconChainTypes> Router<T> {
                     AttestationType::Unaggregated { should_store: true },
                 );
             }
-            PubsubMessage::BeaconBlock(block) => match self.processor.should_forward_block(block) {
-                Ok(verified_block) => {
-                    self.propagate_message(id, peer_id.clone());
-                    self.processor.on_block_gossip(peer_id, verified_block);
-                }
-                Err(e) => {
-                    warn!(self.log, "Could not verify block for gossip";
+            PubsubMessage::BeaconBlock(block) => {
+                match self.processor.should_forward_block(&peer_id, block) {
+                    Ok(verified_block) => {
+                        self.propagate_message(id, peer_id.clone());
+                        self.processor.on_block_gossip(peer_id, verified_block);
+                    }
+                    Err(e) => {
+                        warn!(self.log, "Could not verify block for gossip";
                             "error" => format!("{:?}", e));
+                    }
                 }
-            },
+            }
             PubsubMessage::VoluntaryExit(_exit) => {
                 // TODO: Apply more sophisticated validation
                 self.propagate_message(id, peer_id.clone());
diff --git a/beacon_node/network/src/router/processor.rs b/beacon_node/network/src/router/processor.rs
index cb6d687652..3fbc6b4e3e 100644
--- a/beacon_node/network/src/router/processor.rs
+++ b/beacon_node/network/src/router/processor.rs
@@ -490,9 +490,17 @@ impl<T: BeaconChainTypes> Processor<T> {
     /// across the network.
     pub fn should_forward_block(
         &mut self,
+        peer_id: &PeerId,
         block: Box<SignedBeaconBlock<T::EthSpec>>,
     ) -> Result<GossipVerifiedBlock<T>, BlockError> {
-        self.chain.verify_block_for_gossip(*block)
+        let result = self.chain.verify_block_for_gossip(*block.clone());
+
+        if let Err(BlockError::ParentUnknown(_)) = result {
+            // if we don't know the parent, start a parent lookup
+            // TODO: Modify the return to avoid the block clone.
+            self.send_to_sync(SyncMessage::UnknownBlock(peer_id.clone(), block));
+        }
+        result
     }
 
     /// Process a gossip message declaring a new block.
@@ -534,7 +542,8 @@ impl<T: BeaconChainTypes> Processor<T> {
                 }
                 BlockProcessingOutcome::ParentUnknown { .. } => {
                     // Inform the sync manager to find parents for this block
-                    debug!(self.log, "Block with unknown parent received";
+                    // This should not occur. It should be checked by `should_forward_block`
+                    error!(self.log, "Block with unknown parent attempted to be processed";
                             "peer_id" => format!("{:?}",peer_id));
                     self.send_to_sync(SyncMessage::UnknownBlock(peer_id, block));
                 }