Add orchard bundle creation to zcash_primitives::transaction::builder::Builder

zcash_client_backend/src/fees/fixed.rs

@@ -78,6 +78,8 @@ impl ChangeStrategy for SingleOutputChangeStrategy {
                 transparent_outputs,
                 sapling_inputs.len(),
                 sapling_outputs.len() + 1,
+                //Orchard is not yet supported in zcash_client_backend
+                0,
             )
             .unwrap(); // fixed::FeeRule::fee_required is infallible.
 

zcash_client_backend/src/fees/zip317.rs

@@ -167,6 +167,8 @@ impl ChangeStrategy for SingleOutputChangeStrategy {
                 // add one for Sapling change, then account for Sapling output padding performed by
                 // the transaction builder
                 std::cmp::max(sapling_outputs.len() + 1, 2),
+                //Orchard is not yet supported in zcash_client_backend
+                0,
             )
             .map_err(ChangeError::StrategyError)?;
 

zcash_client_backend/src/keys.rs

@@ -703,6 +703,8 @@ mod tests {
     #[test]
     #[cfg(feature = "transparent-inputs")]
     fn ufvk_derivation() {
+        use super::UnifiedSpendingKey;
+
         for tv in test_vectors::UNIFIED {
             let usk = UnifiedSpendingKey::from_seed(
                 &MAIN_NETWORK,

zcash_primitives/CHANGELOG.md

@@ -87,6 +87,27 @@ and this library adheres to Rust's notion of
   `jubjub 0.10`, `orchard 0.4`, `sha2 0.10`, `bip0039 0.10`,
   `zcash_note_encryption 0.3`.
 
+### Added
+- `zcash_primitives::transaction::builder`:
+  - `Builder::with_orchard_anchor`
+  - `Builder::add_orchard_spend`
+  - `Builder::add_orchard_output`
+- `zcash_primitives::transaction::components::orchard::builder` module
+
+### Changed
+- `zcash_primitives::transaction:`
+  - `builder::Builder::test_only_new_with_rng`
+    now returns an existential type: `Builder<'a, P, impl RngCore + CryptoRng>` 
+    instead of `Builder<'a, P, R>`
+  - `fees::FeeRule::fee_required` now takes an addition argument, `orchard_action_count`
+  - `Unauthorized`'s associated type `OrchardAuth` is now 
+    `orchard::builder::InProgress<orchard::builder::Unproven, orchard::builder::Unauthorized>`
+    instead of `zcash_primitives::transaction::components::orchard::Unauthorized`
+- `zcash_primitives::consensus::NetworkUpgrade` now implements `PartialEq`, `Eq`
+
+### Removed
+- `zcash_primitives::transaction::components::orchard::Unauthorized`
+
 ## [0.10.2] - 2023-03-16
 ### Added
 - `zcash_primitives::sapling::note`:

zcash_primitives/src/consensus.rs

@@ -361,7 +361,7 @@ impl Parameters for Network {
 /// consensus rules enforced by the network are altered.
 ///
 /// See [ZIP 200](https://zips.z.cash/zip-0200) for more details.
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum NetworkUpgrade {
     /// The [Overwinter] network upgrade.
     ///