move proof generation key extension to ironfish-zkp

ironfish-rust/src/keys/mod.rs

@@ -13,6 +13,7 @@ use group::GroupEncoding;
 use ironfish_zkp::constants::{
     CRH_IVK_PERSONALIZATION, PROOF_GENERATION_KEY_GENERATOR, SPENDING_KEY_GENERATOR,
 };
+pub use ironfish_zkp::ProofGenerationKey;
 use jubjub::SubgroupPoint;
 use rand::prelude::*;
 
@@ -26,8 +27,6 @@ mod view_keys;
 pub use view_keys::*;
 mod util;
 pub use util::*;
-pub mod proof_generation_key;
-pub use proof_generation_key::*;
 
 #[cfg(test)]
 mod test;
@@ -210,10 +209,7 @@ impl SaplingKey {
     /// Adapter to convert this key to a proof generation key for use in
     /// sapling functions
     pub fn sapling_proof_generation_key(&self) -> ProofGenerationKey {
-        ProofGenerationKey {
-            ak: self.view_key.authorizing_key,
-            nsk: self.proof_authorizing_key,
-        }
+        ProofGenerationKey::new(self.view_key.authorizing_key, self.proof_authorizing_key)
     }
 
     /// Convert the spending key to another value using a pseudorandom hash

ironfish-rust/src/transaction/mod.rs

@@ -239,10 +239,8 @@ impl ProposedTransaction {
     ) -> Result<UnsignedTransaction, IronfishError> {
         let public_address = view_key.public_address()?;
 
-        let proof_generation_key = ProofGenerationKey {
-            ak: view_key.authorizing_key,
-            nsk: proof_authorizing_key,
-        };
+        let proof_generation_key =
+            ProofGenerationKey::new(view_key.authorizing_key, proof_authorizing_key);
 
         // skip adding change notes if this is special case of a miners fee transaction
         let is_miners_fee = self.outputs.iter().any(|output| output.get_is_miners_fee());

ironfish-zkp/src/circuits/mint_asset.rs

@@ -3,13 +3,15 @@ use bellperson::{
     Circuit,
 };
 use ff::PrimeField;
-use zcash_primitives::sapling::ProofGenerationKey;
 use zcash_proofs::{
     circuit::ecc,
     constants::{PROOF_GENERATION_KEY_GENERATOR, SPENDING_KEY_GENERATOR},
 };
 
-use crate::constants::{proof::PUBLIC_KEY_GENERATOR, CRH_IVK_PERSONALIZATION};
+use crate::{
+    constants::{proof::PUBLIC_KEY_GENERATOR, CRH_IVK_PERSONALIZATION},
+    ProofGenerationKey,
+};
 
 pub struct MintAsset {
     /// Key required to construct proofs for a particular spending key
@@ -122,9 +124,8 @@ mod test {
     use group::{Curve, Group};
     use jubjub::ExtendedPoint;
     use rand::{rngs::StdRng, SeedableRng};
-    use zcash_primitives::sapling::ProofGenerationKey;
 
-    use crate::constants::PUBLIC_KEY_GENERATOR;
+    use crate::{constants::PUBLIC_KEY_GENERATOR, ProofGenerationKey};
 
     use super::MintAsset;
 
@@ -135,10 +136,10 @@ mod test {
 
         let mut cs = TestConstraintSystem::new();
 
-        let proof_generation_key = ProofGenerationKey {
-            ak: jubjub::SubgroupPoint::random(&mut rng),
-            nsk: jubjub::Fr::random(&mut rng),
-        };
+        let proof_generation_key = ProofGenerationKey::new(
+            jubjub::SubgroupPoint::random(&mut rng),
+            jubjub::Fr::random(&mut rng),
+        );
         let incoming_view_key = proof_generation_key.to_viewing_key();
         let public_address = *PUBLIC_KEY_GENERATOR * incoming_view_key.ivk().0;
         let public_address_point = ExtendedPoint::from(public_address).to_affine();

ironfish-zkp/src/circuits/output.rs

@@ -5,7 +5,6 @@ use bellperson::{gadgets::blake2s, Circuit, ConstraintSystem, SynthesisError};
 use group::Curve;
 use jubjub::SubgroupPoint;
 
-use zcash_primitives::sapling::ProofGenerationKey;
 use zcash_proofs::{
     circuit::{ecc, pedersen_hash},
     constants::{
@@ -18,6 +17,7 @@ use crate::{
     circuits::util::assert_valid_asset_generator,
     constants::{proof::PUBLIC_KEY_GENERATOR, ASSET_ID_LENGTH, CRH_IVK_PERSONALIZATION},
     primitives::ValueCommitment,
+    ProofGenerationKey,
 };
 
 use super::util::expose_value_commitment;
@@ -260,9 +260,9 @@ mod test {
     use group::{Curve, Group};
     use rand::rngs::StdRng;
     use rand::{Rng, RngCore, SeedableRng};
-    use zcash_primitives::sapling::ProofGenerationKey;
 
     use crate::util::asset_hash_to_point;
+    use crate::ProofGenerationKey;
     use crate::{
         circuits::output::Output, constants::PUBLIC_KEY_GENERATOR, primitives::ValueCommitment,
         util::commitment_full_point,
@@ -296,7 +296,7 @@ mod test {
             let esk = jubjub::Fr::random(&mut rng);
             let ar = jubjub::Fr::random(&mut rng);
 
-            let proof_generation_key = ProofGenerationKey { ak, nsk };
+            let proof_generation_key = ProofGenerationKey::new(ak, nsk);
 
             let viewing_key = proof_generation_key.to_viewing_key();
 

ironfish-zkp/src/circuits/spend.rs

@@ -3,6 +3,7 @@ use ff::{Field, PrimeField};
 use jubjub::SubgroupPoint;
 
 use crate::constants::{CRH_IVK_PERSONALIZATION, PRF_NF_PERSONALIZATION};
+use crate::ProofGenerationKey;
 use crate::{constants::proof::PUBLIC_KEY_GENERATOR, primitives::ValueCommitment};
 
 use super::util::expose_value_commitment;
@@ -11,7 +12,6 @@ use bellperson::gadgets::boolean;
 use bellperson::gadgets::multipack;
 use bellperson::gadgets::num;
 use bellperson::gadgets::Assignment;
-use zcash_primitives::sapling::ProofGenerationKey;
 use zcash_proofs::{
     circuit::{ecc, pedersen_hash},
     constants::{
@@ -342,15 +342,17 @@ mod test {
     use ff::{Field, PrimeField, PrimeFieldBits};
     use group::{Curve, Group, GroupEncoding};
     use rand::{rngs::StdRng, RngCore, SeedableRng};
-    use zcash_primitives::sapling::{pedersen_hash, Note, ProofGenerationKey, Rseed};
+    use zcash_primitives::sapling::{pedersen_hash, Note, Rseed};
     use zcash_primitives::{constants::NULLIFIER_POSITION_GENERATOR, sapling::Nullifier};
 
     use crate::{
         circuits::spend::Spend,
-        constants::PUBLIC_KEY_GENERATOR,
-        constants::{PRF_NF_PERSONALIZATION, VALUE_COMMITMENT_VALUE_GENERATOR},
+        constants::{
+            PRF_NF_PERSONALIZATION, PUBLIC_KEY_GENERATOR, VALUE_COMMITMENT_VALUE_GENERATOR,
+        },
         primitives::ValueCommitment,
         util::commitment_full_point,
+        ProofGenerationKey,
     };
 
     #[test]
@@ -367,10 +369,10 @@ mod test {
                 asset_generator: (*VALUE_COMMITMENT_VALUE_GENERATOR).into(),
             };
 
-            let proof_generation_key = ProofGenerationKey {
-                ak: jubjub::SubgroupPoint::random(&mut rng),
-                nsk: jubjub::Fr::random(&mut rng),
-            };
+            let proof_generation_key = ProofGenerationKey::new(
+                jubjub::SubgroupPoint::random(&mut rng),
+                jubjub::Fr::random(&mut rng),
+            );
 
             let viewing_key = proof_generation_key.to_viewing_key();
 
@@ -524,10 +526,10 @@ mod test {
                 asset_generator: (*VALUE_COMMITMENT_VALUE_GENERATOR).into(),
             };
 
-            let proof_generation_key = ProofGenerationKey {
-                ak: jubjub::SubgroupPoint::random(&mut rng),
-                nsk: jubjub::Fr::random(&mut rng),
-            };
+            let proof_generation_key = ProofGenerationKey::new(
+                jubjub::SubgroupPoint::random(&mut rng),
+                jubjub::Fr::random(&mut rng),
+            );
 
             let viewing_key = proof_generation_key.to_viewing_key();
 

ironfish-zkp/src/lib.rs

@@ -6,9 +6,10 @@ pub mod util;
 
 pub use zcash_primitives::sapling::{
     group_hash::group_hash, pedersen_hash, redjubjub, Diversifier, Note as SaplingNote, Nullifier,
-    PaymentAddress, ProofGenerationKey, Rseed, ViewingKey,
+    PaymentAddress, Rseed, ViewingKey,
 };
 
+pub use primitives::proof_generation_key::ProofGenerationKey;
 pub mod proofs {
     pub use crate::circuits::mint_asset::MintAsset;
     pub use crate::circuits::{output::Output, spend::Spend};

ironfish-zkp/src/primitives/mod.rs

@@ -1,2 +1,3 @@
+pub mod proof_generation_key;
 mod value_commitment;
 pub use value_commitment::ValueCommitment;