use zip_212_enforcement

ZcashFoundation · May 18, 2024 · 3e4aa04 · 3e4aa04
1 parent bca2c28
commit 3e4aa04
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/zebra-chain/src/parameters/network_upgrade.rs b/zebra-chain/src/parameters/network_upgrade.rs
@@ -30,7 +30,7 @@ pub const NETWORK_UPGRADES_IN_ORDER: [NetworkUpgrade; 8] = [
 ///
 /// Network upgrades can change the Zcash network protocol or consensus rules in
 /// incompatible ways.
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
+#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, Serialize, Deserialize, Ord, PartialOrd)]
 #[cfg_attr(any(test, feature = "proptest-impl"), derive(Arbitrary))]
 pub enum NetworkUpgrade {
     /// The Zcash protocol for a Genesis block.

diff --git a/zebra-chain/src/primitives/zcash_note_encryption.rs b/zebra-chain/src/primitives/zcash_note_encryption.rs
@@ -22,12 +22,18 @@ pub fn decrypts_successfully(transaction: &Transaction, network: &Network, heigh
 
     let null_sapling_ovk = sapling::keys::OutgoingViewingKey([0u8; 32]);
 
+    let zip_212_enforcement = if network_upgrade >= NetworkUpgrade::Canopy {
+        sapling::note_encryption::Zip212Enforcement::On
+    } else {
+        sapling::note_encryption::Zip212Enforcement::Off
+    };
+
     if let Some(bundle) = alt_tx.sapling_bundle() {
         for output in bundle.shielded_outputs().iter() {
             let recovery = sapling::note_encryption::try_sapling_output_recovery(
                 &null_sapling_ovk,
                 output,
-                sapling::note_encryption::Zip212Enforcement::GracePeriod,
+                zip_212_enforcement,
             );
             if recovery.is_none() {
                 return false;