Manual partial sync of upstream (ZcashFoundation) v2.4.2 to reduce future merge conflicts

.cargo/config.toml

@@ -3,8 +3,8 @@
 # Flags that apply to all Zebra crates and configurations
 [target.'cfg(all())']
 rustflags = [
-    # Enable tx-v6 everywhere by default
-    "--cfg", 'feature="tx-v6"',
+    # Enable tx_v6 everywhere by default
+    "--cfg", 'feature="tx_v6"',
 
     # TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
     "--cfg", "zcash_unstable=\"nu7\"",
@@ -88,8 +88,8 @@ rustflags = [
 
 [build]
 rustdocflags = [
-    # Enable tx-v6 everywhere by default
-    "--cfg", 'feature="tx-v6"',
+    # Enable tx_v6 everywhere by default
+    "--cfg", 'feature="tx_v6"',
 
     # TODO: Consider removing this line later (it's needed for the ZSA version of librustzcash crates)
     "--cfg", "zcash_unstable=\"nu7\"",

zebra-chain/Cargo.toml

@@ -62,7 +62,7 @@ proptest-impl = [
 bench = ["zebra-test"]
 
 # Support for transaction version 6
-tx-v6 = [
+tx_v6 = [
     "nonempty"
 ]
 

zebra-chain/src/lib.rs

@@ -41,7 +41,7 @@ pub mod transparent;
 pub mod value_balance;
 pub mod work;
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 pub mod orchard_zsa;
 
 #[cfg(any(test, feature = "proptest-impl"))]

zebra-chain/src/orchard.rs

@@ -26,5 +26,5 @@ pub use note::{EncryptedNote, Note, Nullifier, WrappedNoteKey};
 pub use shielded_data::{AuthorizedAction, Flags, ShieldedData};
 pub use shielded_data_flavor::{OrchardVanilla, ShieldedDataFlavor};
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 pub use shielded_data_flavor::OrchardZSA;

zebra-chain/src/orchard/commitment.rs

@@ -14,7 +14,7 @@ use halo2::{
 use lazy_static::lazy_static;
 use rand_core::{CryptoRng, RngCore};
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 use orchard::{
     note::AssetBase,
     value::{ValueCommitTrapdoor, ValueSum},
@@ -243,7 +243,7 @@ impl ValueCommitment {
     {
         let rcv = generate_trapdoor(csprng)?;
 
-        #[cfg(feature = "tx-v6")]
+        #[cfg(feature = "tx_v6")]
         let vc = Self::new(
             rcv,
             // TODO: Make the `ValueSum::from_raw` function public in the `orchard` crate
@@ -253,7 +253,7 @@ impl ValueCommitment {
             AssetBase::native(),
         );
 
-        #[cfg(not(feature = "tx-v6"))]
+        #[cfg(not(feature = "tx_v6"))]
         let vc = Self::new(rcv, value);
 
         Ok(vc)
@@ -264,14 +264,14 @@ impl ValueCommitment {
     /// ValueCommit^Orchard(v) :=
     ///
     /// <https://zips.z.cash/protocol/nu5.pdf#concretehomomorphiccommit>
-    #[cfg(not(feature = "tx-v6"))]
+    #[cfg(not(feature = "tx_v6"))]
     pub fn new(rcv: pallas::Scalar, value: Amount) -> Self {
         let v = pallas::Scalar::from(value);
         Self::from(*V * v + *R * rcv)
     }
 
     /// Generate a new `ValueCommitment` from an existing `rcv on a `value` (ZSA version).
-    #[cfg(feature = "tx-v6")]
+    #[cfg(feature = "tx_v6")]
     pub fn new(rcv: pallas::Scalar, value: ValueSum, asset: AssetBase) -> Self {
         // TODO: Add `pub` methods to `ValueCommitTrapdoor` and `ValueCommitment` in `orchard`
         // to simplify type conversions when calling `orchard::value::ValueCommitment::derive`.

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

@@ -113,7 +113,7 @@ mod tests {
         serialization::{ZcashDeserialize, ZcashSerialize},
     };
 
-    #[cfg(feature = "tx-v6")]
+    #[cfg(feature = "tx_v6")]
     use crate::orchard::OrchardZSA;
 
     use proptest::prelude::*;
@@ -138,7 +138,7 @@ mod tests {
         }
 
 
-        #[cfg(feature = "tx-v6")]
+        #[cfg(feature = "tx_v6")]
         #[test]
         fn encrypted_ciphertext_roundtrip_orchard_zsa(ec in any::<<OrchardZSA as ShieldedDataFlavor>::EncryptedNote>()) {
             let _init_guard = zebra_test::init();

zebra-chain/src/orchard/shielded_data.rs

@@ -20,22 +20,22 @@ use crate::{
     },
 };
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 use crate::orchard_zsa::compute_burn_value_commitment;
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 use orchard::{note::AssetBase, value::ValueSum};
 
 use super::{OrchardVanilla, ShieldedDataFlavor};
 
 /// A bundle of [`Action`] descriptions and signature data.
 #[derive(Clone, Debug, PartialEq, Eq, Deserialize, Serialize)]
 #[cfg_attr(
-    not(feature = "tx-v6"),
+    not(feature = "tx_v6"),
     serde(bound(serialize = "Flavor::EncryptedNote: serde::Serialize"))
 )]
 #[cfg_attr(
-    feature = "tx-v6",
+    feature = "tx_v6",
     serde(bound(
         serialize = "Flavor::EncryptedNote: serde::Serialize, Flavor::BurnType: serde::Serialize",
         deserialize = "Flavor::BurnType: serde::Deserialize<'de>"
@@ -61,7 +61,7 @@ pub struct ShieldedData<Flavor: ShieldedDataFlavor> {
     /// Denoted as `bindingSigOrchard` in the spec.
     pub binding_sig: Signature<Binding>,
 
-    #[cfg(feature = "tx-v6")]
+    #[cfg(feature = "tx_v6")]
     /// Assets intended for burning
     /// Denoted as `vAssetBurn` in the spec (ZIP 230).
     pub burn: Flavor::BurnType,
@@ -123,13 +123,13 @@ impl<Flavor: ShieldedDataFlavor> ShieldedData<Flavor> {
     pub fn binding_verification_key(&self) -> reddsa::VerificationKeyBytes<Binding> {
         let cv: ValueCommitment = self.actions().map(|action| action.cv).sum();
 
-        #[cfg(not(feature = "tx-v6"))]
+        #[cfg(not(feature = "tx_v6"))]
         let key = {
             let cv_balance = ValueCommitment::new(pallas::Scalar::zero(), self.value_balance);
             cv - cv_balance
         };
 
-        #[cfg(feature = "tx-v6")]
+        #[cfg(feature = "tx_v6")]
         let key = {
             let cv_balance = ValueCommitment::new(
                 pallas::Scalar::zero(),

zebra-chain/src/orchard/shielded_data_flavor.rs

@@ -8,12 +8,12 @@ use orchard::{domain::OrchardDomainCommon, orchard_flavor::OrchardFlavor};
 
 pub use orchard::orchard_flavor::OrchardVanilla;
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 pub use orchard::{note::AssetBase, orchard_flavor::OrchardZSA, value::NoteValue};
 
 use crate::serialization::{ZcashDeserialize, ZcashSerialize};
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 use crate::orchard_zsa::{Burn, BurnItem, NoBurn};
 
 use super::note;
@@ -50,7 +50,7 @@ pub trait ShieldedDataFlavor: OrchardFlavor {
         + test_arbitrary::TestArbitrary;
 
     /// A type representing a burn field for this protocol version.
-    #[cfg(feature = "tx-v6")]
+    #[cfg(feature = "tx_v6")]
     type BurnType: Clone
         + Debug
         + ZcashDeserialize
@@ -62,11 +62,11 @@ pub trait ShieldedDataFlavor: OrchardFlavor {
 
 impl ShieldedDataFlavor for OrchardVanilla {
     type EncryptedNote = note::EncryptedNote<{ OrchardVanilla::ENC_CIPHERTEXT_SIZE }>;
-    #[cfg(feature = "tx-v6")]
+    #[cfg(feature = "tx_v6")]
     type BurnType = NoBurn;
 }
 
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 impl ShieldedDataFlavor for OrchardZSA {
     type EncryptedNote = note::EncryptedNote<{ OrchardZSA::ENC_CIPHERTEXT_SIZE }>;
     type BurnType = Burn;

zebra-chain/src/parameters/transaction.rs

@@ -17,5 +17,5 @@ pub const TX_V5_VERSION_GROUP_ID: u32 = 0x26A7_270A;
 /// OrchardZSA transactions must use transaction version 6 and this version
 /// group ID.
 // TODO: FIXME: use a proper value!
-#[cfg(feature = "tx-v6")]
+#[cfg(feature = "tx_v6")]
 pub const TX_V6_VERSION_GROUP_ID: u32 = 0x7777_7777;

zebra-chain/src/primitives/zcash_primitives.rs

@@ -10,7 +10,7 @@ use crate::{
     amount::{Amount, NonNegative},
     parameters::{ConsensusBranchId, Network},
     serialization::ZcashSerialize,
-    transaction::{tx_v5_and_v6, AuthDigest, HashType, SigHash, Transaction},
+    transaction::{AuthDigest, HashType, SigHash, Transaction},
     transparent::{self, Script},
 };
 
@@ -174,7 +174,11 @@ impl TryFrom<&Transaction> for zp_tx::Transaction {
     #[allow(clippy::unwrap_in_result)]
     fn try_from(trans: &Transaction) -> Result<Self, Self::Error> {
         let network_upgrade = match trans {
-            tx_v5_and_v6! {
+            Transaction::V5 {
+                network_upgrade, ..
+            } => network_upgrade,
+            #[cfg(feature = "tx_v6")]
+            Transaction::V6 {
                 network_upgrade, ..
             } => network_upgrade,
             Transaction::V1 { .. }