PR471 review: various fixes (1)

Cargo.toml

@@ -227,7 +227,7 @@ unexpected_cfgs = { level = "warn", check-cfg = [
 
 [patch.crates-io]
 sapling = { package = "sapling-crypto", git = "https://github.com/QED-it/sapling-crypto", rev = "9393f93fe547d1b3738c9f4618c0f8a2fffed29f" }
-orchard = { git = "https://github.com/QED-it/orchard", rev = "f83d6526e09a5480ce83f4e358ee957954eae1e5" }
+orchard = { git = "https://github.com/QED-it/orchard", rev = "b5518f1b2688889b7eab8a92a773e1655ba5f95f" }
 sinsemilla = { git = "https://github.com/zcash/sinsemilla", rev = "aabb707e862bc3d7b803c77d14e5a771bcee3e8c" }
 zcash_note_encryption = { git = "https://github.com/zcash/zcash_note_encryption", rev = "9f7e93d42cef839d02b9d75918117941d453f8cb" }
 halo2_gadgets = { git = "https://github.com/zcash/halo2", rev = "2308caf68c48c02468b66cfc452dad54e355e32f" }

pczt/src/roles/tx_extractor/orchard.rs

@@ -1,6 +1,5 @@
 use orchard::{
-    bundle::Authorized, circuit::VerifyingKey, orchard_flavor::OrchardVanilla, pczt::Unbound,
-    Bundle,
+    bundle::Authorized, circuit::VerifyingKey, flavor::OrchardVanilla, pczt::Unbound, Bundle,
 };
 use rand_core::OsRng;
 use zcash_protocol::value::ZatBalance;

pczt/tests/end_to_end.rs

@@ -6,8 +6,7 @@ use ::transparent::{
     keys::{AccountPrivKey, IncomingViewingKey},
 };
 use orchard::{
-    note::AssetBase, orchard_flavor::OrchardVanilla, primitives::OrchardDomain,
-    tree::MerkleHashOrchard,
+    flavor::OrchardVanilla, note::AssetBase, primitives::OrchardDomain, tree::MerkleHashOrchard,
 };
 use pczt::{
     roles::{

zcash_client_backend/src/data_api/testing.rs

@@ -87,8 +87,8 @@ use {
 #[cfg(feature = "orchard")]
 use {
     super::ORCHARD_SHARD_HEIGHT, crate::proto::compact_formats::CompactOrchardAction,
-    ::orchard::orchard_flavor::OrchardVanilla, ::orchard::tree::MerkleHashOrchard,
-    group::ff::PrimeField, pasta_curves::pallas,
+    ::orchard::flavor::OrchardVanilla, ::orchard::tree::MerkleHashOrchard, group::ff::PrimeField,
+    pasta_curves::pallas,
 };
 
 pub mod pool;

zcash_client_backend/src/data_api/testing/pool.rs

@@ -86,7 +86,7 @@ use {
 use zcash_protocol::PoolType;
 
 #[cfg(feature = "pczt")]
-use orchard::orchard_flavor::OrchardVanilla;
+use orchard::flavor::OrchardVanilla;
 #[cfg(feature = "pczt")]
 use pczt::roles::{prover::Prover, signer::Signer};
 

zcash_client_backend/src/proto.rs

@@ -34,7 +34,7 @@ use crate::{
 use transparent::bundle::OutPoint;
 
 #[cfg(feature = "orchard")]
-use orchard::orchard_flavor::OrchardVanilla;
+use orchard::flavor::OrchardVanilla;
 #[cfg(feature = "orchard")]
 use orchard::primitives::OrchardPrimitives;
 #[cfg(feature = "orchard")]

zcash_client_backend/src/scanning.rs

@@ -31,7 +31,7 @@ use crate::{
 
 #[cfg(feature = "orchard")]
 use orchard::{
-    orchard_flavor::OrchardVanilla,
+    flavor::OrchardVanilla,
     primitives::{CompactAction, OrchardDomain},
     tree::MerkleHashOrchard,
 };

zcash_primitives/src/sighash_versioning.rs

@@ -5,10 +5,10 @@
 use alloc::{collections::BTreeMap, vec::Vec};
 use lazy_static::lazy_static;
 
-use orchard::orchard_sighash_versioning::OrchardSighashVersion;
+use orchard::sighash_versioning::OrchardSighashVersion;
 
 #[cfg(zcash_unstable = "nu7")]
-use orchard::issuance_sighash_versioning::IssueSighashVersion;
+use orchard::issuance::sighash_versioning::IssueSighashVersion;
 
 /// Orchard `SighashInfo` for V0:
 /// sighashInfo = (\[sighashVersion\] || associatedData) = (\[0\] || [])

zcash_primitives/src/transaction/builder.rs

@@ -36,11 +36,11 @@ use {
     orchard::{
         builder::{InProgress, Unproven},
         bundle::Authorized,
-        orchard_flavor::OrchardFlavor,
+        flavor::OrchardFlavor,
     },
 };
 
-use orchard::{builder::BundleType, note::AssetBase, orchard_flavor::OrchardVanilla, Address};
+use orchard::{builder::BundleType, flavor::OrchardVanilla, note::AssetBase, Address};
 
 #[cfg(feature = "transparent-inputs")]
 use ::transparent::builder::TransparentInputInfo;
@@ -64,11 +64,11 @@ use orchard::builder::BuildError::BundleTypeNotSatisfiable;
 use {
     orchard::{
         bundle::Authorization,
+        flavor::OrchardZSA,
         issuance,
+        issuance::auth::{IssueAuthKey, IssueValidatingKey, ZSASchnorr},
         issuance::{IssueBundle, IssueInfo},
-        issuance_auth::{IssueAuthKey, IssueValidatingKey, ZSASchnorr},
         note::Nullifier,
-        orchard_flavor::OrchardZSA,
     },
     rand_core::OsRng,
 };
@@ -380,7 +380,7 @@ pub struct Builder<'a, P, U: sapling::builder::ProverProgress> {
     #[cfg(zcash_unstable = "nu7")]
     issuance_builder: Option<IssueBundle<issuance::AwaitingNullifier>>,
     #[cfg(zcash_unstable = "nu7")]
-    issuance_isk: Option<orchard::issuance_auth::IssueAuthKey<ZSASchnorr>>,
+    issuance_isk: Option<orchard::issuance::auth::IssueAuthKey<ZSASchnorr>>,
     #[cfg(zcash_unstable = "zfuture")]
     tze_builder: TzeBuilder<'a, TransactionData<Unauthorized>>,
     #[cfg(not(zcash_unstable = "zfuture"))]
@@ -1401,11 +1401,11 @@ mod tests {
         crate::transaction::fees::zip317,
         nonempty::NonEmpty,
         orchard::{
+            flavor::OrchardVanilla,
+            issuance::auth::{IssueAuthKey, IssueValidatingKey},
             issuance::{compute_asset_desc_hash, IssueInfo},
-            issuance_auth::{IssueAuthKey, IssueValidatingKey},
             keys::{FullViewingKey, Scope, SpendAuthorizingKey, SpendingKey},
             note::AssetBase,
-            orchard_flavor::OrchardVanilla,
             primitives::OrchardDomain,
             tree::MerkleHashOrchard,
             value::NoteValue,

zcash_primitives/src/transaction/components/issuance.rs

@@ -7,9 +7,9 @@ use {
     core2::io::{self, Error, ErrorKind, Read, Write},
     nonempty::NonEmpty,
     orchard::{
+        issuance::auth::{IssueAuthSig, IssueValidatingKey, ZSASchnorr},
+        issuance::sighash_versioning::VerBIP340IssueAuthSig,
         issuance::{IssueAction, IssueAuth, IssueBundle, Signed},
-        issuance_auth::{IssueAuthSig, IssueValidatingKey, ZSASchnorr},
-        issuance_sighash_versioning::VerBIP340IssueAuthSig,
         note::{AssetBase, RandomSeed, Rho},
         value::NoteValue,
         {Address, Note},

zcash_primitives/src/transaction/components/orchard.rs

@@ -6,7 +6,7 @@ use {
     crate::encoding::WriteBytesExt,
     crate::sighash_versioning::{to_orchard_version, ORCHARD_SIGHASH_VERSION_TO_INFO_BYTES},
     crate::transaction::components::issuance::read_asset,
-    orchard::{note::AssetBase, orchard_flavor::OrchardZSA, value::NoteValue},
+    orchard::{flavor::OrchardZSA, note::AssetBase, value::NoteValue},
 };
 
 use crate::transaction::{OrchardBundle, Transaction};
@@ -16,11 +16,11 @@ use core2::io::{self, Read, Write};
 use nonempty::NonEmpty;
 use orchard::{
     bundle::{Authorization, Authorized, Flags},
+    flavor::OrchardVanilla,
     note::{ExtractedNoteCommitment, Nullifier, TransmittedNoteCiphertext},
-    orchard_flavor::OrchardVanilla,
-    orchard_sighash_versioning::{OrchardSighashVersion, OrchardVersionedSig},
     primitives::redpallas::{self, SigType, Signature, SpendAuth, VerificationKey},
     primitives::OrchardPrimitives,
+    sighash_versioning::{OrchardSighashVersion, OrchardVersionedSig},
     value::ValueCommitment,
     Action, Anchor, Bundle,
 };
@@ -452,8 +452,8 @@ mod tests {
     use {
         super::{read_versioned_signature, write_versioned_signature},
         alloc::vec::Vec,
-        orchard::orchard_sighash_versioning::{OrchardSighashVersion, OrchardVersionedSig},
         orchard::primitives::redpallas,
+        orchard::sighash_versioning::{OrchardSighashVersion, OrchardVersionedSig},
         rand::rngs::OsRng,
         rand::RngCore,
         std::io::Cursor,
@@ -489,7 +489,7 @@ pub mod testing {
     use zcash_protocol::value::testing::arb_zat_balance;
 
     #[cfg(zcash_unstable = "nu7")]
-    use orchard::orchard_flavor::OrchardZSA;
+    use orchard::flavor::OrchardZSA;
 
     prop_compose! {
         pub fn arb_bundle(n_actions: usize)(

zcash_primitives/src/transaction/mod.rs

@@ -40,7 +40,7 @@ use self::{
 #[cfg(feature = "circuits")]
 use {::sapling::builder as sapling_builder, orchard::builder::Unproven};
 
-use orchard::orchard_flavor::OrchardVanilla;
+use orchard::flavor::OrchardVanilla;
 use orchard::Bundle;
 use zcash_protocol::constants::{
     V3_TX_VERSION, V3_VERSION_GROUP_ID, V4_TX_VERSION, V4_VERSION_GROUP_ID, V5_TX_VERSION,
@@ -49,7 +49,7 @@ use zcash_protocol::constants::{
 #[cfg(zcash_unstable = "nu7")]
 use {
     crate::transaction::components::issuance,
-    orchard::{issuance::IssueBundle, orchard_flavor::OrchardZSA},
+    orchard::{flavor::OrchardZSA, issuance::IssueBundle},
 };
 
 #[cfg(zcash_unstable = "nu7")]