From f0c933915394335a1313e5aca233a62c32a0dfce Mon Sep 17 00:00:00 2001 From: realbigsean Date: Thu, 12 Nov 2020 00:46:33 +0000 Subject: [PATCH] Update tiny-bip39 dependency (#1887) ## Issue Addressed Resolves #1704 ## Proposed Changes Update tiny-bip39 from using the sigp fork to the newly released v0.8.0 in the upstream. Co-authored-by: realbigsean --- Cargo.lock | 46 ++++++----------------------------- crypto/eth2_wallet/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 39 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5641cda509..f4a29bf6b55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1884,28 +1884,6 @@ dependencies = [ "futures 0.3.7", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "fake-simd" version = "0.1.2" @@ -4097,16 +4075,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "pbkdf2" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" -dependencies = [ - "byteorder", - "crypto-mac 0.7.0", -] - [[package]] name = "pbkdf2" version = "0.4.0" @@ -5930,16 +5898,18 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.7.3" -source = "git+https://github.com/sigp/tiny-bip39.git?rev=1137c32da91bd5e75db4305a84ddd15255423f7f#1137c32da91bd5e75db4305a84ddd15255423f7f" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9e44c4759bae7f1032e286a7ef990bd9ed23fe831b7eeba0beb97484c2e59b8" dependencies = [ - "failure", - "hmac 0.7.1", + "anyhow", + "hmac 0.8.1", "once_cell", - "pbkdf2 0.3.0", + "pbkdf2 0.4.0", "rand 0.7.3", "rustc-hash", - "sha2 0.8.2", + "sha2 0.9.2", + "thiserror", "unicode-normalization", "zeroize", ] diff --git a/crypto/eth2_wallet/Cargo.toml b/crypto/eth2_wallet/Cargo.toml index e34ee1730f0..2f25a752400 100644 --- a/crypto/eth2_wallet/Cargo.toml +++ b/crypto/eth2_wallet/Cargo.toml @@ -14,7 +14,7 @@ uuid = { version = "0.8.1", features = ["serde", "v4"] } rand = "0.7.3" eth2_keystore = { path = "../eth2_keystore" } eth2_key_derivation = { path = "../eth2_key_derivation" } -tiny-bip39 = { git = "https://github.com/sigp/tiny-bip39.git", rev = "1137c32da91bd5e75db4305a84ddd15255423f7f" } +tiny-bip39 = "0.8.0" [dev-dependencies] hex = "0.4.2"