From c24024b8e18242820fe7c74bc6099fa647fc3c11 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Mon, 25 Nov 2019 15:41:14 +0000 Subject: [PATCH 1/3] Create a consensus::BranchId enum for type safety Includes all currently-known consensus branch IDs for the Zcash network. --- zcash_primitives/src/consensus.rs | 48 +++++++++++++++++++++ zcash_primitives/src/lib.rs | 1 + zcash_primitives/src/transaction/builder.rs | 25 +++++++---- zcash_primitives/src/transaction/sighash.rs | 8 ++-- zcash_primitives/src/transaction/tests.rs | 45 +++++++++---------- 5 files changed, 93 insertions(+), 34 deletions(-) create mode 100644 zcash_primitives/src/consensus.rs diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs new file mode 100644 index 000000000..aa2c67ffe --- /dev/null +++ b/zcash_primitives/src/consensus.rs @@ -0,0 +1,48 @@ +//! Consensus parameters. + +/// 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 +/// network upgrades. For example, `BranchId::Overwinter` corresponds to the blocks +/// starting at Overwinter activation, and ending the block before Sapling activation. +/// +/// The main use of the branch ID is in signature generation: transactions commit to a +/// specific branch ID by including it as part of [`signature_hash`]. This ensures +/// two-way replay protection for transactions across network upgrades. +/// +/// See [ZIP 200](https://zips.z.cash/zip-0200) for more details. +/// +/// [`signature_hash`]: crate::transaction::signature_hash +#[derive(Clone, Copy, Debug)] +pub enum BranchId { + /// The consensus rules at the launch of Zcash. + Sprout, + /// The consensus rules deployed in the [Overwinter] network upgrade. + /// + /// [Overwinter]: https://z.cash/upgrade/overwinter/ + Overwinter, + /// The consensus rules deployed in the [Sapling] network upgrade. + /// + /// [Sapling]: https://z.cash/upgrade/sapling/ + Sapling, + /// The consensus rules deployed in the [Blossom] network upgrade. + /// + /// [Blossom]: https://z.cash/upgrade/blossom/ + Blossom, + /// The consensus rules deployed in the [Heartwood] network upgrade. + /// + /// [Heartwood]: https://z.cash/upgrade/heartwood/ + Heartwood, +} + +impl From for u32 { + fn from(consensus_branch_id: BranchId) -> u32 { + match consensus_branch_id { + BranchId::Sprout => 0, + BranchId::Overwinter => 0x5ba8_1b19, + BranchId::Sapling => 0x76b8_09bb, + BranchId::Blossom => 0x2bb4_0e60, + BranchId::Heartwood => 0xf5b9_230b, + } + } +} diff --git a/zcash_primitives/src/lib.rs b/zcash_primitives/src/lib.rs index 020385e8c..8175a2628 100644 --- a/zcash_primitives/src/lib.rs +++ b/zcash_primitives/src/lib.rs @@ -9,6 +9,7 @@ use lazy_static::lazy_static; pub mod block; +pub mod consensus; pub mod constants; pub mod group_hash; pub mod jubjub; diff --git a/zcash_primitives/src/transaction/builder.rs b/zcash_primitives/src/transaction/builder.rs index 03a8c2029..ce0bfe9b6 100644 --- a/zcash_primitives/src/transaction/builder.rs +++ b/zcash_primitives/src/transaction/builder.rs @@ -10,6 +10,7 @@ use pairing::bls12_381::{Bls12, Fr}; use rand::{rngs::OsRng, seq::SliceRandom, CryptoRng, RngCore}; use crate::{ + consensus, keys::OutgoingViewingKey, legacy::TransparentAddress, merkle_tree::{CommitmentTreeWitness, IncrementalWitness}, @@ -211,7 +212,11 @@ impl TransparentInputs { } #[cfg(feature = "transparent-inputs")] - fn apply_signatures(&self, mtx: &mut TransactionData, consensus_branch_id: u32) { + fn apply_signatures( + &self, + mtx: &mut TransactionData, + consensus_branch_id: consensus::BranchId, + ) { let mut sighash = [0u8; 32]; for (i, info) in self.inputs.iter().enumerate() { sighash.copy_from_slice(&signature_hash_data( @@ -234,7 +239,7 @@ impl TransparentInputs { } #[cfg(not(feature = "transparent-inputs"))] - fn apply_signatures(&self, _: &mut TransactionData, _: u32) {} + fn apply_signatures(&self, _: &mut TransactionData, _: consensus::BranchId) {} } /// Metadata about a transaction created by a [`Builder`]. @@ -430,7 +435,7 @@ impl Builder { /// the network. pub fn build( mut self, - consensus_branch_id: u32, + consensus_branch_id: consensus::BranchId, prover: impl TxProver, ) -> Result<(Transaction, TransactionMetadata), Error> { let mut tx_metadata = TransactionMetadata::new(); @@ -666,6 +671,7 @@ mod tests { use super::{Builder, Error}; use crate::{ + consensus, legacy::TransparentAddress, merkle_tree::{CommitmentTree, IncrementalWitness}, prover::mock::MockTxProver, @@ -713,7 +719,7 @@ mod tests { { let builder = Builder::new(0); assert_eq!( - builder.build(1, MockTxProver), + builder.build(consensus::BranchId::Sapling, MockTxProver), Err(Error::ChangeIsNegative(Amount::from_i64(-10000).unwrap())) ); } @@ -735,7 +741,7 @@ mod tests { ) .unwrap(); assert_eq!( - builder.build(1, MockTxProver), + builder.build(consensus::BranchId::Sapling, MockTxProver), Err(Error::ChangeIsNegative(Amount::from_i64(-60000).unwrap())) ); } @@ -751,7 +757,7 @@ mod tests { ) .unwrap(); assert_eq!( - builder.build(1, MockTxProver), + builder.build(consensus::BranchId::Sapling, MockTxProver), Err(Error::ChangeIsNegative(Amount::from_i64(-60000).unwrap())) ); } @@ -791,7 +797,7 @@ mod tests { ) .unwrap(); assert_eq!( - builder.build(1, MockTxProver), + builder.build(consensus::BranchId::Sapling, MockTxProver), Err(Error::ChangeIsNegative(Amount::from_i64(-1).unwrap())) ); } @@ -824,7 +830,10 @@ mod tests { Amount::from_u64(20000).unwrap(), ) .unwrap(); - assert_eq!(builder.build(1, MockTxProver), Err(Error::BindingSig)) + assert_eq!( + builder.build(consensus::BranchId::Sapling, MockTxProver), + Err(Error::BindingSig) + ) } } } diff --git a/zcash_primitives/src/transaction/sighash.rs b/zcash_primitives/src/transaction/sighash.rs index f6dcd30d4..4319f4175 100644 --- a/zcash_primitives/src/transaction/sighash.rs +++ b/zcash_primitives/src/transaction/sighash.rs @@ -7,7 +7,7 @@ use super::{ Transaction, TransactionData, OVERWINTER_VERSION_GROUP_ID, SAPLING_TX_VERSION, SAPLING_VERSION_GROUP_ID, }; -use crate::legacy::Script; +use crate::{consensus, legacy::Script}; const ZCASH_SIGHASH_PERSONALIZATION_PREFIX: &[u8; 12] = b"ZcashSigHash"; const ZCASH_PREVOUTS_HASH_PERSONALIZATION: &[u8; 16] = b"ZcashPrevoutHash"; @@ -152,7 +152,7 @@ fn shielded_outputs_hash(tx: &TransactionData) -> Blake2bHash { pub fn signature_hash_data( tx: &TransactionData, - consensus_branch_id: u32, + consensus_branch_id: consensus::BranchId, hash_type: u32, transparent_input: Option<(usize, &Script, Amount)>, ) -> Vec { @@ -162,7 +162,7 @@ pub fn signature_hash_data( let mut personal = [0; 16]; (&mut personal[..12]).copy_from_slice(ZCASH_SIGHASH_PERSONALIZATION_PREFIX); (&mut personal[12..]) - .write_u32::(consensus_branch_id) + .write_u32::(consensus_branch_id.into()) .unwrap(); let mut h = Blake2bParams::new() @@ -230,7 +230,7 @@ pub fn signature_hash_data( pub fn signature_hash( tx: &Transaction, - consensus_branch_id: u32, + consensus_branch_id: consensus::BranchId, hash_type: u32, transparent_input: Option<(usize, &Script, Amount)>, ) -> Vec { diff --git a/zcash_primitives/src/transaction/tests.rs b/zcash_primitives/src/transaction/tests.rs index 19b110ad2..2dbf07e0c 100644 --- a/zcash_primitives/src/transaction/tests.rs +++ b/zcash_primitives/src/transaction/tests.rs @@ -5,6 +5,7 @@ use rand_core::OsRng; use crate::jubjub::{fs::Fs, FixedGenerators}; use super::{components::Amount, sighash::signature_hash, Transaction, TransactionData}; +use crate::consensus; use crate::legacy::Script; use crate::redjubjub::PrivateKey; use crate::JUBJUB; @@ -216,7 +217,7 @@ fn zip_0143() { transparent_input: Option, hash_type: u32, amount: i64, - consensus_branch_id: u32, + consensus_branch_id: consensus::BranchId, sighash: [u8; 32], }; @@ -233,7 +234,7 @@ fn zip_0143() { transparent_input: None, hash_type: 1, amount: 1672704339313879, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0xa1, 0xf1, 0xa4, 0xe5, 0xcd, 0x9b, 0xd5, 0x22, 0x32, 0x2d, 0x66, 0x1e, 0xdd, 0x2a, 0xf1, 0xbf, 0x2a, 0x70, 0x19, 0xcf, 0xab, 0x94, 0xec, 0xe1, 0x8f, 0x4b, 0xa9, 0x35, @@ -522,7 +523,7 @@ fn zip_0143() { transparent_input: Some(1), hash_type: 3, amount: 365293780364847, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x23, 0x65, 0x2e, 0x76, 0xcb, 0x13, 0xb8, 0x5a, 0x0e, 0x33, 0x63, 0xbb, 0x5f, 0xca, 0x06, 0x1f, 0xa7, 0x91, 0xc4, 0x0c, 0x53, 0x3e, 0xcc, 0xee, 0x89, 0x93, 0x64, 0xe6, @@ -682,7 +683,7 @@ fn zip_0143() { transparent_input: Some(0), hash_type: 3, amount: 711752082734717, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0xb3, 0x8e, 0x31, 0x70, 0x8c, 0xb7, 0x8e, 0xee, 0xc7, 0x66, 0x3e, 0xca, 0x1e, 0x01, 0xb7, 0x53, 0x9e, 0x26, 0xb7, 0x30, 0xcf, 0x44, 0x6d, 0x3b, 0xf5, 0x7a, 0x99, 0x8e, @@ -964,7 +965,7 @@ fn zip_0143() { transparent_input: None, hash_type: 1, amount: 379068098637835, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x92, 0xe7, 0xb4, 0x8f, 0x32, 0x81, 0x87, 0x71, 0x26, 0x87, 0xaf, 0x4d, 0xc1, 0x7a, 0x73, 0xfe, 0x0a, 0x70, 0xac, 0x07, 0x8d, 0x24, 0xcd, 0xcd, 0xd4, 0x58, 0xa3, 0xd6, @@ -1123,7 +1124,7 @@ fn zip_0143() { transparent_input: Some(0), hash_type: 3, amount: 1437866676382615, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0xd8, 0xe9, 0xb9, 0x72, 0xb2, 0x89, 0x8e, 0xfc, 0xca, 0x8e, 0x96, 0xbc, 0x98, 0x70, 0x00, 0x8c, 0xdb, 0xc1, 0x9d, 0x45, 0xb7, 0x8d, 0x09, 0xef, 0xb1, 0x02, 0xf2, 0xd7, @@ -1143,7 +1144,7 @@ fn zip_0143() { transparent_input: None, hash_type: 1, amount: 1993227025071196, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x2b, 0x62, 0xff, 0x0c, 0x8d, 0xec, 0x4d, 0xf1, 0x8b, 0x99, 0x56, 0x61, 0x5b, 0x57, 0x4d, 0xda, 0x39, 0x42, 0xfe, 0x45, 0x2d, 0x91, 0x78, 0xb0, 0xbb, 0xb2, 0xea, 0xee, @@ -1166,7 +1167,7 @@ fn zip_0143() { transparent_input: Some(1), hash_type: 130, amount: 449567650863240, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x49, 0x3d, 0x49, 0xc3, 0xe2, 0x22, 0x5d, 0x11, 0xc4, 0x64, 0x05, 0x18, 0x20, 0x14, 0x76, 0x25, 0xf3, 0x90, 0x9f, 0xa7, 0x18, 0x9f, 0x61, 0xc7, 0xea, 0xec, 0xfc, 0x6d, @@ -1448,7 +1449,7 @@ fn zip_0143() { transparent_input: None, hash_type: 1, amount: 1712463999734827, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0xbb, 0x10, 0x30, 0x0e, 0x4d, 0xaf, 0xe3, 0x0c, 0x3f, 0xf0, 0x26, 0x34, 0xd0, 0xe0, 0x03, 0x2f, 0x17, 0x15, 0xb0, 0x0c, 0xbc, 0x77, 0x3d, 0xf6, 0xb0, 0x9e, 0x00, 0x43, @@ -1606,7 +1607,7 @@ fn zip_0143() { transparent_input: Some(1), hash_type: 1, amount: 1564816348934332, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x21, 0x46, 0x62, 0xc6, 0x74, 0x50, 0x60, 0x3d, 0x8a, 0xa7, 0x3b, 0xea, 0xbb, 0xf7, 0x51, 0x8d, 0x03, 0x6c, 0xe9, 0x1d, 0xc8, 0x7b, 0x01, 0x81, 0xe8, 0xa0, 0xf3, 0xfa, @@ -1889,7 +1890,7 @@ fn zip_0143() { transparent_input: Some(0), hash_type: 2, amount: 483959951916902, - consensus_branch_id: 1537743641, + consensus_branch_id: consensus::BranchId::Overwinter, sighash: [ 0x29, 0x6f, 0xd7, 0x63, 0xf2, 0x54, 0x5e, 0x64, 0xfb, 0x5d, 0x7d, 0x49, 0xc0, 0x00, 0xd2, 0xb4, 0x18, 0xb9, 0x3b, 0xde, 0x22, 0x34, 0xf8, 0x74, 0x29, 0x11, 0xe8, 0xaf, @@ -1925,7 +1926,7 @@ fn zip_0243() { transparent_input: Option, hash_type: u32, amount: i64, - consensus_branch_id: u32, + consensus_branch_id: consensus::BranchId, sighash: [u8; 32], }; @@ -2233,7 +2234,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1969273897303781, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x63, 0xd1, 0x85, 0x34, 0xde, 0x5f, 0x2d, 0x1c, 0x9e, 0x16, 0x9b, 0x73, 0xf9, 0xc7, 0x83, 0x71, 0x8a, 0xdb, 0xef, 0x5c, 0x8a, 0x7d, 0x55, 0xb5, 0xe7, 0xa3, 0x7a, 0xff, @@ -2466,7 +2467,7 @@ fn zip_0243() { transparent_input: Some(1), hash_type: 2, amount: 652655344020909, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0xbb, 0xe6, 0xd8, 0x4f, 0x57, 0xc5, 0x6b, 0x29, 0xb9, 0x14, 0xc6, 0x94, 0xba, 0xac, 0xcb, 0x89, 0x12, 0x97, 0xe9, 0x61, 0xde, 0x3e, 0xb4, 0x6c, 0x68, 0xe3, 0xc8, 0x9c, @@ -3052,7 +3053,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1345602751504862, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x15, 0x53, 0xd4, 0xf1, 0x07, 0x45, 0x10, 0x71, 0x81, 0x99, 0x00, 0x5f, 0xef, 0xaa, 0xa8, 0x3e, 0x29, 0xd1, 0x63, 0xee, 0xbd, 0xf3, 0xc0, 0x33, 0x82, 0x79, 0x08, 0xac, @@ -3373,7 +3374,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1039204199089370, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x6c, 0x4e, 0x32, 0x44, 0xc2, 0xd2, 0xbf, 0xb8, 0xd6, 0xf6, 0x69, 0x97, 0x77, 0xa1, 0x1a, 0x64, 0xad, 0xfe, 0xe4, 0x9b, 0x2f, 0xc7, 0x81, 0xe6, 0x95, 0x15, 0x34, 0xf9, @@ -3523,7 +3524,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 691732482992802, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x5d, 0x40, 0x5a, 0x1c, 0x4d, 0xed, 0x19, 0x87, 0x98, 0x8a, 0x10, 0x03, 0x64, 0xa3, 0xcd, 0x6f, 0xe0, 0xba, 0x22, 0x20, 0xa6, 0xab, 0xce, 0x08, 0xc5, 0x17, 0x13, 0x59, @@ -3923,7 +3924,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1152393991505765, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x58, 0x11, 0x0e, 0x23, 0x19, 0xad, 0x85, 0x50, 0x4a, 0x69, 0x8f, 0x73, 0xe7, 0xac, 0x31, 0xa7, 0x23, 0xa0, 0x29, 0xec, 0x07, 0xb7, 0x72, 0xfb, 0xb3, 0x2f, 0xba, 0x17, @@ -4087,7 +4088,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1788797765223798, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0xcb, 0xfa, 0x22, 0x69, 0x9b, 0x04, 0xbe, 0xb7, 0x67, 0x07, 0xb5, 0x1d, 0x62, 0x5e, 0x94, 0xd2, 0x6c, 0x0d, 0xf8, 0xad, 0xa7, 0xcf, 0x68, 0xfc, 0xde, 0xd9, 0x60, 0x65, @@ -4685,7 +4686,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1871432121379810, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x36, 0x77, 0xa9, 0x48, 0x4f, 0x04, 0x04, 0xfb, 0x50, 0x64, 0x58, 0x56, 0xf4, 0xd4, 0xa7, 0x0b, 0x2e, 0x2b, 0x1c, 0x2d, 0x86, 0x2f, 0x1d, 0x4e, 0xf6, 0x8d, 0x52, 0x09, @@ -5194,7 +5195,7 @@ fn zip_0243() { transparent_input: None, hash_type: 1, amount: 1501997449504444, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0xa1, 0xcf, 0x50, 0xcf, 0xfe, 0x59, 0xbe, 0x5f, 0x31, 0x5f, 0xfe, 0x51, 0x6e, 0x28, 0x9e, 0xe8, 0x02, 0x5e, 0x59, 0x38, 0xf1, 0xe8, 0xe1, 0x88, 0x53, 0x7f, 0xf1, 0xa8, @@ -5384,7 +5385,7 @@ fn zip_0243() { transparent_input: Some(0), hash_type: 3, amount: 391892287957268, - consensus_branch_id: 1991772603, + consensus_branch_id: consensus::BranchId::Sapling, sighash: [ 0x6a, 0x3b, 0x2b, 0xcc, 0x15, 0x57, 0x89, 0xa2, 0x74, 0x39, 0xaa, 0x27, 0x5c, 0xa9, 0x9e, 0xc6, 0x48, 0xdd, 0xd5, 0x88, 0xe8, 0x2e, 0xfa, 0xe4, 0xac, 0x46, 0xba, 0x3f, From cd326f2b6a1c5b37e246b594f7073b756cf26302 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Tue, 26 Nov 2019 23:44:57 +0000 Subject: [PATCH 2/3] Consensus parameters for network upgrades --- zcash_primitives/src/consensus.rs | 191 ++++++++++++++++++++++++++++-- 1 file changed, 178 insertions(+), 13 deletions(-) diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs index aa2c67ffe..f7cf480d2 100644 --- a/zcash_primitives/src/consensus.rs +++ b/zcash_primitives/src/consensus.rs @@ -1,5 +1,106 @@ //! Consensus parameters. +use std::fmt; + +/// Zcash consensus parameters. +pub trait Parameters { + fn activation_height(nu: NetworkUpgrade) -> Option; + + fn is_nu_active(nu: NetworkUpgrade, height: u32) -> bool { + match Self::activation_height(nu) { + Some(h) if h <= height => true, + _ => false, + } + } +} + +/// Marker struct for the production network. +#[derive(Clone, Copy, Debug)] +pub struct MainNetwork; + +impl Parameters for MainNetwork { + fn activation_height(nu: NetworkUpgrade) -> Option { + match nu { + NetworkUpgrade::Overwinter => Some(347_500), + NetworkUpgrade::Sapling => Some(419_200), + NetworkUpgrade::Blossom => Some(653_600), + NetworkUpgrade::Heartwood => None, + } + } +} + +/// Marker struct for the test network. +#[derive(Clone, Copy, Debug)] +pub struct TestNetwork; + +impl Parameters for TestNetwork { + fn activation_height(nu: NetworkUpgrade) -> Option { + match nu { + NetworkUpgrade::Overwinter => Some(207_500), + NetworkUpgrade::Sapling => Some(280_000), + NetworkUpgrade::Blossom => Some(584_000), + NetworkUpgrade::Heartwood => None, + } + } +} + +/// An event that occurs at a specified height on the Zcash chain, at which point the +/// consensus rules enforced by the network are altered. +/// +/// See [ZIP 200](https://zips.z.cash/zip-0200) for more details. +#[derive(Clone, Copy, Debug)] +pub enum NetworkUpgrade { + /// The [Overwinter] network upgrade. + /// + /// [Overwinter]: https://z.cash/upgrade/overwinter/ + Overwinter, + /// The [Sapling] network upgrade. + /// + /// [Sapling]: https://z.cash/upgrade/sapling/ + Sapling, + /// The [Blossom] network upgrade. + /// + /// [Blossom]: https://z.cash/upgrade/blossom/ + Blossom, + /// The [Heartwood] network upgrade. + /// + /// [Heartwood]: https://z.cash/upgrade/heartwood/ + Heartwood, +} + +impl fmt::Display for NetworkUpgrade { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + NetworkUpgrade::Overwinter => write!(f, "Overwinter"), + NetworkUpgrade::Sapling => write!(f, "Sapling"), + NetworkUpgrade::Blossom => write!(f, "Blossom"), + NetworkUpgrade::Heartwood => write!(f, "Heartwood"), + } + } +} + +impl NetworkUpgrade { + fn branch_id(self) -> BranchId { + match self { + NetworkUpgrade::Overwinter => BranchId::Overwinter, + NetworkUpgrade::Sapling => BranchId::Sapling, + NetworkUpgrade::Blossom => BranchId::Blossom, + NetworkUpgrade::Heartwood => BranchId::Heartwood, + } + } +} + +/// The network upgrades on the Zcash chain in order of activation. +/// +/// This order corresponds to the activation heights, but because Rust enums are +/// full-fledged algebraic data types, we need to define it manually. +const UPGRADES_IN_ORDER: &[NetworkUpgrade] = &[ + NetworkUpgrade::Overwinter, + NetworkUpgrade::Sapling, + NetworkUpgrade::Blossom, + NetworkUpgrade::Heartwood, +]; + /// 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 @@ -13,25 +114,17 @@ /// See [ZIP 200](https://zips.z.cash/zip-0200) for more details. /// /// [`signature_hash`]: crate::transaction::signature_hash -#[derive(Clone, Copy, Debug)] +#[derive(Clone, Copy, Debug, PartialEq)] pub enum BranchId { /// The consensus rules at the launch of Zcash. Sprout, - /// The consensus rules deployed in the [Overwinter] network upgrade. - /// - /// [Overwinter]: https://z.cash/upgrade/overwinter/ + /// The consensus rules deployed by [`NetworkUpgrade::Overwinter`]. Overwinter, - /// The consensus rules deployed in the [Sapling] network upgrade. - /// - /// [Sapling]: https://z.cash/upgrade/sapling/ + /// The consensus rules deployed by [`NetworkUpgrade::Sapling`]. Sapling, - /// The consensus rules deployed in the [Blossom] network upgrade. - /// - /// [Blossom]: https://z.cash/upgrade/blossom/ + /// The consensus rules deployed by [`NetworkUpgrade::Blossom`]. Blossom, - /// The consensus rules deployed in the [Heartwood] network upgrade. - /// - /// [Heartwood]: https://z.cash/upgrade/heartwood/ + /// The consensus rules deployed by [`NetworkUpgrade::Heartwood`]. Heartwood, } @@ -46,3 +139,75 @@ impl From for u32 { } } } + +impl BranchId { + /// Returns the branch ID corresponding to the consensus rule set that is active at + /// the given height. + /// + /// This is the branch ID that should be used when creating transactions. + pub fn for_height(height: u32) -> Self { + for nu in UPGRADES_IN_ORDER.iter().rev() { + if C::is_nu_active(*nu, height) { + return nu.branch_id(); + } + } + + // Sprout rules apply before any network upgrade + BranchId::Sprout + } +} + +#[cfg(test)] +mod tests { + use super::{BranchId, Parameters, MainNetwork, NetworkUpgrade, UPGRADES_IN_ORDER}; + + #[test] + fn nu_ordering() { + for i in 1..UPGRADES_IN_ORDER.len() { + let nu_a = UPGRADES_IN_ORDER[i - 1]; + let nu_b = UPGRADES_IN_ORDER[i]; + match ( + MainNetwork::activation_height(nu_a), + MainNetwork::activation_height(nu_b), + ) { + (Some(a), Some(b)) if a < b => (), + (Some(_), None) => (), + (None, None) => (), + _ => panic!( + "{} should not be before {} in UPGRADES_IN_ORDER", + nu_a, nu_b + ), + } + } + } + + #[test] + fn nu_is_active() { + assert!(!MainNetwork::is_nu_active(NetworkUpgrade::Overwinter, 0)); + assert!(!MainNetwork::is_nu_active( + NetworkUpgrade::Overwinter, + 347_499 + )); + assert!(MainNetwork::is_nu_active( + NetworkUpgrade::Overwinter, + 347_500 + )); + } + + #[test] + fn branch_id_for_height() { + assert_eq!(BranchId::for_height::(0), BranchId::Sprout,); + assert_eq!( + BranchId::for_height::(419_199), + BranchId::Overwinter, + ); + assert_eq!( + BranchId::for_height::(419_200), + BranchId::Sapling, + ); + assert_eq!( + BranchId::for_height::(5_000_000), + BranchId::Blossom, + ); + } +} From e6a8630b350cd61b41843139faacbcd0cec97321 Mon Sep 17 00:00:00 2001 From: Jack Grigg Date: Wed, 27 Nov 2019 13:12:28 +0000 Subject: [PATCH 3/3] impl TryFrom for BranchId --- zcash_primitives/src/consensus.rs | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs index f7cf480d2..8a7385c7e 100644 --- a/zcash_primitives/src/consensus.rs +++ b/zcash_primitives/src/consensus.rs @@ -1,5 +1,6 @@ //! Consensus parameters. +use std::convert::TryFrom; use std::fmt; /// Zcash consensus parameters. @@ -128,6 +129,21 @@ pub enum BranchId { Heartwood, } +impl TryFrom for BranchId { + type Error = &'static str; + + fn try_from(value: u32) -> Result { + match value { + 0 => Ok(BranchId::Sprout), + 0x5ba8_1b19 => Ok(BranchId::Overwinter), + 0x76b8_09bb => Ok(BranchId::Sapling), + 0x2bb4_0e60 => Ok(BranchId::Blossom), + 0xf5b9_230b => Ok(BranchId::Heartwood), + _ => Err("Unknown consensus branch ID"), + } + } +} + impl From for u32 { fn from(consensus_branch_id: BranchId) -> u32 { match consensus_branch_id { @@ -159,7 +175,9 @@ impl BranchId { #[cfg(test)] mod tests { - use super::{BranchId, Parameters, MainNetwork, NetworkUpgrade, UPGRADES_IN_ORDER}; + use std::convert::TryFrom; + + use super::{BranchId, MainNetwork, NetworkUpgrade, Parameters, UPGRADES_IN_ORDER}; #[test] fn nu_ordering() { @@ -194,6 +212,12 @@ mod tests { )); } + #[test] + fn branch_id_from_u32() { + assert_eq!(BranchId::try_from(0), Ok(BranchId::Sprout)); + assert!(BranchId::try_from(1).is_err()); + } + #[test] fn branch_id_for_height() { assert_eq!(BranchId::for_height::(0), BranchId::Sprout,);