diff --git a/zebra-chain/src/parameters/network/subsidy.rs b/zebra-chain/src/parameters/network/subsidy.rs index 537c91ad8be..5895ccac6cb 100644 --- a/zebra-chain/src/parameters/network/subsidy.rs +++ b/zebra-chain/src/parameters/network/subsidy.rs @@ -40,10 +40,6 @@ pub const BLOSSOM_POW_TARGET_SPACING_RATIO: u32 = 2; /// `(60 * 60 * 24 * 365 * 4) / 150 = 840960` pub const PRE_BLOSSOM_HALVING_INTERVAL: HeightDiff = 840_000; -/// The halving height interval in the regtest is 6 hours. -/// [zcashd regtest halving interval](https://github.com/zcash/zcash/blob/v5.10.0/src/consensus/params.h#L252) -pub(crate) const PRE_BLOSSOM_REGTEST_HALVING_INTERVAL: HeightDiff = 144; - /// After Blossom the block time is reduced to 75 seconds but halving period should remain around 4 years. pub const POST_BLOSSOM_HALVING_INTERVAL: HeightDiff = PRE_BLOSSOM_HALVING_INTERVAL * (BLOSSOM_POW_TARGET_SPACING_RATIO as HeightDiff); diff --git a/zebra-chain/src/parameters/network/testnet.rs b/zebra-chain/src/parameters/network/testnet.rs index a82a34a8ae6..c5848c7e4e2 100644 --- a/zebra-chain/src/parameters/network/testnet.rs +++ b/zebra-chain/src/parameters/network/testnet.rs @@ -19,8 +19,8 @@ use super::{ BLOSSOM_POW_TARGET_SPACING_RATIO, FIRST_HALVING_TESTNET, FUNDING_STREAM_ADDRESS_CHANGE_INTERVAL, POST_BLOSSOM_HALVING_INTERVAL, POST_NU6_FUNDING_STREAMS_MAINNET, POST_NU6_FUNDING_STREAMS_TESTNET, - PRE_BLOSSOM_HALVING_INTERVAL, PRE_BLOSSOM_REGTEST_HALVING_INTERVAL, - PRE_NU6_FUNDING_STREAMS_MAINNET, PRE_NU6_FUNDING_STREAMS_TESTNET, + PRE_BLOSSOM_HALVING_INTERVAL, PRE_NU6_FUNDING_STREAMS_MAINNET, + PRE_NU6_FUNDING_STREAMS_TESTNET, }, }; @@ -53,6 +53,10 @@ const REGTEST_GENESIS_HASH: &str = const TESTNET_GENESIS_HASH: &str = "05a60a92d99d85997cce3b87616c089f6124d7342af37106edc76126334a2c38"; +/// The halving height interval in the regtest is 6 hours. +/// [zcashd regtest halving interval](https://github.com/zcash/zcash/blob/v5.10.0/src/consensus/params.h#L252) +const PRE_BLOSSOM_REGTEST_HALVING_INTERVAL: HeightDiff = 144; + /// Used to validate number of funding stream recipient addresses on configured Testnets. struct TestnetParameterSubsidyImpl;