Upgrade dependencies (#2513)

## Proposed Changes

* Consolidate Tokio versions: everything now uses the latest v1.10.0, no more `tokio-compat`.
* Many semver-compatible changes via `cargo update`. Notably this upgrades from the yanked v0.8.0 version of crossbeam-deque which is present in v1.5.0-rc.0
* Many semver incompatible upgrades via `cargo upgrades` and `cargo upgrade --workspace pkg_name`. Notable ommissions:
    - Prometheus, to be handled separately: https://github.com/sigp/lighthouse/issues/2485
    - `rand`, `rand_xorshift`: the libsecp256k1 package requires 0.7.x, so we'll stick with that for now
    - `ethereum-types` is pinned at 0.11.0 because that's what `web3` is using and it seems nice to have just a single version
    
## Additional Info

We still have two versions of `libp2p-core` due to `discv5` depending on the v0.29.0 release rather than `master`. AFAIK it should be OK to release in this state (cc @AgeManning )

testing/ef_tests/Cargo.toml

@@ -15,7 +15,7 @@ bls = { path = "../../crypto/bls", default-features = false }
 compare_fields = { path = "../../common/compare_fields" }
 compare_fields_derive = { path = "../../common/compare_fields_derive" }
 derivative = "2.1.1"
-ethereum-types = "0.9.2"
+ethereum-types = "0.11.0"
 hex = "0.4.2"
 rayon = "1.4.1"
 serde = "1.0.116"

testing/eth1_test_rig/Cargo.toml

@@ -5,9 +5,8 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-tokio = { version = "1.7.1", features = ["time"] }
-tokio-compat-02 = "0.2.0"
-web3 = { version = "0.16.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] }
+tokio = { version = "1.10.0", features = ["time"] }
+web3 = { version = "0.17.0", default-features = false, features = ["http-tls", "signing", "ws-tls-tokio"] }
 futures = "0.3.7"
 types = { path = "../../consensus/types"}
 serde_json = "1.0.58"

testing/eth1_test_rig/src/ganache.rs

@@ -4,7 +4,6 @@ use std::io::BufReader;
 use std::net::TcpListener;
 use std::process::{Child, Command, Stdio};
 use std::time::{Duration, Instant};
-use tokio_compat_02::FutureExt;
 use web3::{transports::Http, Transport, Web3};
 
 /// How long we will wait for ganache to indicate that it is ready.
@@ -156,7 +155,6 @@ impl GanacheInstance {
         self.web3
             .transport()
             .execute("evm_increaseTime", vec![json!(increase_by)])
-            .compat()
             .await
             .map(|_json_value| ())
             .map_err(|e| format!("Failed to increase time on EVM (is this ganache?): {:?}", e))
@@ -167,7 +165,6 @@ impl GanacheInstance {
         self.web3
             .eth()
             .block_number()
-            .compat()
             .await
             .map(|v| v.as_u64())
             .map_err(|e| format!("Failed to get block number: {:?}", e))
@@ -178,7 +175,6 @@ impl GanacheInstance {
         self.web3
             .transport()
             .execute("evm_mine", vec![])
-            .compat()
             .await
             .map(|_| ())
             .map_err(|_| {

testing/eth1_test_rig/src/lib.rs

@@ -13,7 +13,6 @@ use deposit_contract::{
 use ganache::GanacheInstance;
 use std::time::Duration;
 use tokio::time::sleep;
-use tokio_compat_02::FutureExt;
 use types::DepositData;
 use types::{test_utils::generate_deterministic_keypair, EthSpec, Hash256, Keypair, Signature};
 use web3::contract::{Contract, Options};
@@ -182,7 +181,6 @@ impl DepositContract {
             .web3
             .eth()
             .accounts()
-            .compat()
             .await
             .map_err(|e| format!("Failed to get accounts: {:?}", e))
             .and_then(|accounts| {
@@ -213,7 +211,6 @@ impl DepositContract {
         self.web3
             .eth()
             .send_transaction(tx_request)
-            .compat()
             .await
             .map_err(|e| format!("Failed to call deposit fn: {:?}", e))?;
         Ok(())
@@ -257,7 +254,6 @@ async fn deploy_deposit_contract(
     let from_address = web3
         .eth()
         .accounts()
-        .compat()
         .await
         .map_err(|e| format!("Failed to get accounts: {:?}", e))
         .and_then(|accounts| {
@@ -271,7 +267,6 @@ async fn deploy_deposit_contract(
         let result = web3
             .personal()
             .unlock_account(from_address, &password, None)
-            .compat()
             .await;
         match result {
             Ok(true) => return Ok(from_address),
@@ -292,7 +287,6 @@ async fn deploy_deposit_contract(
         .execute(bytecode, (), deploy_address);
 
     pending_contract
-        .compat()
         .await
         .map(|contract| contract.address())
         .map_err(|e| format!("Unable to resolve pending contract: {:?}", e))

testing/remote_signer_test/Cargo.toml

@@ -15,7 +15,7 @@ reqwest = { version = "0.11.0", features = ["blocking", "json"] }
 serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0.58"
 tempfile = "3.1.0"
-tokio = { version = "1.7.1", features = ["time"] }
+tokio = { version = "1.10.0", features = ["time"] }
 types = { path = "../../consensus/types" }
 sensitive_url = { path = "../../common/sensitive_url" }
 

testing/simulator/Cargo.toml

@@ -13,9 +13,9 @@ types = { path = "../../consensus/types" }
 validator_client = { path = "../../validator_client" }
 parking_lot = "0.11.0"
 futures = "0.3.7"
-tokio = "1.7.1"
+tokio = "1.10.0"
 eth1_test_rig = { path = "../eth1_test_rig" }
-env_logger = "0.8.2"
+env_logger = "0.9.0"
 clap = "2.33.3"
 rayon = "1.4.1"
 sensitive_url  = { path = "../../common/sensitive_url" }