Merge branch 'zsa-integration-zsadeps' into zsa-integration-txv6

Author: dmidem

zebra-chain/Cargo.toml

@@ -68,6 +68,7 @@ bitflags = "2.5.0"
 bitflags-serde-legacy = "0.1.1"
 blake2b_simd = "1.0.2"
 blake2s_simd = "1.0.2"
+# TODO: Revert to "0.6.0" (or appropriate version) when the ZSA orchard fork is updated.
 bridgetree = "0.4.0"
 bs58 = { version = "0.5.1", features = ["check"] }
 byteorder = "1.5.0"
@@ -178,7 +179,3 @@ required-features = ["bench"]
 [[bench]]
 name = "redpallas"
 harness = false
-
-# FIXME: remove this and all zcash_unstable usage in the code after updating librustzcash
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("nu6"))'] }

zebra-chain/src/orchard/note/ciphertexts.rs

@@ -1,7 +1,5 @@
 //! Encrypted parts of Orchard notes.
 
-// FIXME: make it a generic and add support for OrchardZSA (encrypted tote size ofr it is not 580!)
-
 use std::{fmt, io};
 
 use serde_big_array::BigArray;

zebra-chain/src/orchard/shielded_data.rs

@@ -231,6 +231,8 @@ bitflags! {
         const ENABLE_SPENDS = 0b00000001;
         /// Enable creating new non-zero valued Orchard notes.
         const ENABLE_OUTPUTS = 0b00000010;
+        /// Enable ZSA transactions.
+        const ENABLE_ZSA = 0b00000100;
     }
 }
 

zebra-chain/src/parameters/network_upgrade.rs

@@ -530,11 +530,9 @@ impl From<zcash_protocol::consensus::NetworkUpgrade> for NetworkUpgrade {
             zcash_protocol::consensus::NetworkUpgrade::Heartwood => Self::Heartwood,
             zcash_protocol::consensus::NetworkUpgrade::Canopy => Self::Canopy,
             zcash_protocol::consensus::NetworkUpgrade::Nu5 => Self::Nu5,
-            // FIXME: remove cfg
-            #[cfg(zcash_unstable = "nu6")]
             zcash_protocol::consensus::NetworkUpgrade::Nu6 => Self::Nu6,
-            // FIXME: remove cfg and process Nu7 properly (uses Self::Nu6 for now)
-            #[cfg(zcash_unstable = "nu6")]
+            // FIXME: TODO: Use a proper value below.
+            #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             zcash_protocol::consensus::NetworkUpgrade::Nu7 => Self::Nu6,
         }
     }

zebra-chain/src/primitives/zcash_primitives.rs

@@ -137,8 +137,7 @@ impl zp_tx::components::orchard::MapAuth<orchard::bundle::Authorized, orchard::b
     }
 }
 
-// FIXME: is this implemetation correct?
-#[cfg(zcash_unstable = "nu6")]
+#[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
 impl zp_tx::components::issuance::MapIssueAuth<orchard::issuance::Signed, orchard::issuance::Signed>
     for IdentityMap
 {
@@ -157,12 +156,10 @@ impl<'a> zp_tx::Authorization for PrecomputedAuth<'a> {
     type SaplingAuth = sapling_crypto::bundle::Authorized;
     type OrchardAuth = orchard::bundle::Authorized;
 
-    // FIXME: is this correct?
-    #[cfg(zcash_unstable = "nu6")]
+    #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
     type OrchardZsaAuth = orchard::bundle::Authorized;
 
-    // FIXME: is this correct?
-    #[cfg(zcash_unstable = "nu6")]
+    #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
     type IssueAuth = orchard::issuance::Signed;
 }
 
@@ -294,10 +291,8 @@ impl<'a> PrecomputedTxData<'a> {
                 all_prev_outputs: all_previous_outputs,
             },
         };
-        let tx_data: zp_tx::TransactionData<PrecomputedAuth> = alt_tx
-            .into_data()
-            // FIXME: do we need to pass another arg values or orchard_zsa and issue instead of IdentityMap?
-            .map_authorization(
+        let tx_data: zp_tx::TransactionData<PrecomputedAuth> =
+            alt_tx.into_data().map_authorization(
                 f_transparent,
                 IdentityMap,
                 IdentityMap,

zebra-consensus/src/primitives/halo2.rs

@@ -75,7 +75,6 @@ pub type ItemVerifyingKey = VerifyingKey;
 
 lazy_static::lazy_static! {
     /// The halo2 proof verifying key.
-    // FIXME: support OrchardZSA?
     pub static ref VERIFYING_KEY: ItemVerifyingKey = ItemVerifyingKey::build::<OrchardVanilla>();
 }
 
@@ -144,14 +143,8 @@ impl From<&zebra_chain::orchard::ShieldedData> for Item {
             .flags
             .contains(zebra_chain::orchard::Flags::ENABLE_OUTPUTS);
 
-        // FIXME: simplify the flags creation - make `Flags::from_parts` method pub?
-        // FIXME: support OrchardZSA?
-        let flags = match (enable_spend, enable_output) {
-            (false, false) => orchard::builder::BundleType::DISABLED.flags(),
-            (false, true) => orchard::bundle::Flags::SPENDS_DISABLED_WITHOUT_ZSA,
-            (true, false) => orchard::bundle::Flags::OUTPUTS_DISABLED,
-            (true, true) => orchard::bundle::Flags::ENABLED_WITHOUT_ZSA,
-        };
+        let flags = orchard::bundle::Flags::from_byte(shielded_data.flags.bits())
+            .expect("type should not have unexpected bits");
 
         let instances = shielded_data
             .actions()

zebra-consensus/src/primitives/halo2/tests.rs

@@ -88,14 +88,7 @@ fn generate_test_vectors() {
                             rk: <[u8; 32]>::from(a.rk()).into(),
                             cm_x: pallas::Base::from_repr(a.cmx().into()).unwrap(),
                             ephemeral_key: a.encrypted_note().epk_bytes.try_into().unwrap(),
-                            // FIXME: support OrchardZSA too, 580 works for OrchardVanilla only!
-                            // FIXME: consider more "type safe" way to do the following conversion
-                            // (now it goes through &[u8])
-                            enc_ciphertext: <[u8; 580]>::try_from(
-                                a.encrypted_note().enc_ciphertext.as_ref(),
-                            )
-                            .unwrap()
-                            .into(),
+                            enc_ciphertext: a.encrypted_note().enc_ciphertext.0.into(),
                             out_ciphertext: a.encrypted_note().out_ciphertext.into(),
                         };
                         zebra_chain::orchard::shielded_data::AuthorizedAction {