diff --git a/Cargo.lock b/Cargo.lock index f01002f096f..78ff598617f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1293,7 +1293,7 @@ dependencies = [ [[package]] name = "equihash" version = "0.2.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "blake2b_simd", "byteorder", @@ -1328,7 +1328,7 @@ dependencies = [ [[package]] name = "f4jumble" version = "0.1.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "blake2b_simd", ] @@ -5780,7 +5780,7 @@ dependencies = [ [[package]] name = "zcash_address" version = "0.6.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "bech32", "bs58", @@ -5792,7 +5792,7 @@ dependencies = [ [[package]] name = "zcash_client_backend" version = "0.15.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "base64 0.22.1", "bech32", @@ -5831,7 +5831,7 @@ dependencies = [ [[package]] name = "zcash_encoding" version = "0.2.1" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "byteorder", "nonempty", @@ -5840,7 +5840,7 @@ dependencies = [ [[package]] name = "zcash_history" version = "0.4.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "blake2b_simd", "byteorder", @@ -5850,7 +5850,7 @@ dependencies = [ [[package]] name = "zcash_keys" version = "0.5.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "bech32", "blake2b_simd", @@ -5888,7 +5888,7 @@ dependencies = [ [[package]] name = "zcash_primitives" version = "0.20.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "aes", "bip32", @@ -5896,7 +5896,7 @@ dependencies = [ "bs58", "byteorder", "document-features", - "equihash 0.2.0 (git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work)", + "equihash 0.2.0 (git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm)", "ff", "fpe", "group", @@ -5926,7 +5926,7 @@ dependencies = [ [[package]] name = "zcash_proofs" version = "0.20.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "bellman", "blake2b_simd", @@ -5948,7 +5948,7 @@ dependencies = [ [[package]] name = "zcash_protocol" version = "0.4.1" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "document-features", "memuse", @@ -6536,7 +6536,7 @@ dependencies = [ [[package]] name = "zip321" version = "0.2.0" -source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm-work#d5bf1a26bcc768f2bd957c01ba917cffd94be14e" +source = "git+https://github.com/ShieldedLabs/librustzcash/?branch=nsm#dd96084ceb4b64ba4640e8e1c092c65ea773bd6f" dependencies = [ "base64 0.22.1", "nom", diff --git a/Cargo.toml b/Cargo.toml index 6b46623d97d..a0bb0afea7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,14 +26,14 @@ incrementalmerkletree = { version = "0.7.1", features = ["legacy-api"] } orchard = "0.10.0" sapling-crypto = "0.3.0" # TODO: Revert to a release once librustzcash is released (#8749). -zcash_address = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_client_backend = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_encoding = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_history = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_keys = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_primitives = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_proofs = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } -zcash_protocol = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm-work" } +zcash_address = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_client_backend = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_encoding = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_history = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_keys = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_primitives = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_proofs = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } +zcash_protocol = { git = "https://github.com/ShieldedLabs/librustzcash/", branch = "nsm" } abscissa_core = "0.7.0" atty = "0.2.14" base64 = "0.22.1" diff --git a/zebra-chain/src/block/commitment.rs b/zebra-chain/src/block/commitment.rs index 20b18cf50d8..ec4ef7d2616 100644 --- a/zebra-chain/src/block/commitment.rs +++ b/zebra-chain/src/block/commitment.rs @@ -139,10 +139,6 @@ impl Commitment { (Nu5 | Nu6 | Nu7, _) => Ok(ChainHistoryBlockTxAuthCommitment( ChainHistoryBlockTxAuthCommitmentHash(bytes), )), - #[cfg(zcash_unstable = "nsm")] - (ZFuture, _) => Ok(ChainHistoryBlockTxAuthCommitment( - ChainHistoryBlockTxAuthCommitmentHash(bytes), - )), } } diff --git a/zebra-chain/src/block/subsidy/general.rs b/zebra-chain/src/block/subsidy/general.rs index fb908761e21..a4679b6904d 100644 --- a/zebra-chain/src/block/subsidy/general.rs +++ b/zebra-chain/src/block/subsidy/general.rs @@ -57,32 +57,6 @@ pub fn num_halvings(height: Height, network: &Network) -> u32 { .expect("already checked for negatives") } -#[cfg(zcash_unstable = "nsm")] -pub fn block_subsidy( - height: Height, - network: &Network, - money_reserve: Amount, -) -> Result, SubsidyError> { - let nsm_activation_height = ZFuture - .activation_height(network) - .expect("ZFuture activation height should be available"); - - if height < nsm_activation_height { - block_subsidy_pre_nsm(height, network) - } else { - let money_reserve: i64 = money_reserve.into(); - let money_reserve: i128 = money_reserve.into(); - const BLOCK_SUBSIDY_DENOMINATOR: i128 = 10_000_000_000; - const BLOCK_SUBSIDY_NUMERATOR: i128 = 4_126; - - // calculate the block subsidy (in zatoshi) using the money reserve, note the rounding up - let subsidy = (money_reserve * BLOCK_SUBSIDY_NUMERATOR + (BLOCK_SUBSIDY_DENOMINATOR - 1)) - / BLOCK_SUBSIDY_DENOMINATOR; - - Ok(subsidy.try_into().expect("subsidy should fit in Amount")) - } -} - #[cfg(zcash_unstable = "zip234")] pub fn block_subsidy( height: Height, diff --git a/zebra-chain/src/primitives/zcash_history.rs b/zebra-chain/src/primitives/zcash_history.rs index 52f91d80ce8..4b52c85d8e8 100644 --- a/zebra-chain/src/primitives/zcash_history.rs +++ b/zebra-chain/src/primitives/zcash_history.rs @@ -291,21 +291,6 @@ impl Version for zcash_history::V1 { end_height: height.0 as u64, sapling_tx: sapling_tx_count, }, - #[cfg(zcash_unstable = "nsm")] - NetworkUpgrade::ZFuture => zcash_history::NodeData { - consensus_branch_id: branch_id.into(), - subtree_commitment: block_hash, - start_time: time, - end_time: time, - start_target: target, - end_target: target, - start_sapling_root: sapling_root, - end_sapling_root: sapling_root, - subtree_total_work: work, - start_height: height.0 as u64, - end_height: height.0 as u64, - sapling_tx: sapling_tx_count, - }, } } } diff --git a/zebra-chain/src/primitives/zcash_primitives.rs b/zebra-chain/src/primitives/zcash_primitives.rs index e4bdec9514b..dabef32326d 100644 --- a/zebra-chain/src/primitives/zcash_primitives.rs +++ b/zebra-chain/src/primitives/zcash_primitives.rs @@ -168,10 +168,6 @@ impl TryFrom<&Transaction> for zp_tx::Transaction { | Transaction::V6 { network_upgrade, .. } => network_upgrade, - #[cfg(zcash_unstable = "nsm")] - Transaction::ZFuture { - network_upgrade, .. - } => network_upgrade, Transaction::V1 { .. } | Transaction::V2 { .. } | Transaction::V3 { .. } diff --git a/zebra-chain/src/transaction/arbitrary.rs b/zebra-chain/src/transaction/arbitrary.rs index 4636868cef1..6ba03408c2d 100644 --- a/zebra-chain/src/transaction/arbitrary.rs +++ b/zebra-chain/src/transaction/arbitrary.rs @@ -783,12 +783,6 @@ impl Arbitrary for Transaction { Self::v5_strategy(ledger_state) ] .boxed(), - #[cfg(zcash_unstable = "nsm")] - NetworkUpgrade::ZFuture => prop_oneof![ - Self::v4_strategy(ledger_state.clone()), - Self::v5_strategy(ledger_state) - ] - .boxed(), } } diff --git a/zebra-chain/src/transaction/builder.rs b/zebra-chain/src/transaction/builder.rs index c2473a307e7..9c98614626d 100644 --- a/zebra-chain/src/transaction/builder.rs +++ b/zebra-chain/src/transaction/builder.rs @@ -16,8 +16,7 @@ impl Transaction { height: Height, outputs: impl IntoIterator, transparent::Script)>, extra_coinbase_data: Vec, - #[cfg(zcash_unstable = "zip235")] - miner_fee: Amount, + #[cfg(zcash_unstable = "zip235")] miner_fee: Amount, zip233_amount: Option>, ) -> Transaction { // # Consensus diff --git a/zebra-chain/src/transaction/tests/vectors.rs b/zebra-chain/src/transaction/tests/vectors.rs index 6f2821e3f65..063cd971def 100644 --- a/zebra-chain/src/transaction/tests/vectors.rs +++ b/zebra-chain/src/transaction/tests/vectors.rs @@ -947,27 +947,6 @@ fn binding_signatures() { } } } - #[cfg(zcash_unstable = "nsm")] - Transaction::ZFuture { - sapling_shielded_data, - .. - } => { - if let Some(sapling_shielded_data) = sapling_shielded_data { - let shielded_sighash = - tx.sighash(upgrade.branch_id().unwrap(), HashType::ALL, &[], None); - - let bvk = redjubjub::VerificationKey::try_from( - sapling_shielded_data.binding_verification_key(), - ) - .expect("a valid redjubjub::VerificationKey"); - - bvk.verify( - shielded_sighash.as_ref(), - &sapling_shielded_data.binding_sig, - ) - .expect("must pass verification"); - } - } } } diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml index cd36c910a33..59a5bbe2b9a 100644 --- a/zebra-consensus/Cargo.toml +++ b/zebra-consensus/Cargo.toml @@ -17,8 +17,6 @@ categories = ["asynchronous", "cryptography::cryptocurrencies"] [features] default = [] -nsm = [] - # Production features that activate extra dependencies, or extra features in dependencies progress-bar = [ diff --git a/zebra-consensus/src/block/tests.rs b/zebra-consensus/src/block/tests.rs index b59ee83ffde..853c1b54837 100644 --- a/zebra-consensus/src/block/tests.rs +++ b/zebra-consensus/src/block/tests.rs @@ -21,15 +21,16 @@ use zebra_chain::{ work::difficulty::{ParameterDifficulty as _, INVALID_COMPACT_DIFFICULTY}, }; use zebra_script::CachedFfiTransaction; -use zebra_state::check::{ - coinbase_is_first, miner_fees_are_valid, subsidy_is_valid, transaction_miner_fees_are_valid, -}; +use zebra_state::check::{coinbase_is_first, subsidy_is_valid, transaction_miner_fees_are_valid}; use zebra_test::transcript::{ExpectedTranscriptError, Transcript}; use crate::{block::check, difficulty_is_valid, transaction}; use super::*; +#[cfg(any(zcash_unstable = "zip234", zcash_unstable = "zip235"))] +use zebra_state::check::miner_fees_are_valid; + static VALID_BLOCK_TRANSCRIPT: Lazy)>> = Lazy::new(|| { let block: Arc<_> = diff --git a/zebra-consensus/src/transaction.rs b/zebra-consensus/src/transaction.rs index 8523cee24c4..6029f4fff03 100644 --- a/zebra-consensus/src/transaction.rs +++ b/zebra-consensus/src/transaction.rs @@ -951,9 +951,6 @@ where transaction.version(), network_upgrade, )), - - #[cfg(zcash_unstable = "nsm")] - NetworkUpgrade::ZFuture => Ok(()), } } diff --git a/zebra-network/Cargo.toml b/zebra-network/Cargo.toml index ca75135887f..97bd6090c45 100644 --- a/zebra-network/Cargo.toml +++ b/zebra-network/Cargo.toml @@ -27,8 +27,6 @@ categories = ["asynchronous", "cryptography::cryptocurrencies", "encoding", "net [features] default = [] -nsm = [] - # Production features that activate extra dependencies, or extra features in dependencies progress-bar = [ diff --git a/zebra-rpc/Cargo.toml b/zebra-rpc/Cargo.toml index 825bb970bae..e9f6af74dd5 100644 --- a/zebra-rpc/Cargo.toml +++ b/zebra-rpc/Cargo.toml @@ -21,8 +21,6 @@ categories = [ [features] -nsm = [] - indexer-rpcs = [ "tonic-build", "tonic", @@ -138,4 +136,4 @@ zebra-state = { path = "../zebra-state", version = "1.0.0-beta.45", features = [ zebra-test = { path = "../zebra-test", version = "1.0.0-beta.45" } [lints.rust] -unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zip234"))'] } +unexpected_cfgs = { level = "warn", check-cfg = ['cfg(zcash_unstable, values("zip234", "zip235"))'] } diff --git a/zebra-rpc/src/methods/get_block_template_rpcs.rs b/zebra-rpc/src/methods/get_block_template_rpcs.rs index 968c9c0495b..ecf686c58d4 100644 --- a/zebra-rpc/src/methods/get_block_template_rpcs.rs +++ b/zebra-rpc/src/methods/get_block_template_rpcs.rs @@ -628,6 +628,11 @@ where let mempool = self.mempool.clone(); let mut latest_chain_tip = self.latest_chain_tip.clone(); let sync_status = self.sync_status.clone(); + + #[cfg(not(zcash_unstable = "zip234"))] + let state = self.state.clone(); + + #[cfg(zcash_unstable = "zip234")] let mut state = self.state.clone(); if let Some(HexData(block_proposal_bytes)) = parameters diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template/proposal.rs b/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template/proposal.rs index ad34daff382..373ba2d7c20 100644 --- a/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template/proposal.rs +++ b/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template/proposal.rs @@ -220,8 +220,6 @@ pub fn proposal_block_from_template( NetworkUpgrade::Nu5 | NetworkUpgrade::Nu6 | NetworkUpgrade::Nu7 => { block_commitments_hash.bytes_in_serialized_order().into() } - #[cfg(zcash_unstable = "nsm")] - NetworkUpgrade::ZFuture => block_commitments_hash.bytes_in_serialized_order().into(), }; Ok(Block { diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/zip317/tests.rs b/zebra-rpc/src/methods/get_block_template_rpcs/zip317/tests.rs index 5cf635b4e02..00994e35d79 100644 --- a/zebra-rpc/src/methods/get_block_template_rpcs/zip317/tests.rs +++ b/zebra-rpc/src/methods/get_block_template_rpcs/zip317/tests.rs @@ -1,6 +1,5 @@ //! Tests for ZIP-317 transaction selection for block template production use zebra_chain::{ - amount::MAX_MONEY, block::{subsidy::general, Height}, parameters::Network, transaction, @@ -10,6 +9,9 @@ use zebra_node_services::mempool::TransactionDependencies; use super::select_mempool_transactions; +#[cfg(zcash_unstable = "zip234")] +use zebra_chain::amount::MAX_MONEY; + #[test] fn excludes_tx_with_unselected_dependencies() { let network = Network::Mainnet; diff --git a/zebra-rpc/src/methods/tests/snapshot/get_block_template_rpcs.rs b/zebra-rpc/src/methods/tests/snapshot/get_block_template_rpcs.rs index d252002fd79..d8b89e57d7d 100644 --- a/zebra-rpc/src/methods/tests/snapshot/get_block_template_rpcs.rs +++ b/zebra-rpc/src/methods/tests/snapshot/get_block_template_rpcs.rs @@ -23,7 +23,6 @@ use zebra_chain::{ serialization::{DateTime32, ZcashDeserializeInto}, transaction::Transaction, transparent, - value_balance::ValueBalance, work::difficulty::{CompactDifficulty, ParameterDifficulty as _}, }; use zebra_network::{address_book_peers::MockAddressBookPeers, types::MetaAddr}; @@ -36,6 +35,9 @@ use zebra_test::{ vectors::BLOCK_MAINNET_1_BYTES, }; +#[cfg(zcash_unstable = "zip234")] +use zebra_chain::value_balance::ValueBalance; + use crate::methods::{ get_block_template_rpcs::types::{ get_block_template::{self, GetBlockTemplateRequestMode}, diff --git a/zebra-rpc/src/methods/tests/vectors.rs b/zebra-rpc/src/methods/tests/vectors.rs index dbf027f2e37..3023c3ccbd8 100644 --- a/zebra-rpc/src/methods/tests/vectors.rs +++ b/zebra-rpc/src/methods/tests/vectors.rs @@ -1593,13 +1593,15 @@ async fn rpc_getblocktemplate_mining_address(use_p2pkh: bool) { parameters::NetworkKind, serialization::DateTime32, transaction::{zip317, VerifiedUnminedTx}, - value_balance::ValueBalance, work::difficulty::{CompactDifficulty, ExpandedDifficulty, U256}, }; use zebra_consensus::MAX_BLOCK_SIGOPS; use zebra_network::address_book_peers::MockAddressBookPeers; use zebra_state::{GetBlockTemplateChainInfo, ReadRequest, ReadResponse}; + #[cfg(zcash_unstable = "zip234")] + use zebra_chain::value_balance::ValueBalance; + use crate::methods::{ get_block_template_rpcs::{ constants::{ diff --git a/zebra-state/src/service/check.rs b/zebra-state/src/service/check.rs index e7cf1eaac90..499927b5484 100644 --- a/zebra-state/src/service/check.rs +++ b/zebra-state/src/service/check.rs @@ -5,7 +5,7 @@ use std::{borrow::Borrow, sync::Arc}; use chrono::Duration; use zebra_chain::{ - amount::{Amount, Error as AmountError, NonNegative, MAX_MONEY}, + amount::{Amount, Error as AmountError, NonNegative}, block::{ self, error::BlockError, subsidy::funding_streams, subsidy::general, Block, ChainHistoryBlockTxAuthCommitmentHash, CommitmentError, Height, @@ -33,6 +33,9 @@ use super::check; #[allow(unused_imports)] use crate::service::non_finalized_state::Chain; +#[cfg(zcash_unstable = "zip234")] +use zebra_chain::amount::MAX_MONEY; + pub(crate) mod anchors; pub(crate) mod difficulty; pub(crate) mod nullifier; diff --git a/zebra-state/src/service/write.rs b/zebra-state/src/service/write.rs index 3f208cc18bd..de46e15e6b5 100644 --- a/zebra-state/src/service/write.rs +++ b/zebra-state/src/service/write.rs @@ -7,7 +7,6 @@ use tokio::sync::{ }; use zebra_chain::{ - amount::MAX_MONEY, block::{ self, subsidy::{funding_streams::funding_stream_values, general}, @@ -29,6 +28,9 @@ use crate::{ CommitSemanticallyVerifiedError, SemanticallyVerifiedBlock, }; +#[cfg(zcash_unstable = "zip234")] +use zebra_chain::amount::MAX_MONEY; + // These types are used in doc links #[allow(unused_imports)] use crate::service::{ diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml index e85bc9e3bd8..d5f6edda699 100644 --- a/zebrad/Cargo.toml +++ b/zebrad/Cargo.toml @@ -158,8 +158,6 @@ test_sync_to_mandatory_checkpoint_testnet = [] test_sync_past_mandatory_checkpoint_mainnet = [] test_sync_past_mandatory_checkpoint_testnet = [] -nsm = ["zebra-chain/nsm", "zebra-network/nsm", "zebra-consensus/nsm", "zebra-rpc/nsm"] - [dependencies] zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.45" } zebra-consensus = { path = "../zebra-consensus", version = "1.0.0-beta.45" } diff --git a/zebrad/tests/acceptance.rs b/zebrad/tests/acceptance.rs index d54b4c521ab..9d4e133ceec 100644 --- a/zebrad/tests/acceptance.rs +++ b/zebrad/tests/acceptance.rs @@ -3255,7 +3255,6 @@ async fn trusted_chain_sync_handles_forks_correctly() -> Result<()> { #[cfg(feature = "getblocktemplate-rpcs")] async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> { use zebra_chain::{ - amount::MAX_MONEY, block::subsidy::general, chain_sync_status::MockSyncStatus, parameters::{ @@ -3286,6 +3285,10 @@ async fn nu6_funding_streams_and_coinbase_balance() -> Result<()> { GetBlockTemplateRpcImpl, GetBlockTemplateRpcServer, }; use zebra_test::mock_service::MockService; + + #[cfg(zcash_unstable = "zip234")] + use zebra_chain::amount::MAX_MONEY; + let _init_guard = zebra_test::init(); tracing::info!("running nu6_funding_streams_and_coinbase_balance test");