From 1ce4e97632359117f57848d64872c85d1efaece5 Mon Sep 17 00:00:00 2001 From: Cryptoforge Date: Sun, 12 Jul 2020 22:31:27 -0700 Subject: [PATCH] use zero consensus ids --- zcash_client_backend/src/constants.rs | 4 ++-- zcash_primitives/src/consensus.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/zcash_client_backend/src/constants.rs b/zcash_client_backend/src/constants.rs index fd40bcb..80b8fe8 100644 --- a/zcash_client_backend/src/constants.rs +++ b/zcash_client_backend/src/constants.rs @@ -5,5 +5,5 @@ pub mod regtest; pub mod testnet; pub const SPROUT_CONSENSUS_BRANCH_ID: u32 = 0; -pub const OVERWINTER_CONSENSUS_BRANCH_ID: u32 = 0x5ba8_1b19; -pub const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb; +pub const OVERWINTER_CONSENSUS_BRANCH_ID: u32 = 0x6f76_727a; +pub const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x7361_707a; diff --git a/zcash_primitives/src/consensus.rs b/zcash_primitives/src/consensus.rs index 8a7385c..d59c559 100644 --- a/zcash_primitives/src/consensus.rs +++ b/zcash_primitives/src/consensus.rs @@ -135,8 +135,8 @@ impl TryFrom for BranchId { fn try_from(value: u32) -> Result { match value { 0 => Ok(BranchId::Sprout), - 0x5ba8_1b19 => Ok(BranchId::Overwinter), - 0x76b8_09bb => Ok(BranchId::Sapling), + 0x6f76_727a => Ok(BranchId::Overwinter), + 0x7361_707a => Ok(BranchId::Sapling), 0x2bb4_0e60 => Ok(BranchId::Blossom), 0xf5b9_230b => Ok(BranchId::Heartwood), _ => Err("Unknown consensus branch ID"), @@ -148,8 +148,8 @@ 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::Overwinter => 0x6f76_727a, + BranchId::Sapling => 0x7361_707a, BranchId::Blossom => 0x2bb4_0e60, BranchId::Heartwood => 0xf5b9_230b, }