Changing the Issuance Authorization Signature to the BIP 340 Schnorr scheme

Cargo.toml

@@ -32,6 +32,7 @@ group = { version = "0.13", features = ["wnaf-memuse"] }
 halo2_gadgets = { git = "https://github.com/QED-it/halo2", branch = "zsa1" }
 halo2_proofs = { git = "https://github.com/QED-it/halo2", branch = "zsa1", default-features = false, features = ["batch", "floor-planner-v1-legacy-pdqsort"] }
 hex = "0.4"
+k256 = { version = "0.13.0", features = ["arithmetic", "schnorr"] }
 lazy_static = "1"
 memuse = { version = "0.2.1", features = ["nonempty"] }
 pasta_curves = "0.5"
@@ -53,16 +54,18 @@ plotters = { version = "0.3.0", optional = true }
 
 [dev-dependencies]
 bridgetree = "0.4"
-criterion = "0.4" # 0.5 depends on clap 4 which has MSRV 1.70
+criterion = "0.4" #Pinned: 0.5 depends on clap 4 which has MSRV 1.70
 halo2_gadgets = { git = "https://github.com/QED-it/halo2", branch = "zsa1", features = ["test-dependencies"] }
 hex = "0.4"
 proptest = "1.0.0"
 zcash_note_encryption_zsa = { package = "zcash_note_encryption", version = "0.4", git = "https://github.com/QED-it/zcash_note_encryption", branch = "zsa1", features = ["pre-zip-212"] }
 incrementalmerkletree = { version = "0.5", features = ["test-dependencies"] }
+ahash = "=0.8.6" #Pinned: 0.8.7 depends on Rust 1.72
+half = "=2.2.1" #Pinned: 2.3.1 requires Rust 1.70
 
 [target.'cfg(unix)'.dev-dependencies]
-inferno = "0.11"
-clap = "=4.2.0" # Used by inferno. Last version required rust 1.70
+inferno = "0.11" #Pinned
+clap = "=4.2.0" #Pinned: Used by inferno. Later version requires Rust 1.70
 pprof = { version = "0.11", features = ["criterion", "flamegraph"] }
 
 [lib]

src/action.rs

@@ -126,7 +126,7 @@ pub(crate) mod testing {
 
     use proptest::prelude::*;
 
-    use crate::note::asset_base::testing::arb_asset_id;
+    use crate::note::asset_base::testing::arb_asset_base;
     use crate::{
         note::{
             commitment::ExtractedNoteCommitment, nullifier::testing::arb_nullifier,
@@ -147,7 +147,7 @@ pub(crate) mod testing {
             nf in arb_nullifier(),
             rk in arb_spendauth_verification_key(),
             note in arb_note(output_value),
-            asset in arb_asset_id()
+            asset in arb_asset_base()
         ) -> Action<()> {
             let cmx = ExtractedNoteCommitment::from(note.commitment());
             let cv_net = ValueCommitment::derive(
@@ -180,7 +180,7 @@ pub(crate) mod testing {
             note in arb_note(output_value),
             rng_seed in prop::array::uniform32(prop::num::u8::ANY),
             fake_sighash in prop::array::uniform32(prop::num::u8::ANY),
-            asset in arb_asset_id()
+            asset in arb_asset_base()
         ) -> Action<redpallas::Signature<SpendAuth>> {
             let cmx = ExtractedNoteCommitment::from(note.commitment());
             let cv_net = ValueCommitment::derive(

src/bundle.rs

@@ -553,7 +553,7 @@ pub mod testing {
     use super::{Action, Authorization, Authorized, Bundle, Flags};
 
     pub use crate::action::testing::{arb_action, arb_unauthorized_action};
-    use crate::note::asset_base::testing::arb_zsa_asset_id;
+    use crate::note::asset_base::testing::arb_zsa_asset_base;
     use crate::note::AssetBase;
     use crate::value::testing::arb_value_sum;
 
@@ -619,10 +619,10 @@ pub mod testing {
         /// Create an arbitrary vector of assets to burn.
         pub fn arb_asset_to_burn()
         (
-            asset_id in arb_zsa_asset_id(),
+            asset_base in arb_zsa_asset_base(),
             value in arb_value_sum()
         ) -> (AssetBase, ValueSum) {
-            (asset_id, value)
+            (asset_base, value)
         }
     }
 

src/bundle/burn_validation.rs

@@ -83,7 +83,7 @@ mod tests {
     pub fn get_burn_tuple(asset_desc: &str, value: i64) -> (AssetBase, i64) {
         use crate::keys::{IssuanceAuthorizingKey, IssuanceValidatingKey};
 
-        let isk = IssuanceAuthorizingKey::from_bytes([0u8; 32]).unwrap();
+        let isk = IssuanceAuthorizingKey::from_bytes([1u8; 32]).unwrap();
 
         (
             AssetBase::derive(&IssuanceValidatingKey::from(&isk), asset_desc),

src/circuit.rs

@@ -1486,7 +1486,7 @@ mod tests {
         let asset_base = if is_native_asset {
             AssetBase::native()
         } else {
-            AssetBase::random(&mut rng)
+            AssetBase::random()
         };
 
         // Create spent_note
@@ -1578,7 +1578,7 @@ mod tests {
             pallas::Point::random(&mut rng).to_affine().to_bytes(),
             pallas::Point::random(&mut rng).to_affine().to_bytes(),
             NoteValue::from_raw(rng.next_u64()),
-            AssetBase::random(&mut rng),
+            AssetBase::random(),
             pallas::Base::random(&mut rng),
             pallas::Base::random(&mut rng),
             NoteCommitTrapdoor(pallas::Scalar::random(&mut rng)),

src/circuit/note_commit.rs

@@ -746,7 +746,7 @@
 /// ------------------------------------
 /// |  j  | j_0 | j_1 |       1        |
 ///
 /// https://p.z.cash/orchard-0.1:note-commit-decomposition-j?partial
 #[derive(Clone, Debug)]
 struct DecomposeJ {
     q_notecommit_j: Selector,
@@ -2596,7 +2596,7 @@
 
         let two_pow_254 = pallas::Base::from_u128(1 << 127).square();
         let mut rng = OsRng;
-        let random_asset = AssetBase::random(&mut rng);
+        let random_asset = AssetBase::random();
 
         // Test different values of `ak`, `nk`
         let mut circuits = vec![];

src/circuit/value_commit_orchard.rs

@@ -305,7 +305,7 @@ mod tests {
         let mut circuits = vec![];
         let mut instances = vec![];
         let native_asset = AssetBase::native();
-        let random_asset = AssetBase::random(&mut rng);
+        let random_asset = AssetBase::random();
         for split_flag in [false, true] {
             for asset in [native_asset, random_asset] {
                 let v_old = NoteValue::from_raw(rng.next_u64());