Merge pull request #881 from zancas/bip0039_to_zip339

Bip0039 to zip339
zingolabs · Apr 3, 2024 · 409fe89 · 409fe89
2 parents 770f3b0 + 508e290
commit 409fe89
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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,

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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};