Merge pull request #843 from zancas/dependabot_updates

Dependabot updates

Cargo.toml

@@ -35,10 +35,12 @@ shardtree = "0.2"
 build_utils = { path = "./build_utils" }
 http = "0.2.4"
 hyper = { version = "0.14", features = ["full"] }
+hyper-rustls = { version = "0.23", features = ["http2"] }
 http-body = "0.4.4"
 tonic = {version = "0.10.0", features = ["tls", "tls-roots", "tls-webpki-roots"]}
 prost = "0.12.0"
 tower = { version = "0.4" }
+hex = "0.4"
 
 [profile.release]
 debug = false

darkside-tests/Cargo.toml

@@ -18,17 +18,16 @@ tonic = { workspace = true }
 prost = { workspace = true }
 tower = { workspace = true }
 http-body = { workspace = true }
+hex = { workspace = true }
 
 zcash_primitives = { workspace = true }
 tempdir = { workspace = true }
 portpicker = { workspace = true }
 env_logger = "0.10.0"
 bech32 = "0.9.0"
 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"

integration-tests/Cargo.toml

@@ -18,8 +18,7 @@ shardtree = { workspace = true }
 tokio = { version = "1.25.0", features = ["full"] }
 json = "0.12.4"
 log = "0.4.17"
-hex = "0.3"
+hex = { workspace = true }
 itertools = "0.10.5"
-bip0039 = "0.10.1"
 serde_json = "1.0.107"
 http.workspace = true

integration-tests/tests/integrations.rs

@@ -1,13 +1,13 @@
 #![forbid(unsafe_code)]
 
-use bip0039::Mnemonic;
 use json::JsonValue;
 use orchard::tree::MerkleHashOrchard;
 use shardtree::store::memory::MemoryShardStore;
 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,

zingocli/Cargo.toml

@@ -10,13 +10,13 @@ zingo-testutils = { path = "../zingo-testutils" }
 
 clap = { workspace = true }
 http = { workspace = true }
+hyper-rustls = { workspace = true }
 
 rustyline = "11.0.0"
 log = "0.4.17"
 shellwords = "1.1.0"
 futures = "0.3.15"
 rustls-pemfile = "1.0.0"
-hyper-rustls = { version = "0.23", features = ["http2"] }
 tokio =  { version = "1.24.2", features = ["full"] }
 tokio-stream = "0.1.6"
 tokio-rustls = "0.23.3"

zingolib/Cargo.toml

@@ -35,6 +35,7 @@ zcash_encoding = { workspace = true }
 zcash_note_encryption = { workspace = true }
 zcash_primitives = { workspace = true }
 zcash_proofs = { workspace = true }
+hyper-rustls = { workspace = true }
 
 append-only-vec = { git = "/~https://github.com/zancas/append-only-vec.git", branch = "add_debug_impl" }
 
@@ -44,7 +45,6 @@ log4rs = "1.1.1"
 base64 = "0.13.0"
 bytes = "0.4"
 rand = "0.8.5"
-hyper-rustls = { version = "0.23", features = ["http2"] }
 serde_json = "1.0.82"
 tokio =  { version = "1.24.2", features = ["full"] }
 tokio-stream = "0.1.6"
@@ -53,7 +53,7 @@ reqwest = { version = "0.11", features = ["json"] }
 rustls-pemfile = "1.0.0"
 tower-http = { version = "0.2", features = ["add-extension"] }
 futures = { workspace = true }
-hex = "0.3"
+hex = { workspace = true }
 ring = "0.17.0"
 json = "0.12.4"
 webpki-roots = "0.21.0"
@@ -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"
@@ -73,7 +72,7 @@ bls12_381 = "0.8"
 group = "0.13"
 rust-embed = { version = "6.3.0", features = ["debug-embed"] }
 subtle = "2.4.1"
-nonempty = "0.7.0"
+nonempty = "0.7"
 tracing-subscriber = "0.3.15"
 tracing = "0.1.36"
 indoc = "2.0.1"

zingolib/src/wallet.rs

@@ -5,7 +5,6 @@ use crate::wallet::data::{SpendableSaplingNote, TransactionRecord};
 use crate::wallet::notes::NoteInterface;
 use crate::wallet::notes::ShieldedNoteInterface;
 
-use bip0039::Mnemonic;
 use byteorder::{LittleEndian, ReadBytesExt, WriteBytesExt};
 use futures::Future;
 use json::JsonValue;
@@ -38,6 +37,7 @@ use zcash_primitives::transaction::builder::{BuildResult, Progress};
 use zcash_primitives::transaction::components::amount::NonNegativeAmount;
 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,
@@ -216,7 +216,7 @@ pub struct LightWallet {
     // will start from here.
     birthday: AtomicU64,
 
-    /// The seed for the wallet, stored as a bip0039 Mnemonic, and the account index.
+    /// The seed for the wallet, stored as a zip339 Mnemonic, and the account index.
     /// Can be `None` in case of wallet without spending capability
     /// or created directly from spending keys.
     mnemonic: Option<(Mnemonic, u32)>,

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};