Update to tokio 1.1 (#2172)

## Issue Addressed

resolves #2129
resolves #2099 
addresses some of #1712
unblocks #2076
unblocks #2153 

## Proposed Changes

- Updates all the dependencies mentioned in #2129, except for web3. They haven't merged their tokio 1.0 update because they are waiting on some dependencies of their own. Since we only use web3 in tests, I think updating it in a separate issue is fine. If they are able to merge soon though, I can update in this PR. 

- Updates `tokio_util` to 0.6.2 and `bytes` to 1.0.1.

- We haven't made a discv5 release since merging tokio 1.0 updates so I'm using a commit rather than release atm. **Edit:** I think we should merge an update of `tokio_util` to 0.6.2 into discv5 before this release because it has panic fixes in `DelayQueue`  --> PR in discv5:  https://github.com/sigp/discv5/pull/58

## Additional Info

tokio 1.0 changes that required some changes in lighthouse:

- `interval.next().await.is_some()` -> `interval.tick().await`
- `sleep` future is now `!Unpin` -> https://github.com/tokio-rs/tokio/issues/3028
- `try_recv` has been temporarily removed from `mpsc` -> https://github.com/tokio-rs/tokio/issues/3350
- stream features have moved to `tokio-stream` and `broadcast::Receiver::into_stream()` has been temporarily removed -> `https://github.com/tokio-rs/tokio/issues/2870
- I've copied over the `BroadcastStream` wrapper from this PR, but can update to use `tokio-stream` once it's merged https://github.com/tokio-rs/tokio/pull/3384

Co-authored-by: realbigsean <seananderson33@gmail.com>

common/deposit_contract/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 build = "build.rs"
 
 [build-dependencies]
-reqwest = { version = "0.10.8", features = ["blocking", "json", "native-tls-vendored"] }
+reqwest = { version = "0.11.0", features = ["blocking", "json", "native-tls-vendored"] }
 serde_json = "1.0.58"
 sha2 = "0.9.1"
 hex = "0.4.2"

common/eth2/Cargo.toml

@@ -11,7 +11,7 @@ serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0.58"
 types = { path = "../../consensus/types" }
 hex = "0.4.2"
-reqwest = { version = "0.10.8", features = ["json","stream"] }
+reqwest = { version = "0.11.0", features = ["json","stream"] }
 eth2_libp2p = { path = "../../beacon_node/eth2_libp2p" }
 proto_array = { path = "../../consensus/proto_array", optional = true }
 serde_utils = { path = "../../consensus/serde_utils" }
@@ -19,7 +19,7 @@ zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
 eth2_keystore = { path = "../../crypto/eth2_keystore" }
 libsecp256k1 = "0.3.5"
 ring = "0.16.19"
-bytes = "0.5.6"
+bytes = "1.0.1"
 account_utils = { path = "../../common/account_utils" }
 eth2_ssz = "0.1.2"
 eth2_ssz_derive = "0.1.0"

common/eth2/src/types.rs

@@ -682,6 +682,16 @@ pub enum EventKind<T: EthSpec> {
 }
 
 impl<T: EthSpec> EventKind<T> {
+    pub fn topic_name(&self) -> &str {
+        match self {
+            EventKind::Head(_) => "head",
+            EventKind::Block(_) => "block",
+            EventKind::Attestation(_) => "attestation",
+            EventKind::VoluntaryExit(_) => "voluntary_exit",
+            EventKind::FinalizedCheckpoint(_) => "finalized_checkpoint",
+        }
+    }
+
     pub fn from_sse_bytes(message: &[u8]) -> Result<Self, ServerError> {
         let s = from_utf8(message)
             .map_err(|e| ServerError::InvalidServerSentEvent(format!("{:?}", e)))?;

common/eth2_network_config/Cargo.toml

@@ -19,4 +19,4 @@ serde_yaml = "0.8.13"
 types = { path = "../../consensus/types"}
 eth2_ssz = "0.1.2"
 eth2_config = { path = "../eth2_config"}
-enr = { version = "0.4.0", features = ["ed25519", "k256"] }
+enr = { version = "0.5.0", features = ["ed25519", "k256"] }

common/hashset_delay/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.7"
-tokio-util = { version = "0.5.0", features = ["time"] }
+tokio-util = { version = "0.6.2", features = ["time"] }
 
 [dev-dependencies]
-tokio = { version = "0.3.2", features = ["time", "rt-multi-thread", "macros"] }
+tokio = { version = "1.1.0", features = ["time", "rt-multi-thread", "macros"] }

common/remote_signer_consumer/Cargo.toml

@@ -9,7 +9,7 @@ rand = "0.7.3"
 remote_signer_test = { path = "../../testing/remote_signer_test" }
 
 [dependencies]
-reqwest = { version = "0.10.8", features = ["json"] }
+reqwest = { version = "0.11.0", features = ["json"] }
 serde = { version = "1.0.116", features = ["derive"] }
-tokio = { version = "0.3.5", features = ["time"] }
+tokio = { version = "1.1.0", features = ["time"] }
 types = { path = "../../consensus/types" }

common/rest_types/Cargo.toml

@@ -14,8 +14,8 @@ state_processing = { path = "../../consensus/state_processing" }
 bls = { path = "../../crypto/bls" }
 serde = { version = "1.0.110", features = ["derive"] }
 rayon = "1.3.0"
-hyper = "0.13.5"
-tokio = { version = "0.3.5", features = ["sync"] }
+hyper = "0.14.4"
+tokio = { version = "1.1.0", features = ["sync"] }
 environment = { path = "../../lighthouse/environment" }
 store = { path = "../../beacon_node/store" }
 beacon_chain = { path = "../../beacon_node/beacon_chain" }

common/task_executor/Cargo.toml

@@ -5,10 +5,9 @@ authors = ["Sigma Prime <contact@sigmaprime.io>"]
 edition = "2018"
 
 [dependencies]
-tokio = { version = "0.3.2", features = ["rt"] }
+tokio = { version = "1.1.0", features = ["rt"] }
 slog = "2.5.2"
 futures = "0.3.7"
 exit-future = "0.2.0"
 lazy_static = "1.4.0"
 lighthouse_metrics = { path = "../lighthouse_metrics" }
-tokio-compat-02 = "0.1"

common/task_executor/src/lib.rs

@@ -5,7 +5,6 @@ use futures::prelude::*;
 use slog::{debug, o, trace};
 use std::sync::Weak;
 use tokio::runtime::Runtime;
-use tokio_compat_02::FutureExt;
 
 /// A wrapper over a runtime handle which can spawn async and blocking tasks.
 #[derive(Clone)]
@@ -63,7 +62,7 @@ impl TaskExecutor {
         if let Some(int_gauge) = metrics::get_int_gauge(&metrics::ASYNC_TASKS_COUNT, &[name]) {
             // Task is shutdown before it completes if `exit` receives
             let int_gauge_1 = int_gauge.clone();
-            let future = future::select(Box::pin(task.compat()), exit).then(move |either| {
+            let future = future::select(Box::pin(task), exit).then(move |either| {
                 match either {
                     future::Either::Left(_) => trace!(log, "Async task completed"; "task" => name),
                     future::Either::Right(_) => {
@@ -99,12 +98,10 @@ impl TaskExecutor {
     ) {
         if let Some(int_gauge) = metrics::get_int_gauge(&metrics::ASYNC_TASKS_COUNT, &[name]) {
             let int_gauge_1 = int_gauge.clone();
-            let future = task
-                .then(move |_| {
-                    int_gauge_1.dec();
-                    futures::future::ready(())
-                })
-                .compat();
+            let future = task.then(move |_| {
+                int_gauge_1.dec();
+                futures::future::ready(())
+            });
 
             int_gauge.inc();
             if let Some(runtime) = self.runtime.upgrade() {
@@ -186,7 +183,7 @@ impl TaskExecutor {
 
             int_gauge.inc();
             if let Some(runtime) = self.runtime.upgrade() {
-                Some(runtime.spawn(future.compat()))
+                Some(runtime.spawn(future))
             } else {
                 debug!(self.log, "Couldn't spawn task. Runtime shutting down");
                 None

common/warp_utils/Cargo.toml

@@ -7,14 +7,14 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-warp = { git = "https://github.com/sigp/warp ", branch = "lighthouse" }
+warp = "0.3.0"
 eth2 = { path = "../eth2" }
 types = { path = "../../consensus/types" }
 beacon_chain = { path = "../../beacon_node/beacon_chain" }
 state_processing = { path = "../../consensus/state_processing" }
 safe_arith = { path = "../../consensus/safe_arith" }
 serde = { version = "1.0.116", features = ["derive"] }
-tokio = { version = "0.3.2", features = ["sync"] }
+tokio = { version = "1.1.0", features = ["sync"] }
 headers = "0.3.2"
 lighthouse_metrics = { path = "../lighthouse_metrics" }
 lazy_static = "1.4.0"