diff --git a/Cargo.lock b/Cargo.lock index bdb79d1227..132034f8a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2121,8 +2121,9 @@ dependencies = [ [[package]] name = "incrementalmerkletree-testing" -version = "0.1.0" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=336452152536dde5831c9a4029fd26b4ec310608#336452152536dde5831c9a4029fd26b4ec310608" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc7fb094e413bc6daea7b30a6f2c749e47fd07e98691c6ef3b3423d4ef4b7fb6" dependencies = [ "incrementalmerkletree", "proptest", @@ -3920,8 +3921,9 @@ dependencies = [ [[package]] name = "shardtree" -version = "0.4.0" -source = "git+https://github.com/zcash/incrementalmerkletree?rev=336452152536dde5831c9a4029fd26b4ec310608#336452152536dde5831c9a4029fd26b4ec310608" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5f2390975ebfe8838f9e861f7a588123d49a7a7a0a08568ea831d8ad53fc9b4" dependencies = [ "assert_matches", "bitflags 2.6.0", @@ -5830,7 +5832,7 @@ dependencies = [ [[package]] name = "zcash_client_backend" -version = "0.13.0" +version = "0.14.0" dependencies = [ "ambassador", "arti-client", diff --git a/Cargo.toml b/Cargo.toml index c20e8d5a7f..034768db41 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ categories = ["cryptography::cryptocurrencies"] # Intra-workspace dependencies equihash = { version = "0.2", path = "components/equihash" } zcash_address = { version = "0.6", path = "components/zcash_address" } -zcash_client_backend = { version = "0.13", path = "zcash_client_backend" } +zcash_client_backend = { version = "0.14", path = "zcash_client_backend" } zcash_encoding = { version = "0.2.1", path = "components/zcash_encoding" } zcash_keys = { version = "0.4", path = "zcash_keys" } zcash_protocol = { version = "0.4", path = "components/zcash_protocol" } @@ -48,7 +48,7 @@ bellman = { version = "0.14", default-features = false, features = ["groth16"] } ff = "0.13" group = "0.13" incrementalmerkletree = "0.7" -shardtree = "0.4" +shardtree = "0.5" zcash_spec = "0.1" # Payment protocols @@ -139,7 +139,7 @@ criterion = "0.5" proptest = "1" rand_chacha = "0.3" rand_xorshift = "0.3" -incrementalmerkletree-testing = "0.1" +incrementalmerkletree-testing = "0.2" # Tor # - `arti-client` depends on `rusqlite`, and a version mismatch there causes a compilation @@ -161,7 +161,3 @@ codegen-units = 1 [workspace.lints.rust] unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zfuture"))'] } - -[patch.crates-io] -incrementalmerkletree-testing = { git = "https://github.com/zcash/incrementalmerkletree", rev = "336452152536dde5831c9a4029fd26b4ec310608" } -shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "336452152536dde5831c9a4029fd26b4ec310608" } diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock index 29d4079aa8..c4520438d4 100644 --- a/supply-chain/imports.lock +++ b/supply-chain/imports.lock @@ -1,6 +1,14 @@ # cargo-vet imports lock +[[unpublished.zcash_client_backend]] +version = "0.14.0" +audited_as = "0.13.0" + +[[unpublished.zcash_keys]] +version = "0.4.0" +audited_as = "0.3.0" + [[publisher.bumpalo]] version = "3.16.0" when = "2024-04-08" @@ -55,6 +63,13 @@ user-id = 169181 user-login = "nuttycom" user-name = "Kris Nuttycombe" +[[publisher.incrementalmerkletree-testing]] +version = "0.2.0" +when = "2024-10-04" +user-id = 169181 +user-login = "nuttycom" +user-name = "Kris Nuttycombe" + [[publisher.orchard]] version = "0.10.0" when = "2024-10-02" @@ -76,6 +91,13 @@ user-id = 169181 user-login = "nuttycom" user-name = "Kris Nuttycombe" +[[publisher.shardtree]] +version = "0.5.0" +when = "2024-10-04" +user-id = 169181 +user-login = "nuttycom" +user-name = "Kris Nuttycombe" + [[publisher.unicode-normalization]] version = "0.1.23" when = "2024-02-20" diff --git a/zcash_client_backend/CHANGELOG.md b/zcash_client_backend/CHANGELOG.md index 6568da041b..769a7664c1 100644 --- a/zcash_client_backend/CHANGELOG.md +++ b/zcash_client_backend/CHANGELOG.md @@ -7,14 +7,41 @@ and this library adheres to Rust's notion of ## [Unreleased] +## [0.14.0] - 2024-10-04 + ### Added - `zcash_client_backend::data_api`: - `GAP_LIMIT` - `WalletSummary::recovery_progress` + - `SpendableNotes::{take_sapling, take_orchard}` + - Tests and testing infrastructure have been migrated from the + `zcash_client_sqlite` internal tests to the `testing` module, and have been + generalized so that they may be used for testing arbitrary implementations + of the `zcash_client_backend::data_api` interfaces. The following have been + added under the `test-dependencies` feature flag as part of this migration: + - `WalletTest` + - `testing::AddressType` + - `testing::CachedBlock` + - `testing::DataStoreFactory` + - `testing::FakeCompactOutput` + - `testing::InitialChainState` + - `testing::NoteCommitments` + - `testing::Reset` + - `testing::TestAccount` + - `testing::TestBuilder` + - `testing::TestCache` + - `testing::TestFvk` + - `testing::TestState` + - `testing::TransactionSummary` + - `testing::input_selector` + - `testing::orchard` + - `testing::pool` + - `testing::sapling` ### Changed -- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `zcash_address 0.6`, - `zcash_primitives 0.19`, `zcash_proofs 0.19`, `zcash_protocol 0.4`. +- Migrated to `orchard 0.10`, `sapling-crypto 0.3`, `shardtree 0.5`, + `zcash_address 0.6`, `zcash_primitives 0.19`, `zcash_proofs 0.19`, + `zcash_protocol 0.4`. - The `Account` trait now uses an associated type for its `AccountId` type instead of a type parameter. This change allows for the simplification of some type signatures. diff --git a/zcash_client_backend/Cargo.toml b/zcash_client_backend/Cargo.toml index 69c28c77c1..c499cee436 100644 --- a/zcash_client_backend/Cargo.toml +++ b/zcash_client_backend/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "zcash_client_backend" description = "APIs for creating shielded Zcash light clients" -version = "0.13.0" +version = "0.14.0" authors = [ "Jack Grigg ", "Kris Nuttycombe "