Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bip0039 to zip339 #881

Merged
merged 3 commits into from
Apr 3, 2024
Merged

Bip0039 to zip339 #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42c802f
make http unify as workspace dep
zancas Apr 2, 2024
f3cc5de
update Cargo.lock
zancas Apr 2, 2024
508e290
remove direct dependence on bip0039, prefer zcash_primitives::zip339 …
zancas Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion darkside-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion integration-tests/tests/integrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion zingo-testutils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion zingoconfig/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 1 addition & 2 deletions zingolib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion zingolib/src/wallet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion zingolib/src/wallet/keys/unified.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading