update dependencies (#2032)

## Issue Addressed NA ## Proposed Changes Updates out of date dependencies. ## Additional Info See also #1712 for a list of dependencies that are still out of date and the resasons.
sigp · Dec 7, 2020 · a28e8de · a28e8de
1 parent 9c91534
commit a28e8de
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 183 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/account_manager/Cargo.toml b/account_manager/Cargo.toml
@@ -27,7 +27,7 @@ eth2_wallet = { path = "../crypto/eth2_wallet" }
 eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
 rand = "0.7.3"
 validator_dir = { path = "../common/validator_dir" }
-tokio = { version = "0.3.2", features = ["full"] }
+tokio = { version = "0.3.5", features = ["full"] }
 eth2_keystore = { path = "../crypto/eth2_keystore" }
 account_utils = { path = "../common/account_utils" }
 slashing_protection = { path = "../validator_client/slashing_protection" }

diff --git a/beacon_node/client/Cargo.toml b/beacon_node/client/Cargo.toml
@@ -15,7 +15,7 @@ network = { path = "../network" }
 timer = { path = "../timer" }
 eth2_libp2p = { path = "../eth2_libp2p" }
 parking_lot = "0.11.0"
-prometheus = "0.10.0"
+prometheus = "0.11.0"
 types = { path = "../../consensus/types" }
 tree_hash = "0.1.1"
 eth2_config = { path = "../../common/eth2_config" }

diff --git a/beacon_node/eth2_libp2p/Cargo.toml b/beacon_node/eth2_libp2p/Cargo.toml
@@ -32,7 +32,7 @@ base64 = "0.13.0"
 snap = "1.0.1"
 void = "1.0.2"
 hex = "0.4.2"
-tokio-util = { version = "0.4.0", features = ["codec", "compat"] }
+tokio-util = { version = "0.4.0", features = ["codec", "compat", "time"] }
 tiny-keccak = "2.0.2"
 task_executor = { path = "../../common/task_executor" }
 rand = "0.7.3"

diff --git a/beacon_node/http_api/Cargo.toml b/beacon_node/http_api/Cargo.toml
@@ -25,12 +25,12 @@ lazy_static = "1.4.0"
 warp_utils = { path = "../../common/warp_utils" }
 slot_clock = { path = "../../common/slot_clock" }
 eth2_ssz = { path = "../../consensus/ssz" }
-bs58 = "0.3.1"
+bs58 = "0.4.0"
 futures = "0.3.8"
 
 [dev-dependencies]
 store = { path = "../store" }
 environment = { path = "../../lighthouse/environment" }
 tree_hash = "0.1.1"
-discv5 = { git = "https://github.com/sigp/discv5", rev = "f117b3ca56fa3dca2317270434634ff7106d391a", features = ["libp2p"] }
+discv5 = { version = "0.1.0-beta.2", features = ["libp2p"] }
 tokio-compat-02 = "0.1"
diff --git a/beacon_node/http_metrics/Cargo.toml b/beacon_node/http_metrics/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-prometheus = "0.10.0"
+prometheus = "0.11.0"
 warp = { git = "https://github.com/sigp/warp ", branch = "lighthouse" }
 serde = { version = "1.0.116", features = ["derive"] }
 slog = "2.5.2"

diff --git a/beacon_node/store/src/impls.rs b/beacon_node/store/src/impls.rs
@@ -15,7 +15,7 @@ impl<T: EthSpec> StoreItem for SignedBeaconBlock<T> {
 
         metrics::stop_timer(timer);
         metrics::inc_counter(&metrics::BEACON_BLOCK_WRITE_COUNT);
-        metrics::inc_counter_by(&metrics::BEACON_BLOCK_WRITE_BYTES, bytes.len() as i64);
+        metrics::inc_counter_by(&metrics::BEACON_BLOCK_WRITE_BYTES, bytes.len() as u64);
 
         bytes
     }
@@ -28,7 +28,7 @@ impl<T: EthSpec> StoreItem for SignedBeaconBlock<T> {
 
         metrics::stop_timer(timer);
         metrics::inc_counter(&metrics::BEACON_BLOCK_READ_COUNT);
-        metrics::inc_counter_by(&metrics::BEACON_BLOCK_READ_BYTES, len as i64);
+        metrics::inc_counter_by(&metrics::BEACON_BLOCK_READ_BYTES, len as u64);
 
         result
     }

diff --git a/beacon_node/store/src/impls/beacon_state.rs b/beacon_node/store/src/impls/beacon_state.rs
@@ -13,7 +13,7 @@ pub fn store_full_state<E: EthSpec>(
         let _overhead_timer = metrics::start_timer(&metrics::BEACON_STATE_WRITE_OVERHEAD_TIMES);
         StorageContainer::new(state).as_ssz_bytes()
     };
-    metrics::inc_counter_by(&metrics::BEACON_STATE_WRITE_BYTES, bytes.len() as i64);
+    metrics::inc_counter_by(&metrics::BEACON_STATE_WRITE_BYTES, bytes.len() as u64);
     metrics::inc_counter(&metrics::BEACON_STATE_WRITE_COUNT);
     let key = get_key_for_col(DBColumn::BeaconState.into(), state_root.as_bytes());
     ops.push(KeyValueStoreOp::PutKeyValue(key, bytes));
@@ -34,7 +34,7 @@ pub fn get_full_state<KV: KeyValueStore<E>, E: EthSpec>(
             metrics::stop_timer(overhead_timer);
             metrics::stop_timer(total_timer);
             metrics::inc_counter(&metrics::BEACON_STATE_READ_COUNT);
-            metrics::inc_counter_by(&metrics::BEACON_STATE_READ_BYTES, bytes.len() as i64);
+            metrics::inc_counter_by(&metrics::BEACON_STATE_READ_BYTES, bytes.len() as u64);
 
             Ok(Some(container.try_into()?))
         }

diff --git a/beacon_node/store/src/leveldb_store.rs b/beacon_node/store/src/leveldb_store.rs
@@ -61,7 +61,7 @@ impl<E: EthSpec> LevelDB<E> {
         let column_key = get_key_for_col(col, key);
 
         metrics::inc_counter(&metrics::DISK_DB_WRITE_COUNT);
-        metrics::inc_counter_by(&metrics::DISK_DB_WRITE_BYTES, val.len() as i64);
+        metrics::inc_counter_by(&metrics::DISK_DB_WRITE_BYTES, val.len() as u64);
         let timer = metrics::start_timer(&metrics::DISK_DB_WRITE_TIMES);
 
         self.db
@@ -103,7 +103,7 @@ impl<E: EthSpec> KeyValueStore<E> for LevelDB<E> {
             .map_err(Into::into)
             .map(|opt| {
                 opt.map(|bytes| {
-                    metrics::inc_counter_by(&metrics::DISK_DB_READ_BYTES, bytes.len() as i64);
+                    metrics::inc_counter_by(&metrics::DISK_DB_READ_BYTES, bytes.len() as u64);
                     metrics::stop_timer(timer);
                     bytes
                 })

diff --git a/common/hashset_delay/Cargo.toml b/common/hashset_delay/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 futures = "0.3.7"
-tokio-util = { version = "0.4.0", features = ["time"] }
+tokio-util = { version = "0.5.0", features = ["time"] }
 
 [dev-dependencies]
 tokio = { version = "0.3.2", features = ["time", "rt-multi-thread", "macros"] }
diff --git a/common/lighthouse_metrics/Cargo.toml b/common/lighthouse_metrics/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2018"
 
 [dependencies]
 lazy_static = "1.4.0"
-prometheus = "0.10.0"
+prometheus = "0.11.0"
diff --git a/common/lighthouse_metrics/src/lib.rs b/common/lighthouse_metrics/src/lib.rs
@@ -221,7 +221,7 @@ pub fn inc_counter_vec(int_counter_vec: &Result<IntCounterVec>, name: &[&str]) {
     }
 }
 
-pub fn inc_counter_vec_by(int_counter_vec: &Result<IntCounterVec>, name: &[&str], amount: i64) {
+pub fn inc_counter_vec_by(int_counter_vec: &Result<IntCounterVec>, name: &[&str], amount: u64) {
     if let Some(counter) = get_int_counter(int_counter_vec, name) {
         counter.inc_by(amount);
     }
@@ -276,7 +276,7 @@ pub fn inc_counter(counter: &Result<IntCounter>) {
     }
 }
 
-pub fn inc_counter_by(counter: &Result<IntCounter>, value: i64) {
+pub fn inc_counter_by(counter: &Result<IntCounter>, value: u64) {
     if let Ok(counter) = counter {
         counter.inc_by(value);
     }

diff --git a/common/rest_types/Cargo.toml b/common/rest_types/Cargo.toml
@@ -15,7 +15,7 @@ bls = { path = "../../crypto/bls" }
 serde = { version = "1.0.110", features = ["derive"] }
 rayon = "1.3.0"
 hyper = "0.13.5"
-tokio = { version = "0.2.22", features = ["sync"] }
+tokio = { version = "0.3.5", features = ["sync"] }
 environment = { path = "../../lighthouse/environment" }
 store = { path = "../../beacon_node/store" }
 beacon_chain = { path = "../../beacon_node/beacon_chain" }

diff --git a/consensus/int_to_bytes/Cargo.toml b/consensus/int_to_bytes/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Paul Hauner <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-bytes = "0.5.6"
+bytes = "0.6.0"
 
 [dev-dependencies]
 yaml-rust = "0.4.4"

diff --git a/consensus/state_processing/Cargo.toml b/consensus/state_processing/Cargo.toml
@@ -10,7 +10,7 @@ harness = false
 
 [dev-dependencies]
 criterion = "0.3.3"
-env_logger = "0.7.1"
+env_logger = "0.8.2"
 serde = "1.0.116"
 serde_derive = "1.0.116"
 lazy_static = "1.4.0"

diff --git a/crypto/eth2_keystore/Cargo.toml b/crypto/eth2_keystore/Cargo.toml
@@ -8,10 +8,10 @@ edition = "2018"
 
 [dependencies]
 rand = "0.7.3"
-aes-ctr = "0.5.0"
-hmac = "0.9.0"
-pbkdf2 = { version = "0.5.0", default-features = false }
-scrypt = { version = "0.4.1", default-features = false }
+aes-ctr = "0.6.0"
+hmac = "0.10.1"
+pbkdf2 = { version = "0.6.0", default-features = false }
+scrypt = { version = "0.5.0", default-features = false }
 sha2 = "0.9.1"
 uuid = { version = "0.8.1", features = ["serde", "v4"] }
 zeroize = { version = "1.1.1", features = ["zeroize_derive"] }

diff --git a/crypto/eth2_keystore/src/keystore.rs b/crypto/eth2_keystore/src/keystore.rs
@@ -7,8 +7,8 @@ use crate::json_keystore::{
     Kdf, KdfModule, Scrypt, Sha256Checksum, Version,
 };
 use crate::Uuid;
-use aes_ctr::stream_cipher::generic_array::GenericArray;
-use aes_ctr::stream_cipher::{NewStreamCipher, SyncStreamCipher};
+use aes_ctr::cipher::generic_array::GenericArray;
+use aes_ctr::cipher::{NewStreamCipher, SyncStreamCipher};
 use aes_ctr::Aes128Ctr as AesCtr;
 use bls::{Keypair, PublicKey, SecretKey, ZeroizeHash};
 use eth2_key_derivation::PlainText;

diff --git a/lighthouse/Cargo.toml b/lighthouse/Cargo.toml
@@ -22,7 +22,7 @@ sloggers = "1.0.1"
 types = { "path" = "../consensus/types" }
 bls = { path = "../crypto/bls" }
 clap = "2.33.3"
-env_logger = "0.7.1"
+env_logger = "0.8.2"
 logging = { path = "../common/logging" }
 slog-term = "2.6.0"
 slog-async = "2.5.0"

diff --git a/slasher/Cargo.toml b/slasher/Cargo.toml
@@ -24,7 +24,7 @@ slog = "2.5.2"
 sloggers = "*"
 slot_clock = { path = "../common/slot_clock" }
 task_executor = { path = "../common/task_executor" }
-tokio = { version = "0.2.21", features = ["full"] }
+tokio = { version = "0.3.5", features = ["full"] }
 tree_hash = { path = "../consensus/tree_hash" }
 tree_hash_derive = { path = "../consensus/tree_hash_derive" }
 types = { path = "../consensus/types" }

diff --git a/slasher/src/array.rs b/slasher/src/array.rs
@@ -620,7 +620,7 @@ pub fn update_array<E: EthSpec, T: TargetArrayChunk>(
     metrics::inc_counter_vec_by(
         &SLASHER_NUM_CHUNKS_UPDATED,
         &[T::name()],
-        updated_chunks.len() as i64,
+        updated_chunks.len() as u64,
     );
 
     for (chunk_index, chunk) in updated_chunks {

diff --git a/testing/simulator/Cargo.toml b/testing/simulator/Cargo.toml
@@ -15,7 +15,7 @@ parking_lot = "0.11.0"
 futures = "0.3.7"
 tokio = "0.3.2"
 eth1_test_rig = { path = "../eth1_test_rig" }
-env_logger = "0.7.1"
+env_logger = "0.8.2"
 clap = "2.33.3"
 rayon = "1.4.1"
 tokio-compat-02 = "0.1"
diff --git a/validator_client/Cargo.toml b/validator_client/Cargo.toml
@@ -60,6 +60,6 @@ serde_utils = { path = "../consensus/serde_utils" }
 libsecp256k1 = "0.3.5"
 ring = "0.16.12"
 rand = "0.7.3"
-scrypt = { version = "0.3.1", default-features = false }
+scrypt = { version = "0.5.0", default-features = false }
 lighthouse_metrics = { path = "../common/lighthouse_metrics" }
 lazy_static = "1.4.0"