New transaction builder

Cargo.toml

@@ -9,6 +9,5 @@ members = [
 debug = false
 
 [patch.crates-io]
-zcash_note_encryption = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346" }
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346" }
-orchard = { git = "https://github.com/zingolabs/orchard", rev = "49874b31da4fedcb31fcfadf5ba8804bf860c4bf" }
+zcash_note_encryption = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990" }
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990" }

cli/Cargo.toml

@@ -22,8 +22,8 @@ portpicker = "0.1.1"
 rand = "0.8.5"
 tempdir = "0.3.7"
 tracing-subscriber = "0.3.15"
-zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["transparent-inputs", "test-dependencies"] }
+zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990"}
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990", features = ["transparent-inputs", "test-dependencies"] }
 
 [features]
 cross_version = [ "dep:zingtaddrfix" ]

config/Cargo.toml

@@ -10,5 +10,5 @@ log4rs = "1.1.1"
 log = "0.4.14"
 http = "0.2.4"
 dirs = "3.0.2"
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["transparent-inputs", "test-dependencies"] }
-zcash_address = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990", features = ["transparent-inputs", "test-dependencies"] }
+zcash_address = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990"}

lib/Cargo.toml

@@ -50,15 +50,15 @@ jubjub = "0.9.0"
 bls12_381 = "0.7"
 group = "0.12"
 rust-embed = { version = "6.3.0", features = ["debug-embed"] }
-orchard = "0.2.0"
+orchard = "0.3.0"
 subtle = "2.4.1"
 incrementalmerkletree = "0.3.0"
-zcash_address = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
-zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["transparent-inputs", "test-dependencies"] }
-zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
-zcash_proofs = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["multicore"]}
-zcash_encoding = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346"}
-zcash_note_encryption = { git = "https://github.com/zingolabs/librustzcash", rev = "d66f7f70516e6da5c24008874a926d41221b1346", features = ["pre-zip-212"]}
+zcash_address = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990"}
+zcash_primitives = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990", features = ["transparent-inputs", "test-dependencies"] }
+zcash_client_backend = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990"}
+zcash_proofs = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990", features = ["multicore"]}
+zcash_encoding = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990"}
+zcash_note_encryption = { git = "https://github.com/zingolabs/librustzcash", rev = "01e6bf65542d3ad8190c798a01436d9edcd9f990", features = ["pre-zip-212"]}
 zingoconfig = { path = "../config" }
 nonempty = "0.7.0"
 tracing-subscriber = "0.3.15"

lib/src/blaze/fetch_full_transaction.rs

@@ -122,7 +122,7 @@ impl TransactionContext {
         if is_outgoing_transaction {
             if let Some(t_bundle) = transaction.transparent_bundle() {
                 for vout in &t_bundle.vout {
-                    let taddr = address_from_pubkeyhash(&self.config, vout.script_pubkey.address());
+                    let taddr = address_from_pubkeyhash(&self.config, vout.recipient_address());
 
                     if taddr.is_some() && !taddrs_set.contains(taddr.as_ref().unwrap()) {
                         outgoing_metadatas.push(OutgoingTxMetadata {
@@ -173,7 +173,7 @@ impl TransactionContext {
         // Scan all transparent outputs to see if we recieved any money
         if let Some(t_bundle) = transaction.transparent_bundle() {
             for (n, vout) in t_bundle.vout.iter().enumerate() {
-                match vout.script_pubkey.address() {
+                match vout.recipient_address() {
                     Some(TransparentAddress::PublicKey(hash)) => {
                         let output_taddr =
                             hash.to_base58check(&self.config.base58_pubkey_address(), &[]);

lib/src/blaze/test_utils.rs

@@ -90,19 +90,6 @@ pub fn node_to_string<Node: Hashable>(n: &Node) -> String {
     hex::encode(b1)
 }
 
-///TODO: Is this used? This is probably covered by
-/// block_witness_data::update_tree_with_compact_transaction, consider deletion
-pub fn list_all_witness_nodes(cb: &CompactBlock) -> Vec<sapling::Node> {
-    let mut nodes = vec![];
-    for transaction in &cb.vtx {
-        for co in &transaction.outputs {
-            nodes.push(sapling::Node::new(co.cmu().unwrap().into()))
-        }
-    }
-
-    nodes
-}
-
 pub struct FakeTransaction {
     pub compact_transaction: CompactTx,
     pub data: TransactionData<zcash_primitives::transaction::Authorized>,
@@ -387,7 +374,8 @@ impl FakeCompactBlock {
     // Returns the nullifier of the new note.
     pub fn add_random_sapling_transaction(&mut self, num_outputs: usize) {
         let xsk_m = ExtendedSpendingKey::master(&[1u8; 32]);
-        let extfvk = ExtendedFullViewingKey::from(&xsk_m);
+
+        let extfvk = xsk_m.to_extended_full_viewing_key();
 
         let to = extfvk.default_address().1;
         let value = Amount::from_u64(1).unwrap();
@@ -493,7 +481,7 @@ impl FakeCompactBlockList {
                     .iter()
                     .filter_map(|vout| {
                         if let Some(TransparentAddress::PublicKey(taddr_hash)) =
-                            vout.script_pubkey.address()
+                            vout.recipient_address()
                         {
                             let taddr =
                                 taddr_hash.to_base58check(&config.base58_pubkey_address(), &[]);

lib/src/blaze/trial_decryptions.rs

@@ -29,7 +29,10 @@ use tokio::{
 use zcash_note_encryption::Domain;
 use zcash_primitives::{
     consensus::{BlockHeight, Parameters},
-    sapling::{note_encryption::SaplingDomain, SaplingIvk},
+    sapling::{
+        note_encryption::{PreparedIncomingViewingKey, SaplingDomain},
+        SaplingIvk,
+    },
     transaction::{Transaction, TxId},
 };
 use zingoconfig::ZingoConfig;
@@ -185,7 +188,7 @@ impl TrialDecryptions {
                     &compact_transaction,
                     transaction_num,
                     &compact_block,
-                    sapling_ivk.clone(),
+                    PreparedIncomingViewingKey::new(&sapling_ivk),
                     height,
                     &config,
                     &usc,

lib/src/lightclient/tests.rs

@@ -670,7 +670,7 @@ async fn sapling_to_sapling_scan_together() {
     let value = 100_000;
     let (transaction, _height, note) = fake_compactblock_list // NOTE: Extracting fvk this way for future proof.
         .create_sapling_coinbase_transaction(
-            &ExtendedFullViewingKey::from(&mockuser_spendkey),
+            &mockuser_spendkey.to_extended_full_viewing_key(),
             value,
         );
     let txid = transaction.txid();