From bb6c3a6a1a68ac1da27d85c18a6cf69fd1078b4b Mon Sep 17 00:00:00 2001 From: Daira-Emma Hopwood Date: Tue, 14 May 2024 10:12:50 +0100 Subject: [PATCH 1/3] Revert "ZIP 339 support." This reverts commit d1443e5049c32615155eaed0e36915dbe5222f6b. Signed-off-by: Daira-Emma Hopwood --- zcash_primitives/Cargo.toml | 3 --- zcash_primitives/src/lib.rs | 1 - zcash_primitives/src/zip339.rs | 5 ----- 3 files changed, 9 deletions(-) delete mode 100644 zcash_primitives/src/zip339.rs diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index b8f24b84c..875037181 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -63,9 +63,6 @@ hdwallet = { workspace = true, optional = true } # - `SecretKey` and `PublicKey` types exposed secp256k1 = { workspace = true, optional = true } -# - ZIP 339 -bip0039 = { version = "0.10", features = ["std", "all-languages"] } - # Dependencies used internally: # (Breaking upgrades to these are usually backwards-compatible, but check MSRVs.) # - Documentation diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs index f514fb177..cb163501d 100644 --- a/zcash_primitives/src/lib.rs +++ b/zcash_primitives/src/lib.rs @@ -28,4 +28,3 @@ pub mod transaction; pub use zip32; #[cfg(zcash_unstable = "zfuture")] pub mod extensions; -pub mod zip339; diff --git a/zcash_primitives/src/zip339.rs b/zcash_primitives/src/zip339.rs deleted file mode 100644 index 3fcf2e610..000000000 --- a/zcash_primitives/src/zip339.rs +++ /dev/null @@ -1,5 +0,0 @@ -//! [ZIP 339] for seed phrase support. -//! -//! [ZIP 339]: https://zips.z.cash/zip-0339 - -pub use bip0039::{Count, Error, Language, Mnemonic}; From 69618195763954f4f34a30cebc51f2413e174efd Mon Sep 17 00:00:00 2001 From: Daira-Emma Hopwood Date: Tue, 14 May 2024 10:19:59 +0100 Subject: [PATCH 2/3] Document the removal of `zcash_primitives::zip339` in the CHANGELOG. Signed-off-by: Daira-Emma Hopwood --- zcash_primitives/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 9e9c55749..eef0c1e1a 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -7,6 +7,11 @@ and this library adheres to Rust's notion of ## [Unreleased] +### Removed +- The `zcash_primitives::zip339` module, which reexported parts of the API of + the `bip0039` crate, has been removed. Use the `bip0039` crate directly + instead. + ## [0.15.0] - 2024-03-25 ### Added From 031b416b75bb7e654504b4dbdeeec3262dfc8e10 Mon Sep 17 00:00:00 2001 From: Daira-Emma Hopwood Date: Thu, 16 May 2024 00:16:54 +0100 Subject: [PATCH 3/3] Update `Cargo.lock`. Signed-off-by: Daira-Emma Hopwood --- Cargo.lock | 61 ------------------------------------------------------ 1 file changed, 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5fc9e6bab..771b62220 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -212,12 +212,6 @@ version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" -[[package]] -name = "base64ct" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" - [[package]] name = "bech32" version = "0.9.1" @@ -245,20 +239,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "bip0039" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef0f0152ec5cf17f49a5866afaa3439816207fd4f0a224c0211ffaf5e278426" -dependencies = [ - "hmac", - "pbkdf2", - "rand", - "sha2", - "unicode-normalization", - "zeroize", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -635,7 +615,6 @@ checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", - "subtle", ] [[package]] @@ -1009,15 +988,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - [[package]] name = "home" version = "0.5.5" @@ -1557,17 +1527,6 @@ dependencies = [ "windows-targets", ] -[[package]] -name = "password-hash" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - [[package]] name = "pasta_curves" version = "0.5.1" @@ -1583,16 +1542,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "pbkdf2" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" -dependencies = [ - "digest", - "password-hash", -] - [[package]] name = "percent-encoding" version = "2.3.0" @@ -2681,15 +2630,6 @@ version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - [[package]] name = "universal-hash" version = "0.5.1" @@ -3198,7 +3138,6 @@ version = "0.15.0" dependencies = [ "aes", "assert_matches", - "bip0039", "blake2b_simd", "byteorder", "chacha20poly1305",