From 71d31abad66de31c81ea16824cebc3498a76fc66 Mon Sep 17 00:00:00 2001
From: therealyingtong <yingtong@electriccoin.co>
Date: Thu, 30 Jul 2020 12:50:21 +0800
Subject: [PATCH] Set activation heights for Canopy

---
 zcash_primitives/src/consensus.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs
index 1b730148d..f0ea1003c 100644
--- a/zcash_primitives/src/consensus.rs
+++ b/zcash_primitives/src/consensus.rs
@@ -26,7 +26,7 @@ impl Parameters for MainNetwork {
             NetworkUpgrade::Sapling => Some(419_200),
             NetworkUpgrade::Blossom => Some(653_600),
             NetworkUpgrade::Heartwood => Some(903_000),
-            NetworkUpgrade::Canopy => None,
+            NetworkUpgrade::Canopy => Some(1_046_400),
         }
     }
 }
@@ -42,7 +42,7 @@ impl Parameters for TestNetwork {
             NetworkUpgrade::Sapling => Some(280_000),
             NetworkUpgrade::Blossom => Some(584_000),
             NetworkUpgrade::Heartwood => Some(903_800),
-            NetworkUpgrade::Canopy => None,
+            NetworkUpgrade::Canopy => Some(1_028_500),
         }
     }
 }
@@ -243,8 +243,16 @@ mod tests {
             BranchId::Sapling,
         );
         assert_eq!(
-            BranchId::for_height::<MainNetwork>(5_000_000),
+            BranchId::for_height::<MainNetwork>(903_000),
             BranchId::Heartwood,
         );
+        assert_eq!(
+            BranchId::for_height::<MainNetwork>(1_046_400),
+            BranchId::Canopy,
+        );
+        assert_eq!(
+            BranchId::for_height::<MainNetwork>(5_000_000),
+            BranchId::Canopy,
+        );
     }
 }