Browse Source

use zero consensus ids

master
Cryptoforge 4 years ago
parent
commit
1ce4e97632
  1. 4
      zcash_client_backend/src/constants.rs
  2. 8
      zcash_primitives/src/consensus.rs

4
zcash_client_backend/src/constants.rs

@ -5,5 +5,5 @@ pub mod regtest;
pub mod testnet; pub mod testnet;
pub const SPROUT_CONSENSUS_BRANCH_ID: u32 = 0; pub const SPROUT_CONSENSUS_BRANCH_ID: u32 = 0;
pub const OVERWINTER_CONSENSUS_BRANCH_ID: u32 = 0x5ba8_1b19; pub const OVERWINTER_CONSENSUS_BRANCH_ID: u32 = 0x6f76_727a;
pub const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x76b8_09bb; pub const SAPLING_CONSENSUS_BRANCH_ID: u32 = 0x7361_707a;

8
zcash_primitives/src/consensus.rs

@ -135,8 +135,8 @@ impl TryFrom<u32> for BranchId {
fn try_from(value: u32) -> Result<Self, Self::Error> { fn try_from(value: u32) -> Result<Self, Self::Error> {
match value { match value {
0 => Ok(BranchId::Sprout), 0 => Ok(BranchId::Sprout),
0x5ba8_1b19 => Ok(BranchId::Overwinter), 0x6f76_727a => Ok(BranchId::Overwinter),
0x76b8_09bb => Ok(BranchId::Sapling), 0x7361_707a => Ok(BranchId::Sapling),
0x2bb4_0e60 => Ok(BranchId::Blossom), 0x2bb4_0e60 => Ok(BranchId::Blossom),
0xf5b9_230b => Ok(BranchId::Heartwood), 0xf5b9_230b => Ok(BranchId::Heartwood),
_ => Err("Unknown consensus branch ID"), _ => Err("Unknown consensus branch ID"),
@ -148,8 +148,8 @@ impl From<BranchId> for u32 {
fn from(consensus_branch_id: BranchId) -> u32 { fn from(consensus_branch_id: BranchId) -> u32 {
match consensus_branch_id { match consensus_branch_id {
BranchId::Sprout => 0, BranchId::Sprout => 0,
BranchId::Overwinter => 0x5ba8_1b19, BranchId::Overwinter => 0x6f76_727a,
BranchId::Sapling => 0x76b8_09bb, BranchId::Sapling => 0x7361_707a,
BranchId::Blossom => 0x2bb4_0e60, BranchId::Blossom => 0x2bb4_0e60,
BranchId::Heartwood => 0xf5b9_230b, BranchId::Heartwood => 0xf5b9_230b,
} }

Loading…
Cancel
Save