Updating the encoding of the Issuance Authorization keys and signatures

src/bundle.rs

@@ -631,10 +631,11 @@ pub mod testing {
     use super::{Action, Authorized, Bundle, Flags};
 
     pub use crate::action::testing::ActionArb;
-    use crate::note::asset_base::testing::arb_zsa_asset_base;
-    use crate::note::AssetBase;
-    use crate::primitives::OrchardPrimitives;
-    use crate::value::testing::arb_note_value;
+    use crate::{
+        note::{asset_base::testing::arb_zsa_asset_base, AssetBase},
+        primitives::OrchardPrimitives,
+        value::testing::arb_note_value,
+    };
 
     /// Marker type for a bundle that contains no authorizing data.
     pub type Unauthorized = super::EffectsOnly;

src/bundle/batch.rs

@@ -8,8 +8,10 @@ use tracing::debug;
 use super::{Authorized, Bundle};
 use crate::{
     circuit::VerifyingKey,
-    primitives::redpallas::{self, Binding, SpendAuth},
-    primitives::OrchardPrimitives,
+    primitives::{
+        redpallas::{self, Binding, SpendAuth},
+        OrchardPrimitives,
+    },
 };
 
 /// A signature within an authorized Orchard bundle.

src/bundle/burn_validation.rs

@@ -65,16 +65,14 @@ impl fmt::Display for BurnError {
 
 #[cfg(test)]
 mod tests {
-    use crate::issuance::compute_asset_desc_hash;
-    use crate::value::NoteValue;
-    use nonempty::NonEmpty;
-
     use super::*;
+    use crate::{issuance::compute_asset_desc_hash, issuance_auth::ZSASchnorr, value::NoteValue};
+    use nonempty::NonEmpty;
 
     /// Creates an item of bundle burn list for a given asset description hash and value.
     ///
     /// This function is deterministic and guarantees that each call with the same parameters
-    /// will return the same result. It achieves determinism by using a static `IssuanceAuthorizingKey`.
+    /// will return the same result. It achieves determinism by using a static `IssueAuthKey`.
     ///
     /// # Arguments
     ///
@@ -86,12 +84,12 @@ mod tests {
     /// A tuple `(AssetBase, Amount)` representing the burn list item.
     ///
     fn get_burn_tuple(asset_desc_hash: &[u8; 32], value: u64) -> (AssetBase, NoteValue) {
-        use crate::keys::{IssuanceAuthorizingKey, IssuanceValidatingKey};
+        use crate::issuance_auth::{IssueAuthKey, IssueValidatingKey};
 
-        let isk = IssuanceAuthorizingKey::from_bytes([1u8; 32]).unwrap();
+        let isk = IssueAuthKey::<ZSASchnorr>::from_bytes(&[1u8; 32]).unwrap();
 
         (
-            AssetBase::derive(&IssuanceValidatingKey::from(&isk), asset_desc_hash),
+            AssetBase::derive(&IssueValidatingKey::from(&isk), asset_desc_hash),
             NoteValue::from_raw(value),
         )
     }

src/bundle/commitments.rs

@@ -112,7 +112,7 @@ pub(crate) fn hash_issue_bundle_txid_data<A: IssueAuth>(bundle: &IssueBundle<A>)
         ia.update(&[u8::from(action.is_finalized())]);
     }
     h.update(ia.finalize().as_bytes());
-    h.update(&bundle.ik().to_bytes());
+    h.update(&bundle.ik().encode());
     h.finalize()
 }
 
@@ -123,7 +123,7 @@ pub(crate) fn hash_issue_bundle_txid_data<A: IssueAuth>(bundle: &IssueBundle<A>)
 /// [zip246]: https://zips.z.cash/zip-0246
 pub(crate) fn hash_issue_bundle_auth_data(bundle: &IssueBundle<Signed>) -> Blake2bHash {
     let mut h = hasher(ZCASH_ORCHARD_ZSA_ISSUE_SIG_PERSONALIZATION);
-    h.update(&<[u8; 64]>::from(bundle.authorization().signature()));
+    h.update(&bundle.authorization().signature().encode());
     h.finalize()
 }
 

src/circuit/circuit_zsa.rs

@@ -40,8 +40,7 @@ use crate::{
         AdditionalZsaWitnesses, Config, OrchardCircuit, Witnesses, ANCHOR, CMX, CV_NET_X, CV_NET_Y,
         ENABLE_OUTPUT, ENABLE_SPEND, ENABLE_ZSA, NF_OLD, RK_X, RK_Y,
     },
-    constants::OrchardFixedBasesFull,
-    constants::{OrchardFixedBases, OrchardHashDomains},
+    constants::{OrchardFixedBases, OrchardFixedBasesFull, OrchardHashDomains},
     note::AssetBase,
     orchard_flavor::OrchardZSA,
 };

src/circuit/value_commit_orchard.rs

@@ -130,9 +130,11 @@ pub(in crate::circuit) mod gadgets {
 #[cfg(test)]
 mod tests {
     use crate::{
-        circuit::gadget::assign_free_advice,
-        circuit::value_commit_orchard::gadgets::value_commit_orchard,
-        circuit::K,
+        circuit::{
+            gadget::assign_free_advice,
+            value_commit_orchard::{gadgets::value_commit_orchard, ZsaValueCommitParams},
+            K,
+        },
         constants::{OrchardCommitDomains, OrchardFixedBases, OrchardHashDomains},
         note::AssetBase,
         value::{NoteValue, ValueCommitTrapdoor, ValueCommitment},
@@ -156,7 +158,6 @@ mod tests {
     };
     use pasta_curves::pallas;
 
-    use crate::circuit::value_commit_orchard::ZsaValueCommitParams;
     use rand::{rngs::OsRng, RngCore};
 
     #[test]