diff --git a/Cargo.lock b/Cargo.lock index 4104cfcd2..bdde85f12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -651,7 +651,6 @@ name = "darkside-tests" version = "0.1.0" dependencies = [ "bech32", - "bip0039", "env_logger", "futures-util", "hex 0.3.2", @@ -1409,7 +1408,6 @@ dependencies = [ name = "integration-tests" version = "0.2.0" dependencies = [ - "bip0039", "hex 0.3.2", "itertools 0.10.5", "json", @@ -2939,9 +2937,9 @@ checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" [[package]] name = "strsim" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" @@ -4113,7 +4111,6 @@ dependencies = [ "base58", "base64 0.13.1", "bech32", - "bip0039", "bls12_381", "build_utils", "byteorder", diff --git a/darkside-tests/Cargo.toml b/darkside-tests/Cargo.toml index 1189662e7..e2c1352e8 100644 --- a/darkside-tests/Cargo.toml +++ b/darkside-tests/Cargo.toml @@ -28,7 +28,6 @@ rand = "0.8.5" hex = "0.3" tracing-subscriber = "0.3.15" itertools = "0.10.5" -bip0039 = "0.10.1" tracing-test = { version = "0.2.4", features = ["no-env-filter"] } tracing = "0.1.37" tracing-log = "0.1.3" diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index f7eaec16b..a8ea138fa 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -20,5 +20,4 @@ json = "0.12.4" log = "0.4.17" hex = "0.3" itertools = "0.10.5" -bip0039 = "0.10.1" serde_json = "1.0.107" diff --git a/integration-tests/tests/integrations.rs b/integration-tests/tests/integrations.rs index a3ed9c46f..cd1f72d81 100644 --- a/integration-tests/tests/integrations.rs +++ b/integration-tests/tests/integrations.rs @@ -1,6 +1,5 @@ #![forbid(unsafe_code)] -use bip0039::Mnemonic; use json::JsonValue; use orchard::tree::MerkleHashOrchard; use shardtree::store::memory::MemoryShardStore; @@ -8,6 +7,7 @@ use shardtree::ShardTree; use std::{fs::File, path::Path, str::FromStr, time::Duration}; use zcash_address::unified::Fvk; use zcash_client_backend::encoding::encode_payment_address; +use zcash_primitives::zip339::Mnemonic; use zcash_primitives::{ consensus::{BlockHeight, Parameters}, memo::Memo, diff --git a/zingo-testutils/Cargo.toml b/zingo-testutils/Cargo.toml index 770757c45..a7f90ae75 100644 --- a/zingo-testutils/Cargo.toml +++ b/zingo-testutils/Cargo.toml @@ -25,7 +25,7 @@ incrementalmerkletree = { workspace = true } json = "0.12.4" log = "0.4.19" tokio = "1.28.2" -http = "0.2.4" +http.workspace = true tonic = { workspace = true, optional = true } tracing = "0.1.37" serde_json = "1.0.100" diff --git a/zingoconfig/Cargo.toml b/zingoconfig/Cargo.toml index 2f9b7e328..7b57c9347 100644 --- a/zingoconfig/Cargo.toml +++ b/zingoconfig/Cargo.toml @@ -11,5 +11,5 @@ zcash_primitives = { workspace = true } log4rs = "1.1.1" log = "0.4.14" -http = "0.2.4" +http.workspace = true dirs = "5.0" diff --git a/zingolib/Cargo.toml b/zingolib/Cargo.toml index 395ca65e0..246641c22 100644 --- a/zingolib/Cargo.toml +++ b/zingolib/Cargo.toml @@ -39,7 +39,7 @@ zcash_proofs = { workspace = true } append-only-vec = { git = "https://github.com/zancas/append-only-vec.git", branch = "add_debug_impl" } log = "0.4.14" -http = "0.2.4" +http.workspace = true log4rs = "1.1.1" base64 = "0.13.0" bytes = "0.4" @@ -63,7 +63,6 @@ ripemd160 = "0.9.1" sha2 = "0.9.5" base58 = "0.1.0" bech32 = "0.9.0" -bip0039 = "0.10.1" sodiumoxide = "0.2.5" byteorder = "1" pairing = "0.23" diff --git a/zingolib/src/wallet.rs b/zingolib/src/wallet.rs index 288041876..b62c7b36d 100644 --- a/zingolib/src/wallet.rs +++ b/zingolib/src/wallet.rs @@ -4,7 +4,6 @@ use crate::blaze::fetch_full_transaction::TransactionContext; use crate::wallet::data::{SpendableSaplingNote, TransactionRecord}; use crate::wallet::notes::ShieldedNoteInterface; -use bip0039::Mnemonic; use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt}; use futures::Future; use json::JsonValue; @@ -36,6 +35,7 @@ use zcash_primitives::sapling::SaplingIvk; use zcash_primitives::transaction::builder::Progress; use zcash_primitives::transaction::fees::fixed::FeeRule as FixedFeeRule; use zcash_primitives::transaction::{self, Transaction}; +use zcash_primitives::zip339::Mnemonic; use zcash_primitives::{ consensus::BlockHeight, legacy::Script, diff --git a/zingolib/src/wallet/keys/unified.rs b/zingolib/src/wallet/keys/unified.rs index d981b29e4..f02a44f86 100644 --- a/zingolib/src/wallet/keys/unified.rs +++ b/zingolib/src/wallet/keys/unified.rs @@ -6,9 +6,9 @@ use std::{ }; use append_only_vec::AppendOnlyVec; -use bip0039::Mnemonic; use byteorder::{ReadBytesExt, WriteBytesExt}; use orchard::keys::Scope; +use zcash_primitives::zip339::Mnemonic; use secp256k1::SecretKey; use zcash_address::unified::{Container, Encoding, Fvk, Ufvk};