Merge pull request #375 from nuttycom/feature/zip-225

ZIP 225 & ZIP 244

zcash_client_backend/src/address.rs

@@ -8,6 +8,7 @@ use crate::encoding::{
 };
 
 /// An address that funds can be sent to.
+// TODO: rename to ParsedAddress
 #[derive(Debug, PartialEq, Clone)]
 pub enum RecipientAddress {
     Shielded(PaymentAddress),

zcash_client_backend/src/data_api/wallet.rs

@@ -238,8 +238,7 @@ where
         },
         RecipientAddress::Transparent(addr) => {
             let script = addr.script();
-            tx.transparent_bundle
-                .as_ref()
+            tx.transparent_bundle()
                 .and_then(|b| {
                     b.vout
                         .iter()

zcash_client_backend/src/decrypt.rs

@@ -44,7 +44,7 @@ pub fn decrypt_transaction<P: consensus::Parameters>(
 ) -> Vec<DecryptedOutput> {
     let mut decrypted = vec![];
 
-    if let Some(bundle) = tx.sapling_bundle.as_ref() {
+    if let Some(bundle) = tx.sapling_bundle() {
         for (account, extfvk) in extfvks.iter() {
             let ivk = extfvk.fvk.vk.ivk();
             let ovk = extfvk.fvk.ovk;

zcash_client_sqlite/src/lib.rs

@@ -489,7 +489,7 @@ impl<'a, P: consensus::Parameters> WalletWrite for DataConnStmtCache<'a, P> {
             //
             // Assumes that create_spend_to_address() will never be called in parallel, which is a
             // reasonable assumption for a light client such as a mobile phone.
-            if let Some(bundle) = sent_tx.tx.sapling_bundle.as_ref() {
+            if let Some(bundle) = sent_tx.tx.sapling_bundle() {
                 for spend in &bundle.shielded_spends {
                     wallet::mark_spent(up, tx_ref, &spend.nullifier)?;
                 }

zcash_client_sqlite/src/wallet.rs

@@ -650,14 +650,14 @@ pub fn put_tx_data<'a, P>(
 
     if stmts
         .stmt_update_tx_data
-        .execute(params![u32::from(tx.expiry_height), raw_tx, txid,])?
+        .execute(params![u32::from(tx.expiry_height()), raw_tx, txid,])?
         == 0
     {
         // It isn't there, so insert our transaction into the database.
         stmts.stmt_insert_tx_data.execute(params![
             txid,
             created_at,
-            u32::from(tx.expiry_height),
+            u32::from(tx.expiry_height()),
             raw_tx
         ])?;
 

zcash_client_sqlite/src/wallet/transact.rs

@@ -68,9 +68,9 @@ pub fn get_spendable_notes<P>(
         "SELECT diversifier, value, rcm, witness
             FROM received_notes
             INNER JOIN transactions ON transactions.id_tx = received_notes.tx
-            INNER JOIN sapling_witnesses ON sapling_witnesses.note = received_notes.id_note 
-            WHERE account = :account 
-            AND spent IS NULL 
+            INNER JOIN sapling_witnesses ON sapling_witnesses.note = received_notes.id_note
+            WHERE account = :account
+            AND spent IS NULL
             AND transactions.block <= :anchor_height
             AND sapling_witnesses.block = :anchor_height",
     )?;
@@ -153,7 +153,7 @@ mod tests {
 
     use zcash_primitives::{
         block::BlockHash,
-        consensus::BlockHeight,
+        consensus::{BlockHeight, BranchId},
         legacy::TransparentAddress,
         sapling::{note_encryption::try_sapling_output_recovery, prover::TxProver},
         transaction::{components::Amount, Transaction},
@@ -617,7 +617,7 @@ mod tests {
                     |row| row.get(0),
                 )
                 .unwrap();
-            let tx = Transaction::read(&raw_tx[..]).unwrap();
+            let tx = Transaction::read(&raw_tx[..], BranchId::Canopy).unwrap();
 
             // Fetch the output index from the database
             let output_index: i64 = db_write
@@ -631,8 +631,7 @@ mod tests {
                 )
                 .unwrap();
 
-            let output =
-                &tx.sapling_bundle.as_ref().unwrap().shielded_outputs[output_index as usize];
+            let output = &tx.sapling_bundle().unwrap().shielded_outputs[output_index as usize];
 
             try_sapling_output_recovery(
                 &network,

zcash_extensions/Cargo.toml

@@ -10,7 +10,7 @@ edition = "2018"
 
 [dependencies]
 blake2b_simd = "0.5"
-zcash_primitives = { version = "0.5", path = "../zcash_primitives", features = ["zfuture"] }
+zcash_primitives = { version = "0.5", path = "../zcash_primitives", features = ["zfuture" ] }
 
 [dev-dependencies]
 ff = "0.10"

zcash_extensions/src/consensus/transparent.rs

@@ -78,14 +78,14 @@ pub trait Epoch {
 /// by the context.
 impl<'a> demo::Context for Context<'a> {
     fn is_tze_only(&self) -> bool {
-        self.tx.transparent_bundle.is_none()
-            && self.tx.sapling_bundle.is_none()
-            && self.tx.sprout_bundle.is_none()
-            && self.tx.orchard_bundle.is_none()
+        self.tx.transparent_bundle().is_none()
+            && self.tx.sapling_bundle().is_none()
+            && self.tx.sprout_bundle().is_none()
+            && self.tx.orchard_bundle().is_none()
     }
 
     fn tx_tze_outputs(&self) -> &[TzeOut] {
-        if let Some(bundle) = &self.tx.tze_bundle {
+        if let Some(bundle) = self.tx.tze_bundle() {
             &bundle.vout
         } else {
             &[]

zcash_extensions/src/transparent/demo.rs

@@ -495,7 +495,7 @@ mod tests {
             builder::Builder,
             components::{
                 amount::{Amount, DEFAULT_FEE},
-                tze::{Bundle, OutPoint, TzeIn, TzeOut},
+                tze::{Authorized, Bundle, OutPoint, TzeIn, TzeOut},
             },
             Transaction, TransactionData, TxVersion,
         },
@@ -621,14 +621,14 @@ mod tests {
     /// by the context.
     impl<'a> Context for Ctx<'a> {
         fn is_tze_only(&self) -> bool {
-            self.tx.transparent_bundle.is_none()
-                && self.tx.sprout_bundle.is_none()
-                && self.tx.sapling_bundle.is_none()
-                && self.tx.orchard_bundle.is_none()
+            self.tx.transparent_bundle().is_none()
+                && self.tx.sapling_bundle().is_none()
+                && self.tx.sprout_bundle().is_none()
+                && self.tx.orchard_bundle().is_none()
         }
 
         fn tx_tze_outputs(&self) -> &[TzeOut] {
-            match &self.tx.tze_bundle {
+            match self.tx.tze_bundle() {
                 Some(b) => &b.vout,
                 None => &[],
             }
@@ -683,20 +683,22 @@ mod tests {
             precondition: tze::Precondition::from(0, &Precondition::open(hash_1)),
         };
 
-        let tx_a = TransactionData {
-            version: TxVersion::ZFuture,
-            lock_time: 0,
-            expiry_height: 0u32.into(),
-            transparent_bundle: None,
-            sprout_bundle: None,
-            sapling_bundle: None,
-            orchard_bundle: None,
-            tze_bundle: Some(Bundle {
+        let tx_a = TransactionData::from_parts(
+            TxVersion::ZFuture,
+            BranchId::ZFuture,
+            0,
+            0u32.into(),
+            None,
+            None,
+            None,
+            None,
+            Some(Bundle {
                 vin: vec![],
                 vout: vec![out_a],
+                authorization: Authorized,
             }),
-        }
-        .freeze(BranchId::ZFuture)
+        )
+        .freeze()
         .unwrap();
 
         //
@@ -712,20 +714,22 @@ mod tests {
             precondition: tze::Precondition::from(0, &Precondition::close(hash_2)),
         };
 
-        let tx_b = TransactionData {
-            version: TxVersion::ZFuture,
-            lock_time: 0,
-            expiry_height: 0u32.into(),
-            transparent_bundle: None,
-            sprout_bundle: None,
-            sapling_bundle: None,
-            orchard_bundle: None,
-            tze_bundle: Some(Bundle {
+        let tx_b = TransactionData::from_parts(
+            TxVersion::ZFuture,
+            BranchId::ZFuture,
+            0,
+            0u32.into(),
+            None,
+            None,
+            None,
+            None,
+            Some(Bundle {
                 vin: vec![in_b],
                 vout: vec![out_b],
+                authorization: Authorized,
             }),
-        }
-        .freeze(BranchId::ZFuture)
+        )
+        .freeze()
         .unwrap();
 
         //
@@ -737,29 +741,31 @@ mod tests {
             witness: tze::Witness::from(0, &Witness::close(preimage_2)),
         };
 
-        let tx_c = TransactionData {
-            version: TxVersion::ZFuture,
-            lock_time: 0,
-            expiry_height: 0u32.into(),
-            transparent_bundle: None,
-            sprout_bundle: None,
-            sapling_bundle: None,
-            orchard_bundle: None,
-            tze_bundle: Some(Bundle {
+        let tx_c = TransactionData::from_parts(
+            TxVersion::ZFuture,
+            BranchId::ZFuture,
+            0,
+            0u32.into(),
+            None,
+            None,
+            None,
+            None,
+            Some(Bundle {
                 vin: vec![in_c],
                 vout: vec![],
+                authorization: Authorized,
             }),
-        }
-        .freeze(BranchId::ZFuture)
+        )
+        .freeze()
         .unwrap();
 
         // Verify tx_b
         {
             let ctx = Ctx { tx: &tx_b };
             assert_eq!(
                 Program.verify(
-                    &tx_a.tze_bundle.as_ref().unwrap().vout[0].precondition,
-                    &tx_b.tze_bundle.as_ref().unwrap().vin[0].witness,
+                    &tx_a.tze_bundle().unwrap().vout[0].precondition,
+                    &tx_b.tze_bundle().unwrap().vin[0].witness,
                     &ctx
                 ),
                 Ok(())
@@ -771,8 +777,8 @@ mod tests {
             let ctx = Ctx { tx: &tx_c };
             assert_eq!(
                 Program.verify(
-                    &tx_b.tze_bundle.as_ref().unwrap().vout[0].precondition,
-                    &tx_c.tze_bundle.as_ref().unwrap().vin[0].witness,
+                    &tx_b.tze_bundle().unwrap().vout[0].precondition,
+                    &tx_c.tze_bundle().unwrap().vin[0].witness,
                     &ctx
                 ),
                 Ok(())
@@ -830,7 +836,7 @@ mod tests {
             .build(&prover)
             .map_err(|e| format!("build failure: {:?}", e))
             .unwrap();
-        let tze_a = tx_a.tze_bundle.as_ref().unwrap();
+        let tze_a = tx_a.tze_bundle().unwrap();
 
         //
         // Transfer
@@ -848,7 +854,7 @@ mod tests {
             .build(&prover)
             .map_err(|e| format!("build failure: {:?}", e))
             .unwrap();
-        let tze_b = tx_b.tze_bundle.as_ref().unwrap();
+        let tze_b = tx_b.tze_bundle().unwrap();
 
         //
         // Closing transaction
@@ -873,7 +879,7 @@ mod tests {
             .build(&prover)
             .map_err(|e| format!("build failure: {:?}", e))
             .unwrap();
-        let tze_c = tx_c.tze_bundle.as_ref().unwrap();
+        let tze_c = tx_c.tze_bundle().unwrap();
 
         // Verify tx_b
         let ctx0 = Ctx { tx: &tx_b };

zcash_primitives/benches/note_decryption.rs

@@ -10,7 +10,7 @@ use zcash_primitives::{
         Diversifier, PaymentAddress, SaplingIvk, ValueCommitment,
     },
     transaction::components::{
-        sapling::{Authorized, OutputDescription},
+        sapling::{GrothProofBytes, OutputDescription},
         GROTH_PROOF_SIZE,
     },
 };
@@ -23,7 +23,7 @@ fn bench_note_decryption(c: &mut Criterion) {
     let invalid_ivk = SaplingIvk(jubjub::Fr::random(&mut rng));
 
     // Construct a fake Sapling output as if we had just deserialized a transaction.
-    let output: OutputDescription<Authorized> = {
+    let output: OutputDescription<GrothProofBytes> = {
         let diversifier = Diversifier([0; 11]);
         let pk_d = diversifier.g_d().unwrap() * valid_ivk.0;
         let pa = PaymentAddress::from_parts(diversifier, pk_d).unwrap();

zcash_primitives/src/sapling/note_encryption.rs

@@ -386,7 +386,7 @@ pub fn try_sapling_output_recovery_with_ock<P: consensus::Parameters>(
     params: &P,
     height: BlockHeight,
     ock: &OutgoingCipherKey,
-    output: &OutputDescription<sapling::Authorized>,
+    output: &OutputDescription<sapling::GrothProofBytes>,
 ) -> Option<(Note, PaymentAddress, MemoBytes)> {
     let domain = SaplingDomain {
         params: params.clone(),
@@ -408,7 +408,7 @@ pub fn try_sapling_output_recovery<P: consensus::Parameters>(
     params: &P,
     height: BlockHeight,
     ovk: &OutgoingViewingKey,
-    output: &OutputDescription<sapling::Authorized>,
+    output: &OutputDescription<sapling::GrothProofBytes>,
 ) -> Option<(Note, PaymentAddress, MemoBytes)> {
     let domain = SaplingDomain {
         params: params.clone(),
@@ -465,7 +465,7 @@ mod tests {
         OutgoingViewingKey,
         OutgoingCipherKey,
         SaplingIvk,
-        OutputDescription<sapling::Authorized>,
+        OutputDescription<sapling::GrothProofBytes>,
     ) {
         let ivk = SaplingIvk(jubjub::Fr::random(&mut rng));
 
@@ -498,7 +498,7 @@ mod tests {
     ) -> (
         OutgoingViewingKey,
         OutgoingCipherKey,
-        OutputDescription<sapling::Authorized>,
+        OutputDescription<sapling::GrothProofBytes>,
     ) {
         let diversifier = Diversifier([0; 11]);
         let pk_d = diversifier.g_d().unwrap() * ivk.0;