diff --git a/Cargo.toml b/Cargo.toml index d69194a35..044d879e9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,9 +17,3 @@ members = [ lto = true panic = 'abort' codegen-units = 1 - -[patch.crates-io] -zcash_encoding = { path = "components/zcash_encoding" } -zcash_note_encryption = { path = "components/zcash_note_encryption" } -incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "2dbdd345670ea22337a0efa6734272d54551285f" } -orchard = { git = "https://github.com/zcash/orchard.git", rev = "35054e85b85dc144b4572ed0fd57ea164f50c26a" } diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index 24abf39f5..57e2e9085 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/zcash_client_backend/CHANGELOG.md @@ -9,13 +9,21 @@ and this library adheres to Rust's notion of ### Added - `impl Eq for zcash_client_backend::address::RecipientAddress` - `impl Eq for zcash_client_backend::zip321::{Payment, TransactionRequest}` +- `data_api::NullifierQuery` for use with `WalletRead::get_sapling_nullifiers` ### Changed - MSRV is now 1.65.0. -- Bumped dependencies to `hdwallet 0.4`. +- Bumped dependencies to `hdwallet 0.4`, `zcash_note_encryption 0.4`, + `incrementalmerkletree 0.4`, `orchard 0.5` - `WalletRead::get_memo` now returns `Result, Self::Error>` instead of `Result` in order to make representable wallet states where the full note plaintext is not available. +- `WalletRead::get_nullifiers` has been renamed to `WalletRead::get_sapling_nullifiers` + and its signature has changed; it now subsumes the removed `WalletRead::get_all_nullifiers`. +- `wallet::SpendableNote` has been renamed to `wallet::ReceivedSaplingNote`. + +### Removed +- `WalletRead::get_all_nullifiers` ## [0.9.0] - 2023-04-28 ### Added diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index 5a98291c8..803656a7f 100644 --- a/zcash_client_backend/Cargo.toml +++ b/zcash_client_backend/Cargo.toml @@ -20,10 +20,10 @@ exclude = ["*.proto"] development = ["zcash_proofs"] [dependencies] -incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } +incrementalmerkletree = { version = "0.4", features = ["legacy-api"] } zcash_address = { version = "0.2", path = "../components/zcash_address" } zcash_encoding = { version = "0.2", path = "../components/zcash_encoding" } -zcash_note_encryption = "0.3" +zcash_note_encryption = "0.4" zcash_primitives = { version = "0.11", path = "../zcash_primitives", default-features = false } # Dependencies exposed in a public API: @@ -54,7 +54,7 @@ subtle = "2.2.3" # - Shielded protocols bls12_381 = "0.8" group = "0.13" -orchard = { version = "0.4", default-features = false } +orchard = { version = "0.5", default-features = false } # - Test dependencies proptest = { version = "1.0.0", optional = true } diff --git a/zcash_client_backend/src/welding_rig.rs b/zcash_client_backend/src/welding_rig.rs index 83e880c3d..1906c133e 100644 --- a/zcash_client_backend/src/welding_rig.rs +++ b/zcash_client_backend/src/welding_rig.rs @@ -91,7 +91,7 @@ impl ScanningKey for DiversifiableFullViewingKey { ) -> Self::Nf { note.nf( key, - u64::try_from(witness.tip_position()) + u64::try_from(witness.position()) .expect("Sapling note commitment tree position must fit into a u64"), ) } diff --git a/zcash_client_sqlite/CHANGELOG.md b/zcash_client_sqlite/CHANGELOG.md index 32930d34c..a43c020e4 100644 --- a/zcash_client_sqlite/CHANGELOG.md +++ b/zcash_client_sqlite/CHANGELOG.md @@ -8,7 +8,7 @@ and this library adheres to Rust's notion of ## [Unreleased] ### Changed - MSRV is now 1.65.0. -- Bumped dependencies to `hdwallet 0.4`. +- Bumped dependencies to `hdwallet 0.4`, `incrementalmerkletree 0.4` ### Removed - The empty `wallet::transact` module has been removed. diff --git a/zcash_client_sqlite/Cargo.toml b/zcash_client_sqlite/Cargo.toml index 3609a236d..7c810acb2 100644 --- a/zcash_client_sqlite/Cargo.toml +++ b/zcash_client_sqlite/Cargo.toml @@ -14,7 +14,7 @@ edition = "2021" rust-version = "1.65" [dependencies] -incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } +incrementalmerkletree = { version = "0.4", features = ["legacy-api"] } zcash_client_backend = { version = "0.9", path = "../zcash_client_backend" } zcash_primitives = { version = "0.11", path = "../zcash_primitives", default-features = false } @@ -51,7 +51,7 @@ proptest = "1.0.0" rand_core = "0.6" regex = "1.4" tempfile = "3.5.0" -zcash_note_encryption = "0.3" +zcash_note_encryption = "0.4" zcash_proofs = { version = "0.11", path = "../zcash_proofs" } zcash_primitives = { version = "0.11", path = "../zcash_primitives", features = ["test-dependencies"] } zcash_address = { version = "0.2", path = "../components/zcash_address", features = ["test-dependencies"] } diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 7fa177162..d0c34e86c 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -17,7 +17,8 @@ and this library adheres to Rust's notion of ### Changed - MSRV is now 1.65.0. -- Bumped dependencies to `secp256k1 0.26`, `hdwallet 0.4`. +- Bumped dependencies to `secp256k1 0.26`, `hdwallet 0.4`, `incrementalmerkletree 0.4` + `zcash_note_encryption 0.4`, `orchard 0.5` ### Removed - `merkle_tree::Hashable` has been removed and its uses have been replaced by diff --git a/zcash_primitives/Cargo.toml b/zcash_primitives/Cargo.toml index 4a6cc82bb..0e5bc6b3c 100644 --- a/zcash_primitives/Cargo.toml +++ b/zcash_primitives/Cargo.toml @@ -44,10 +44,10 @@ ff = "0.13" group = { version = "0.13", features = ["wnaf-memuse"] } jubjub = "0.10" nonempty = "0.7" -orchard = { version = "0.4", default-features = false } +orchard = { version = "0.5", default-features = false } # - Note Commitment Trees -incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } +incrementalmerkletree = { version = "0.4", features = ["legacy-api"] } # - Static constants lazy_static = "1" @@ -82,17 +82,17 @@ aes = "0.8" fpe = "0.6" [dependencies.zcash_note_encryption] -version = "0.3" +version = "0.4" features = ["pre-zip-212"] [dev-dependencies] chacha20poly1305 = "0.10" criterion = "0.4" -incrementalmerkletree = { version = "0.3", features = ["legacy-api", "test-dependencies"] } +incrementalmerkletree = { version = "0.4", features = ["legacy-api", "test-dependencies"] } proptest = "1.0.0" assert_matches = "1.3.0" rand_xorshift = "0.3" -orchard = { version = "0.4", default-features = false, features = ["test-dependencies"] } +orchard = { version = "0.5", default-features = false, features = ["test-dependencies"] } [target.'cfg(unix)'.dev-dependencies] pprof = { version = "0.11", features = ["criterion", "flamegraph"] } # MSRV 1.56 diff --git a/zcash_proofs/CHANGELOG.md b/zcash_proofs/CHANGELOG.md index 439520bc1..00c628dbe 100644 --- a/zcash_proofs/CHANGELOG.md +++ b/zcash_proofs/CHANGELOG.md @@ -7,6 +7,7 @@ and this library adheres to Rust's notion of ## [Unreleased] ### Changed +- Bumped dependencies to `incrementalmerkletree 0.4`, `zcash_primitives 0.12` - MSRV is now 1.65.0. ### Removed diff --git a/zcash_proofs/Cargo.toml b/zcash_proofs/Cargo.toml index 7675bac8b..5a3fdfdfd 100644 --- a/zcash_proofs/Cargo.toml +++ b/zcash_proofs/Cargo.toml @@ -24,7 +24,7 @@ zcash_primitives = { version = "0.11", path = "../zcash_primitives", default-fea bellman = { version = "0.14", default-features = false, features = ["groth16"] } bls12_381 = "0.8" group = "0.13" -incrementalmerkletree = { version = "0.3", features = ["legacy-api"] } +incrementalmerkletree = { version = "0.4", features = ["legacy-api"] } jubjub = "0.10" lazy_static = "1" minreq = { version = "2", features = ["https"], optional = true }