resolved merge conflicts with latest main

Cargo.toml

@@ -133,6 +133,7 @@ lazy_static = "1"
 static_assertions = "1"
 
 # Tests and benchmarks
+ambassador = "0.4"
 assert_matches = "1.5"
 criterion = "0.5"
 proptest = "1"

components/zip321/src/lib.rs

@@ -654,7 +654,7 @@ mod parse {
         )(input)
     }
 
-    /// The primary parser for <name>=<value> query-string parameter pair.
+    /// The primary parser for `name=value` query-string parameter pairs.
     pub fn zcashparam(input: &str) -> IResult<&str, IndexedParam> {
         map_res(
             separated_pair(indexed_name, char('='), recognize(qchars)),

supply-chain/audits.toml

@@ -7,6 +7,12 @@ description = "The cryptographic code in this crate has been reviewed for correc
 [criteria.license-reviewed]
 description = "The license of this crate has been reviewed for compatibility with its usage in this repository."
 
+[[audits.ambassador]]
+who = "Kris Nuttycombe <[email protected]>"
+criteria = "safe-to-deploy"
+version = "0.4.1"
+notes = "Crate uses no unsafe code and the macros introduced by this crate generate the expected trait implementations without introducing additional unexpected operations."
+
 [[audits.anyhow]]
 who = "Daira-Emma Hopwood <[email protected]>"
 criteria = "safe-to-deploy"

zcash_client_backend/CHANGELOG.md

@@ -7,6 +7,15 @@ and this library adheres to Rust's notion of
 
 ## [Unreleased]
 
+### Changed
+- 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.
+
+### Fixed
+- `zcash_client_backend::tor::grpc` now needs the `lightwalletd-tonic-tls-webpki-roots`
+  feature flag instead of `lightwalletd-tonic`, to fix compilation issues.
+
 ## [0.13.0] - 2024-08-20
 
 `zcash_client_backend` now supports TEX (transparent-source-only) addresses as specified

zcash_client_backend/Cargo.toml

@@ -21,17 +21,7 @@ exclude = ["*.proto"]
 development = ["zcash_proofs"]
 
 [package.metadata.docs.rs]
-# Manually specify features while `orchard` is not in the public API.
-#all-features = true
-features = [
-    "lightwalletd-tonic",
-    "transparent-inputs",
-    "test-dependencies",
-    "tor",
-    "unstable",
-    "unstable-serialization",
-    "unstable-spanning-tree",
-]
+all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
@@ -89,8 +79,13 @@ incrementalmerkletree.workspace = true
 shardtree.workspace = true
 
 # - Test dependencies
+ambassador = { workspace = true, optional = true }
+assert_matches = { workspace = true, optional = true }
+pasta_curves = { workspace = true, optional = true }
 proptest = { workspace = true, optional = true }
 jubjub = { workspace = true, optional = true }
+rand_chacha = { workspace = true, optional = true }
+zcash_proofs = { workspace = true, optional = true }
 
 # - ZIP 321
 nom = "7"
@@ -137,22 +132,29 @@ tonic-build = { workspace = true, features = ["prost"] }
 which = "4"
 
 [dev-dependencies]
+ambassador.workspace = true
 assert_matches.workspace = true
 gumdrop = "0.8"
 incrementalmerkletree = { workspace = true, features = ["test-dependencies"] }
 jubjub.workspace = true
 proptest.workspace = true
-rand_core.workspace = true
+rand.workspace = true
+rand_chacha.workspace = true
 shardtree = { workspace = true, features = ["test-dependencies"] }
-zcash_proofs.workspace = true
+tokio = { version = "1.21.0", features = ["rt-multi-thread"] }
 zcash_address = { workspace = true, features = ["test-dependencies"] }
 zcash_keys = { workspace = true, features = ["test-dependencies"] }
-tokio = { version = "1.21.0", features = ["rt-multi-thread"] }
+zcash_primitives = { workspace = true, features = ["test-dependencies"] }
+zcash_proofs = { workspace = true, features = ["bundled-prover"] }
+zcash_protocol = { workspace = true, features = ["local-consensus"] }
 
 [features]
 ## Enables the `tonic` gRPC client bindings for connecting to a `lightwalletd` server.
 lightwalletd-tonic = ["dep:tonic", "hyper-util?/tokio"]
 
+## Enables the `tls-webpki-roots` feature of `tonic`.
+lightwalletd-tonic-tls-webpki-roots = ["lightwalletd-tonic", "tonic?/tls-webpki-roots"]
+
 ## Enables the `transport` feature of `tonic` producing a fully-featured client and server implementation
 lightwalletd-tonic-transport = ["lightwalletd-tonic", "tonic?/transport"]
 
@@ -164,7 +166,7 @@ transparent-inputs = [
 ]
 
 ## Enables receiving and spending Orchard funds.
-orchard = ["dep:orchard", "zcash_keys/orchard"]
+orchard = ["dep:orchard", "dep:pasta_curves", "zcash_keys/orchard"]
 
 ## Exposes a wallet synchronization function that implements the necessary state machine.
 sync = [
@@ -193,11 +195,17 @@ tor = [
 
 ## Exposes APIs that are useful for testing, such as `proptest` strategies.
 test-dependencies = [
+    "dep:ambassador",
+    "dep:assert_matches",
     "dep:proptest",
     "dep:jubjub",
+    "dep:rand",
+    "dep:rand_chacha",
     "orchard?/test-dependencies",
     "zcash_keys/test-dependencies",
     "zcash_primitives/test-dependencies",
+    "zcash_proofs/bundled-prover",
+    "zcash_protocol/local-consensus",
     "incrementalmerkletree/test-dependencies",
 ]