[TEST] Zsa swap bk

Cargo.toml

@@ -127,4 +127,4 @@ codegen-units = 1
 [patch.crates-io]
 zcash_note_encryption = { version = "0.4", git = "https://github.com/QED-it/zcash_note_encryption", branch = "zsa1" }
 sapling = { package = "sapling-crypto", version = "0.1.3", git = "https://github.com/QED-it/sapling-crypto", branch = "zsa1" }
-orchard = { version = "0.8.0", git = "https://github.com/QED-it/orchard", rev = "3dbdbc52c6e2ffeca015ae6eb80ad7f1c870384d" }
+orchard = { version = "0.8.0", git = "https://github.com/QED-it/orchard", branch = "zsa_swap_spendauth_clone" }

components/zcash_protocol/src/consensus.rs

@@ -358,6 +358,8 @@ impl Parameters for MainNetwork {
             NetworkUpgrade::Nu6 => Some(BlockHeight(2_726_400)),
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             NetworkUpgrade::Nu7 => Some(BlockHeight(2_726_401)),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            NetworkUpgrade::Swap => Some(BlockHeight(2_726_402)),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => None,
         }
@@ -390,6 +392,8 @@ impl Parameters for TestNetwork {
             NetworkUpgrade::Nu6 => Some(BlockHeight(2_976_000)),
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             NetworkUpgrade::Nu7 => Some(BlockHeight(2_976_001)),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            NetworkUpgrade::Swap => Some(BlockHeight(2_976_002)),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => None,
         }
@@ -421,6 +425,8 @@ impl Parameters for RegtestNetwork {
             NetworkUpgrade::Nu6 => Some(BlockHeight(1)),
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             NetworkUpgrade::Nu7 => Some(BlockHeight(1)),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            NetworkUpgrade::Swap => Some(BlockHeight(1)),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => None,
         }
@@ -497,6 +503,11 @@ pub enum NetworkUpgrade {
     /// [Nu7]: https://z.cash/upgrade/nu7/
     #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
     Nu7,
+    /// The [Swap] network upgrade.
+    ///
+    /// [Swap]:
+    #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+    Swap,
     /// The ZFUTURE network upgrade.
     ///
     /// This upgrade is expected never to activate on mainnet;
@@ -521,6 +532,8 @@ impl fmt::Display for NetworkUpgrade {
             NetworkUpgrade::Nu6 => write!(f, "Nu6"),
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             NetworkUpgrade::Nu7 => write!(f, "Nu7"),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            NetworkUpgrade::Swap => write!(f, "Swap"),
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => write!(f, "ZFUTURE"),
         }
@@ -540,6 +553,8 @@ impl NetworkUpgrade {
             NetworkUpgrade::Nu6 => BranchId::Nu6,
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             NetworkUpgrade::Nu7 => BranchId::Nu7,
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            NetworkUpgrade::Swap => BranchId::Swap,
             #[cfg(zcash_unstable = "zfuture")]
             NetworkUpgrade::ZFuture => BranchId::ZFuture,
         }
@@ -561,6 +576,8 @@ const UPGRADES_IN_ORDER: &[NetworkUpgrade] = &[
     NetworkUpgrade::Nu6,
     #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
     NetworkUpgrade::Nu7,
+    #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+    NetworkUpgrade::Swap,
 ];
 
 /// The "grace period" defined in [ZIP 212].
@@ -603,6 +620,9 @@ pub enum BranchId {
     /// The consensus rules deployed by [`NetworkUpgrade::Nu7`].
     #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
     Nu7,
+    /// The consensus rules deployed by [`NetworkUpgrade::Swap`].
+    #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+    Swap,
     /// Candidates for future consensus rules; this branch will never
     /// activate on mainnet.
     #[cfg(zcash_unstable = "zfuture")]
@@ -627,9 +647,13 @@ impl TryFrom<u32> for BranchId {
             0xc8e7_1055 => Ok(BranchId::Nu6),
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             0x7719_0ad8 => Ok(BranchId::Nu7),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            0x8888_8888 => Ok(BranchId::Swap),
             #[cfg(zcash_unstable = "zfuture")]
             0xffff_ffff => Ok(BranchId::ZFuture),
-            _ => Err("Unknown consensus branch ID"),
+            _ => Err(Box::leak(
+                format!("Unknown consensus branch ID: {:08x}", value).into_boxed_str(),
+            )),
         }
     }
 }
@@ -648,6 +672,8 @@ impl From<BranchId> for u32 {
             BranchId::Nu6 => 0xc8e7_1055,
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             BranchId::Nu7 => 0x7719_0ad8,
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            BranchId::Swap => 0x8888_8888,
             #[cfg(zcash_unstable = "zfuture")]
             BranchId::ZFuture => 0xffff_ffff,
         }
@@ -724,6 +750,10 @@ impl BranchId {
             BranchId::Nu7 => params
                 .activation_height(NetworkUpgrade::Nu7)
                 .map(|lower| (lower, upper_bound(lower, params))),
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            BranchId::Swap => params
+                .activation_height(NetworkUpgrade::Swap)
+                .map(|lower| (lower, upper_bound(lower, params))),
             #[cfg(zcash_unstable = "zfuture")]
             BranchId::ZFuture => params
                 .activation_height(NetworkUpgrade::ZFuture)
@@ -753,6 +783,13 @@ fn upper_bound<P: Parameters>(target_height: BlockHeight, params: &P) -> Option<
             .filter(|&nu_height| nu_height > target_height)
             .or(upper);
     }
+    #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+    {
+        upper = params
+            .activation_height(NetworkUpgrade::Swap)
+            .filter(|&nu_height| nu_height > target_height)
+            .or(upper);
+    }
     #[cfg(zcash_unstable = "zfuture")]
     {
         upper = params
@@ -783,6 +820,8 @@ pub mod testing {
             BranchId::Nu6,
             #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]
             BranchId::Nu7,
+            #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+            BranchId::Swap,
             #[cfg(zcash_unstable = "zfuture")]
             BranchId::ZFuture,
         ])
@@ -886,5 +925,10 @@ mod tests {
             BranchId::for_height(&MAIN_NETWORK, BlockHeight(2_726_401)),
             BranchId::Nu7,
         );
+        #[cfg(zcash_unstable = "nu6" /* TODO swap */ )]
+        assert_eq!(
+            BranchId::for_height(&MAIN_NETWORK, BlockHeight(2_726_402)),
+            BranchId::Swap,
+        );
     }
 }

components/zcash_protocol/src/value.rs

@@ -131,6 +131,15 @@ impl ZatBalance {
     }
 }
 
+impl Sum for ZatBalance {
+    fn sum<I>(iter: I) -> Self
+    where
+        I: Iterator<Item = Self>,
+    {
+        iter.fold(ZatBalance(0), |acc, item| ZatBalance(acc.0 + item.0))
+    }
+}
+
 impl TryFrom<i64> for ZatBalance {
     type Error = BalanceError;
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.70.0"
+channel = "1.71.0"
 components = [ "clippy", "rustfmt" ]

rustfmt.toml

@@ -0,0 +1 @@
+reorder_imports = false

zcash_primitives/Cargo.toml

@@ -50,6 +50,7 @@ nonempty.workspace = true
 orchard.workspace = true
 sapling.workspace = true
 zcash_spec.workspace = true
+pasta_curves.workspace = true
 
 # - Note Commitment Trees
 incrementalmerkletree = { workspace = true, features = ["legacy-api"] }