From 07770a0be040adb2c773098e84d70fcb4fb13994 Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@z.cash>
Date: Fri, 11 Jun 2021 13:02:05 +0800
Subject: [PATCH] builder.rs: Update ActionInfo::build() to fill in Circuit
 fields.

---
 src/builder.rs | 41 ++++++++++++++++++++++++++++++++++++-----
 src/note.rs    |  2 +-
 src/tree.rs    |  2 +-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/builder.rs b/src/builder.rs
index 5228574f..7ffb8ffc 100644
--- a/src/builder.rs
+++ b/src/builder.rs
@@ -4,6 +4,7 @@ use std::convert::TryFrom;
 use std::iter;
 
 use ff::Field;
+use group::GroupEncoding;
 use nonempty::NonEmpty;
 use pasta_curves::pallas;
 use rand::{CryptoRng, RngCore};
@@ -132,7 +133,9 @@ impl ActionInfo {
         let cv_net = ValueCommitment::derive(v_net, self.rcv);
 
         let nf_old = self.spend.note.nullifier(&self.spend.fvk);
-        let ak: SpendValidatingKey = self.spend.fvk.into();
+        let sender_address = self.spend.fvk.default_address();
+        let rho_old = self.spend.note.rho();
+        let ak: SpendValidatingKey = self.spend.fvk.clone().into();
         let alpha = pallas::Scalar::random(&mut rng);
         let rk = ak.randomize(&alpha);
 
@@ -166,10 +169,33 @@ impl ActionInfo {
                 cv_net,
                 SigningMetadata {
                     dummy_ask: self.spend.dummy_sk.as_ref().map(SpendAuthorizingKey::from),
-                    parts: SigningParts { ak, alpha },
+                    parts: SigningParts {
+                        ak: ak.clone(),
+                        alpha,
+                    },
                 },
             ),
-            Default::default(), // TODO
+            Circuit {
+                path: Some(self.spend.merkle_path.auth_path()),
+                pos: Some(self.spend.merkle_path.position()),
+                g_d_old: Some(sender_address.g_d()),
+                pk_d_old: Some(*sender_address.pk_d()),
+                v_old: Some(self.spend.note.value()),
+                rho_old: Some(self.spend.note.rho()),
+                psi_old: Some(self.spend.note.rseed().psi(&rho_old)),
+                rcm_old: Some(self.spend.note.rseed().rcm(&rho_old)),
+                cm_old: Some(self.spend.note.commitment()),
+                alpha: Some(alpha),
+                ak: Some(ak),
+                nk: Some(*self.spend.fvk.nk()),
+                rivk: Some(*self.spend.fvk.rivk()),
+                g_d_new_star: Some((*note.recipient().g_d()).to_bytes()),
+                pk_d_new_star: Some(note.recipient().pk_d().to_bytes()),
+                v_new: Some(note.value()),
+                psi_new: Some(note.rseed().psi(&note.rho())),
+                rcm_new: Some(note.rseed().rcm(&note.rho())),
+                rcv: Some(ValueCommitTrapdoor::zero()),
+            },
         )
     }
 }
@@ -595,14 +621,15 @@ pub mod testing {
 
 #[cfg(test)]
 mod tests {
-    use pasta_curves::pallas;
     use rand::rngs::OsRng;
 
     use super::Builder;
     use crate::{
         bundle::{Authorized, Bundle, Flags},
         circuit::ProvingKey,
+        constants::MERKLE_DEPTH_ORCHARD,
         keys::{FullViewingKey, SpendingKey},
+        tree::EMPTY_ROOTS,
         value::NoteValue,
     };
 
@@ -615,7 +642,11 @@ mod tests {
         let fvk = FullViewingKey::from(&sk);
         let recipient = fvk.default_address();
 
-        let mut builder = Builder::new(Flags::from_parts(true, true), pallas::Base::zero().into());
+        let mut builder = Builder::new(
+            Flags::from_parts(true, true),
+            EMPTY_ROOTS[MERKLE_DEPTH_ORCHARD].into(),
+        );
+
         builder
             .add_recipient(None, recipient, NoteValue::from_raw(5000), None)
             .unwrap();
diff --git a/src/note.rs b/src/note.rs
index be5db2b5..33cdc6af 100644
--- a/src/note.rs
+++ b/src/note.rs
@@ -78,7 +78,7 @@ impl RandomSeed {
 }
 
 /// A discrete amount of funds received by an address.
-#[derive(Debug, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub struct Note {
     /// The recipient of the funds.
     recipient: Address,
diff --git a/src/tree.rs b/src/tree.rs
index b9344a5e..642fe64a 100644
--- a/src/tree.rs
+++ b/src/tree.rs
@@ -23,7 +23,7 @@ use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
 // <https://zips.z.cash/protocol/protocol.pdf#thmuncommittedorchard>
 lazy_static! {
     static ref UNCOMMITTED_ORCHARD: pallas::Base = pallas::Base::from_u64(2);
-    static ref EMPTY_ROOTS: Vec<pallas::Base> = {
+    pub(crate) static ref EMPTY_ROOTS: Vec<pallas::Base> = {
         iter::empty()
             .chain(Some(*UNCOMMITTED_ORCHARD))
             .chain(