zec
/
librustzcash
mirror of https://github.com/zcash/librustzcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #239 from str4d/heartwood-activation 

Set activation heights for Heartwood network upgrade
This commit is contained in:
str4d 2020-06-04 16:19:43 +12:00 committed by GitHub
parent 5ff8562744 3779c12e31
commit cf75dc559d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zcash_primitives/src/consensus.rs
View File

@ -25,7 +25,7 @@ impl Parameters for MainNetwork {
NetworkUpgrade::Overwinter => Some(347_500), NetworkUpgrade::Overwinter => Some(347_500),
NetworkUpgrade::Sapling => Some(419_200), NetworkUpgrade::Sapling => Some(419_200),
NetworkUpgrade::Blossom => Some(653_600), NetworkUpgrade::Blossom => Some(653_600),
NetworkUpgrade::Heartwood => None, NetworkUpgrade::Heartwood => Some(903_000),
} }
} }
} }
@ -40,7 +40,7 @@ impl Parameters for TestNetwork {
NetworkUpgrade::Overwinter => Some(207_500), NetworkUpgrade::Overwinter => Some(207_500),
NetworkUpgrade::Sapling => Some(280_000), NetworkUpgrade::Sapling => Some(280_000),
NetworkUpgrade::Blossom => Some(584_000), NetworkUpgrade::Blossom => Some(584_000),
NetworkUpgrade::Heartwood => None, NetworkUpgrade::Heartwood => Some(903_800),
} }
} }
} }
@ -231,7 +231,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
BranchId::for_height::<MainNetwork>(5_000_000), BranchId::for_height::<MainNetwork>(5_000_000),
BranchId::Blossom, BranchId::Heartwood,
); );
} }
} }