diff --git a/Cargo.lock b/Cargo.lock index 53b0d01ea7..9ccf080924 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2103,8 +2103,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "incrementalmerkletree" -version = "0.5.1" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=337f59179eda51261e9ddfc6b18e8fb84ea277c9#337f59179eda51261e9ddfc6b18e8fb84ea277c9" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75346da3bd8e3d8891d02508245ed2df34447ca6637e343829f8d08986e9cde2" dependencies = [ "either", "proptest", @@ -2624,9 +2625,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orchard" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0462569fc8b0d1b158e4d640571867a4e4319225ebee2ab6647e60c70af19ae3" +checksum = "4dc7bde644aeb980be296cd908c6650894dc8541deb56f9f5294c52ed7ca568f" dependencies = [ "aes", "bitvec", @@ -2648,6 +2649,7 @@ dependencies = [ "serde", "subtle", "tracing", + "visibility", "zcash_note_encryption", "zcash_spec", "zip32", @@ -3641,9 +3643,9 @@ dependencies = [ [[package]] name = "sapling-crypto" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f4270033afcb0c74c5c7d59c73cfd1040367f67f224fe7ed9a919ae618f1b7" +checksum = "15e379398fffad84e49f9a45a05635fc004f66086e65942dbf4eb95332c26d2a" dependencies = [ "aes", "bellman", @@ -3903,8 +3905,9 @@ dependencies = [ [[package]] name = "shardtree" -version = "0.3.1" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=337f59179eda51261e9ddfc6b18e8fb84ea277c9#337f59179eda51261e9ddfc6b18e8fb84ea277c9" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78222845cd8bbe5eb95687407648ff17693a35de5e8abaa39a4681fb21e033f9" dependencies = [ "assert_matches", "bitflags 2.6.0", @@ -5342,6 +5345,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "visibility" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3fd98999db9227cf28e59d83e1f120f42bc233d4b152e8fab9bc87d5bb1e0f8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.63", +] + [[package]] name = "void" version = "1.0.2" diff --git a/Cargo.toml b/Cargo.toml index 37e0374db7..dfed1413b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,8 +47,8 @@ zcash_proofs = { version = "0.15", path = "zcash_proofs", default-features = fal bellman = { version = "0.14", default-features = false, features = ["groth16"] } ff = "0.13" group = "0.13" -incrementalmerkletree = "0.5.1" -shardtree = "0.3.1" +incrementalmerkletree = "0.6" +shardtree = "0.4" zcash_spec = "0.1" # Payment protocols @@ -57,11 +57,11 @@ bitvec = "1" blake2s_simd = "1" bls12_381 = "0.8" jubjub = "0.10" -sapling = { package = "sapling-crypto", version = "0.1.3", default-features = false } +sapling = { package = "sapling-crypto", version = "0.2", default-features = false } # - Orchard nonempty = "0.7" -orchard = { version = "0.8.0", default-features = false } +orchard = { version = "0.9.0", default-features = false } pasta_curves = "0.5" # - Transparent @@ -155,7 +155,3 @@ zip32 = "0.1.1" lto = true panic = 'abort' codegen-units = 1 - -[patch.crates-io] -incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" } -shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" } diff --git a/zcash_primitives/CHANGELOG.md b/zcash_primitives/CHANGELOG.md index 1f1ccc99ed..78e8a6d138 100644 --- a/zcash_primitives/CHANGELOG.md +++ b/zcash_primitives/CHANGELOG.md @@ -25,7 +25,8 @@ and this library adheres to Rust's notion of ### Changed - MSRV is now 1.70.0. -- Bumped dependencies to `secp256k1 0.27`. +- Bumped dependencies to `secp256k1 0.27`, `incrementalmerkletree 0.6`, + `orchard 0.9`, `sapling-crypto 0.2`. - `zcash_primitives::legacy::keys`: - `AccountPrivKey::{from_bytes, to_bytes}` now use the byte encoding from the inside of a `xprv` Base58 string encoding from BIP 32, excluding the prefix