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

Merge pull request #257 from therealyingtong/canopy-activation-heights 

Set activation heights for Canopy
This commit is contained in:
str4d 2020-07-31 12:16:18 +12:00 committed by GitHub
parent f55f094ef6 71d31abad6
commit 2cca23c6d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
zcash_primitives/src/consensus.rs
View File

@ -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,
);
}
}