zebra-chain: Align Nu7 consensus branch ID and TxV6 version group ID with the values used in the ZSA version of librustzcash. zebra-consensus: Allow v4 transactions for Nu7

Author: dmidem

zebra-chain/src/parameters/network_upgrade.rs

@@ -237,8 +237,9 @@ pub(crate) const CONSENSUS_BRANCH_IDS: &[(NetworkUpgrade, ConsensusBranchId)] =
     (Nu6, ConsensusBranchId(0xc8e71055)),
     (Nu6_1, ConsensusBranchId(0x4dec4df0)),
     // TODO: set below to (Nu7, ConsensusBranchId(0x77190ad8)), once the same value is set in librustzcash
+    // FIXME: upstream Zebra uses 0xffffffff
     #[cfg(any(test, feature = "zebra-test"))]
-    (Nu7, ConsensusBranchId(0xffffffff)),
+    (Nu7, ConsensusBranchId(0x77190ad8)),
     #[cfg(zcash_unstable = "zfuture")]
     (ZFuture, ConsensusBranchId(0xffffffff)),
 ];

zebra-chain/src/parameters/transaction.rs

@@ -14,4 +14,5 @@ pub const TX_V5_VERSION_GROUP_ID: u32 = 0x26A7_270A;
 
 /// The version group ID for version 6 transactions.
 /// TODO: update this after it's chosen
-pub const TX_V6_VERSION_GROUP_ID: u32 = 0xFFFF_FFFF;
+/// FIMXE: upstream Zebra uses 0xFFFF_FFFF
+pub const TX_V6_VERSION_GROUP_ID: u32 = 0x7777_7777;

zebra-consensus/src/transaction.rs

@@ -937,16 +937,18 @@ where
             | NetworkUpgrade::Canopy
             | NetworkUpgrade::Nu5
             | NetworkUpgrade::Nu6
-            | NetworkUpgrade::Nu6_1 => Ok(()),
+            | NetworkUpgrade::Nu6_1
+            | NetworkUpgrade::Nu7 => Ok(()),
 
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => Ok(()),
 
             // Does not support V4 transactions
             NetworkUpgrade::Genesis
             | NetworkUpgrade::BeforeOverwinter
-            | NetworkUpgrade::Overwinter
-            | NetworkUpgrade::Nu7 => Err(TransactionError::UnsupportedByNetworkUpgrade(
+            | NetworkUpgrade::Overwinter => Err(TransactionError::UnsupportedByNetworkUpgrade(
+            // FIXME: The upstream Zebra does not allow v4 transactions in Nu7 - is that correct?
+            //| NetworkUpgrade::Nu7 => Err(TransactionError::UnsupportedByNetworkUpgrade(
                 transaction.version(),
                 network_upgrade,
             )),