Update dependencies (#2084)

## Issue Addressed Partially addresses dependencies mentioned in issue #1712. ## Proposed Changes Updates dependencies (including an update avoiding a vulnerability) + add tokio compatibility to `remote_signer_test`
sigp · Dec 14, 2020 · 701843a · 701843a
1 parent c1e27f4
commit 701843a
Show file tree

Hide file tree

Showing 13 changed files with 120 additions and 49 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/beacon_node/eth1/Cargo.toml b/beacon_node/eth1/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dev-dependencies]
 eth1_test_rig = { path = "../../testing/eth1_test_rig" }
 toml = "0.5.6"
-web3 = "0.13.0"
+web3 = "0.14.0"
 sloggers = "1.0.1"
 environment = { path = "../../lighthouse/environment" }
 tokio-compat-02 = "0.1"

diff --git a/common/eth2/Cargo.toml b/common/eth2/Cargo.toml
@@ -18,7 +18,7 @@ serde_utils = { path = "../../consensus/serde_utils" }
 zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
 eth2_keystore = { path = "../../crypto/eth2_keystore" }
 libsecp256k1 = "0.3.5"
-ring = "0.16.12"
+ring = "0.16.19"
 bytes = "0.5.6"
 account_utils = { path = "../../common/account_utils" }
 eth2_ssz = "0.1.2"

diff --git a/common/remote_signer_consumer/Cargo.toml b/common/remote_signer_consumer/Cargo.toml
@@ -11,5 +11,5 @@ remote_signer_test = { path = "../../testing/remote_signer_test" }
 [dependencies]
 reqwest = { version = "0.10.8", features = ["json"] }
 serde = { version = "1.0.116", features = ["derive"] }
-tokio = { version = "0.2.22", features = ["time"] }
+tokio = { version = "0.3.5", features = ["time"] }
 types = { path = "../../consensus/types" }
diff --git a/crypto/eth2_hashing/Cargo.toml b/crypto/eth2_hashing/Cargo.toml
@@ -10,7 +10,7 @@ description = "Hashing primitives used in Ethereum 2.0"
 lazy_static = { version = "1.4.0", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-ring = "0.16.12"
+ring = "0.16.19"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 sha2 = "0.9.1"

diff --git a/crypto/eth2_key_derivation/Cargo.toml b/crypto/eth2_key_derivation/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 sha2 = "0.9.1"
 zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
 num-bigint-dig = { version = "0.6.0", features = ["zeroize"] }
-ring = "0.16.12"
+ring = "0.16.19"
 bls = { path = "../bls" }
 
 [dev-dependencies]

diff --git a/remote_signer/client/Cargo.toml b/remote_signer/client/Cargo.toml
@@ -9,7 +9,7 @@ clap = "2.33.3"
 client_backend = { path = "../backend", package = "remote_signer_backend" }
 environment = { path = "../../lighthouse/environment" }
 futures = "0.3.6"
-hyper = { git = "https://github.com/sigp/hyper", branch = "lighthouse" }
+hyper = "0.13.8"
 lazy_static = "1.4.0"
 regex = "1.3.9"
 serde = { version = "1.0.116", features = ["derive"] }

diff --git a/testing/eth1_test_rig/Cargo.toml b/testing/eth1_test_rig/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 tokio = { version = "0.3.2", features = ["time"] }
 tokio-compat-02 = "0.1"
-web3 = "0.13.0"
+web3 = "0.14.0"
 futures = "0.3.7"
 types = { path = "../../consensus/types"}
 serde_json = "1.0.58"

diff --git a/testing/eth1_test_rig/src/lib.rs b/testing/eth1_test_rig/src/lib.rs
@@ -287,8 +287,7 @@ async fn deploy_deposit_contract(
             gas: Some(U256::from(CONTRACT_DEPLOY_GAS)),
             ..Options::default()
         })
-        .execute(bytecode, (), deploy_address)
-        .map_err(|e| format!("Failed to execute deployment: {:?}", e))?;
+        .execute(bytecode, (), deploy_address);
 
     pending_contract
         .compat()

diff --git a/testing/remote_signer_test/Cargo.toml b/testing/remote_signer_test/Cargo.toml
@@ -15,5 +15,6 @@ reqwest = { version = "0.10.8", features = ["blocking", "json"] }
 serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0.58"
 tempdir = "0.3.7"
-tokio = { version = "0.2.22", features = ["time"] }
+tokio = { version = "0.3.5", features = ["time"] }
 types = { path = "../../consensus/types" }
+tokio-compat-02 = "0.1"