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 )
This commit is contained in:
@@ -14,7 +14,7 @@ serde_derive = "1.0.116"
|
||||
serde_utils = { path = "../../consensus/serde_utils" }
|
||||
hex = "0.4.2"
|
||||
eth2_hashing = "0.1.0"
|
||||
ethereum-types = "0.9.2"
|
||||
ethereum-types = "0.11.0"
|
||||
arbitrary = { version = "0.4.6", features = ["derive"], optional = true }
|
||||
zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
|
||||
blst = "0.3.3"
|
||||
|
||||
@@ -8,9 +8,9 @@ edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
rand = "0.7.3"
|
||||
hmac = "0.10.1"
|
||||
pbkdf2 = { version = "0.6.0", default-features = false }
|
||||
scrypt = { version = "0.5.0", default-features = false }
|
||||
hmac = "0.11.0"
|
||||
pbkdf2 = { version = "0.8.0", default-features = false }
|
||||
scrypt = { version = "0.7.0", default-features = false }
|
||||
sha2 = "0.9.1"
|
||||
uuid = { version = "0.8.1", features = ["serde", "v4"] }
|
||||
zeroize = { version = "1.1.1", features = ["zeroize_derive"] }
|
||||
|
||||
@@ -67,9 +67,8 @@ pub enum Prf {
|
||||
impl Prf {
|
||||
pub fn mac(&self, password: &[u8]) -> impl Mac {
|
||||
match &self {
|
||||
Prf::HmacSha256 => {
|
||||
Hmac::<Sha256>::new_varkey(password).expect("Could not derive HMAC using SHA256.")
|
||||
}
|
||||
Prf::HmacSha256 => Hmac::<Sha256>::new_from_slice(password)
|
||||
.expect("Could not derive HMAC using SHA256."),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@ use pbkdf2::pbkdf2;
|
||||
use rand::prelude::*;
|
||||
use scrypt::{
|
||||
errors::{InvalidOutputLen, InvalidParams},
|
||||
scrypt, ScryptParams,
|
||||
scrypt, Params as ScryptParams,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sha2::{Digest, Sha256};
|
||||
|
||||
Reference in New Issue
Block a user