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

Add activation heights as consts in consensus::Parameters

This commit is contained in:
therealyingtong 2020-08-03 13:39:36 +08:00
parent b1ddd556af
commit eba542c95f
No known key found for this signature in database
GPG Key ID: 179F32A1503D607E
3 changed files with 120 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zcash_primitives/src/consensus.rs
View File

@ -3,12 +3,6 @@
use std::convert::TryFrom;
use std::fmt;
#[cfg(feature = "mainnet")]
pub const SAPLING_ACTIVATION_HEIGHT: u32 = 419_200;
#[cfg(not(feature = "mainnet"))]
pub const SAPLING_ACTIVATION_HEIGHT: u32 = 280_000;
/// Zcash consensus parameters.
pub trait Parameters {
fn activation_height(&self, nu: NetworkUpgrade) -> Option<u32>;
@ -20,9 +14,11 @@ pub trait Parameters {
}
}
fn zip_212_grace_period(&self) -> u32 {
32256
}
const OVERWINTER_ACTIVATION_HEIGHT: u32;
const SAPLING_ACTIVATION_HEIGHT: u32;
const BLOSSOM_ACTIVATION_HEIGHT: u32;
const HEARTWOOD_ACTIVATION_HEIGHT: u32;
const CANOPY_ACTIVATION_HEIGHT: u32;
}
/// Marker struct for the production network.
@ -39,6 +35,12 @@ impl Parameters for MainNetwork {
NetworkUpgrade::Canopy => Some(1_046_400),
}
}
const OVERWINTER_ACTIVATION_HEIGHT: u32 = 347_500;
const SAPLING_ACTIVATION_HEIGHT: u32 = 419_200;
const BLOSSOM_ACTIVATION_HEIGHT: u32 = 653_600;
const HEARTWOOD_ACTIVATION_HEIGHT: u32 = 903_000;
const CANOPY_ACTIVATION_HEIGHT: u32 = 1_046_400;
}
/// Marker struct for the test network.
@ -55,6 +57,12 @@ impl Parameters for TestNetwork {
NetworkUpgrade::Canopy => Some(1_028_500),
}
}
const OVERWINTER_ACTIVATION_HEIGHT: u32 = 207_500;
const SAPLING_ACTIVATION_HEIGHT: u32 = 280_200;
const BLOSSOM_ACTIVATION_HEIGHT: u32 = 584_000;
const HEARTWOOD_ACTIVATION_HEIGHT: u32 = 903_800;
const CANOPY_ACTIVATION_HEIGHT: u32 = 1_028_500;
}
/// An event that occurs at a specified height on the Zcash chain, at which point the
@ -121,6 +129,8 @@ const UPGRADES_IN_ORDER: &[NetworkUpgrade] = &[
NetworkUpgrade::Canopy,
];
pub const ZIP212_GRACE_PERIOD: u32 = 32256;
/// A globally-unique identifier for a set of consensus rules within the Zcash chain.
///
/// Each branch ID in this enum corresponds to one of the epochs between a pair of Zcash

213
zcash_primitives/src/note_encryption.rs
View File

@ -2,7 +2,7 @@
use crate::{
consensus,
consensus::NetworkUpgrade,
consensus::{NetworkUpgrade, ZIP212_GRACE_PERIOD},
jubjub::{
edwards,
fs::{Fs, FsRepr},
@ -393,7 +393,7 @@ pub fn plaintext_version_is_valid<P: consensus::Parameters>(
let grace_period_end_height = parameters
.activation_height(NetworkUpgrade::Canopy)
.expect("Should have Canopy activation height")
+ parameters.zip_212_grace_period();
+ ZIP212_GRACE_PERIOD;
if height < grace_period_end_height && leadbyte != 0x01 && leadbyte != 0x02 {
// non-{0x01,0x02} received after Canopy activation and before grace period has elapsed
@ -596,7 +596,7 @@ pub fn try_sapling_output_recovery<P: consensus::Parameters>(
mod tests {
use crate::{
consensus,
consensus::{NetworkUpgrade, Parameters, SAPLING_ACTIVATION_HEIGHT},
consensus::{NetworkUpgrade, Parameters, ZIP212_GRACE_PERIOD},
jubjub::{
edwards,
fs::{Fs, FsRepr},
@ -929,11 +929,10 @@ mod tests {
#[test]
fn decryption_with_invalid_ivk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -956,11 +955,10 @@ mod tests {
#[test]
fn decryption_with_invalid_epk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -983,11 +981,10 @@ mod tests {
#[test]
fn decryption_with_invalid_cmu() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1010,11 +1007,10 @@ mod tests {
#[test]
fn decryption_with_invalid_tag() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1039,11 +1035,10 @@ mod tests {
#[test]
fn decryption_with_invalid_version_byte() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
let leadbyte_array = [0x02, 0x03];
for (i, height_ref) in height_array.iter().enumerate() {
@ -1077,11 +1072,10 @@ mod tests {
#[test]
fn decryption_with_invalid_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1114,11 +1108,10 @@ mod tests {
#[test]
fn decryption_with_incorrect_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1151,11 +1144,10 @@ mod tests {
#[test]
fn compact_decryption_with_invalid_ivk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1178,11 +1170,10 @@ mod tests {
#[test]
fn compact_decryption_with_invalid_epk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1205,11 +1196,10 @@ mod tests {
#[test]
fn compact_decryption_with_invalid_cmu() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1232,11 +1222,10 @@ mod tests {
#[test]
fn compact_decryption_with_invalid_version_byte() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
let leadbyte_array = [0x02, 0x03];
for (i, height_ref) in height_array.iter().enumerate() {
@ -1270,11 +1259,10 @@ mod tests {
#[test]
fn compact_decryption_with_invalid_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1307,11 +1295,10 @@ mod tests {
#[test]
fn compact_decryption_with_incorrect_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1344,11 +1331,10 @@ mod tests {
#[test]
fn recovery_with_invalid_ovk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1375,11 +1361,10 @@ mod tests {
#[test]
fn recovery_with_invalid_cv() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1405,11 +1390,10 @@ mod tests {
#[test]
fn recovery_with_invalid_cmu() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1435,11 +1419,10 @@ mod tests {
#[test]
fn recovery_with_invalid_epk() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1465,11 +1448,10 @@ mod tests {
#[test]
fn recovery_with_invalid_enc_tag() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1496,11 +1478,10 @@ mod tests {
#[test]
fn recovery_with_invalid_out_tag() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1527,11 +1508,10 @@ mod tests {
#[test]
fn recovery_with_invalid_version_byte() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
let leadbyte_array = [0x02, 0x03];
for (i, height_ref) in height_array.iter().enumerate() {
@ -1567,11 +1547,10 @@ mod tests {
#[test]
fn recovery_with_invalid_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1606,11 +1585,10 @@ mod tests {
#[test]
fn recovery_with_incorrect_diversifier() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;
@ -1646,11 +1624,10 @@ mod tests {
#[test]
fn recovery_with_invalid_pk_d() {
let mut rng = OsRng;
let height_v1 = SAPLING_ACTIVATION_HEIGHT;
let height_v2 = consensus::MainNetwork
.activation_height(NetworkUpgrade::Canopy)
.unwrap();
let height_array = [height_v1, height_v2];
let height_array = [
consensus::MainNetwork::SAPLING_ACTIVATION_HEIGHT,
consensus::MainNetwork::CANOPY_ACTIVATION_HEIGHT,
];
for height_ref in height_array.iter() {
let height = *height_ref;

8
zcash_primitives/src/transaction/builder.rs
View File

@ -726,7 +726,6 @@ mod tests {
use super::{Builder, Error};
use crate::{
consensus,
consensus::SAPLING_ACTIVATION_HEIGHT,
legacy::TransparentAddress,
merkle_tree::{CommitmentTree, IncrementalWitness},
primitives::Rseed,
@ -753,15 +752,20 @@ mod tests {
#[test]
fn binding_sig_absent_if_no_shielded_spend_or_output() {
use crate::consensus::{NetworkUpgrade, Parameters};
use crate::transaction::{
builder::{self, TransparentInputs},
TransactionData,
};
let sapling_activation_height = consensus::MainNetwork
.activation_height(NetworkUpgrade::Sapling)
.unwrap();
// Create a builder with 0 fee, so we can construct t outputs
let mut builder = builder::Builder {
rng: OsRng,
height: SAPLING_ACTIVATION_HEIGHT,
height: sapling_activation_height,
mtx: TransactionData::new(),
fee: Amount::zero(),
anchor: None,