Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion zcash_local_net/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ zingo_common_components = { workspace = true }
zingo_test_vectors = { workspace = true }

# zcash
zcash_protocol = { version = "0.8", features = ["local-consensus"] }
zcash_protocol = { version = "0.9", features = ["local-consensus"] }

# zebra
zebra-node-services = { workspace = true }
Expand Down Expand Up @@ -50,4 +50,5 @@ allowed_external_types = [
"zingo_common_components::protocol::ActivationHeights",
"zingo_common_components::protocol::NetworkType",
"zebra_node_services::rpc_client::RpcRequestClient",
"reqwest::error::Error",
]
4 changes: 3 additions & 1 deletion zcash_local_net/src/utils/executable_finder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ fn pick_path(executable_name: &str, trace_location: bool) -> Option<PathBuf> {
Some(path)
} else {
if trace_location {
tracing::info!("Could not find {executable_name} at {path:?} set by {environment_variable_path} environment variable.");
tracing::info!(
"Could not find {executable_name} at {path:?} set by {environment_variable_path} environment variable."
);
}
None
}
Expand Down
2 changes: 1 addition & 1 deletion zcash_local_net/src/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ pub trait Validator: Process<Config: ValidatorConfig> + Send + Sync + std::fmt::
/// Polls the chain until it reaches `target_height`. Default impl
/// polls [`Self::get_chain_height`] every
/// [`Self::CHAIN_POLL_INTERVAL`] via the shared
/// [`crate::poll::poll_until`] primitive, panicking after
/// `poll_until` primitive, panicking after
/// [`Self::CHAIN_POLL_TIMEOUT`] elapses. Concrete validators should
/// not override this method — only the constants.
fn poll_chain_height(
Expand Down
17 changes: 11 additions & 6 deletions zcash_local_net/src/validator/zebrad.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ use crate::{
};
use zcash_protocol::PoolType;
use zingo_common_components::protocol::{ActivationHeights, NetworkType};
use zingo_test_vectors::ZEBRAD_DEFAULT_MINER;
use zingo_test_vectors::{
REG_O_ADDR_FROM_ABANDONART, REG_T_ADDR_FROM_ABANDONART, ZEBRAD_DEFAULT_MINER,
};

use std::{
net::{IpAddr, Ipv4Addr, SocketAddr},
Expand Down Expand Up @@ -138,11 +140,14 @@ impl ValidatorConfig for ZebradConfig {
activation_heights: ActivationHeights,
chain_cache: Option<PathBuf>,
) {
assert_eq!(
mine_to_pool,
PoolType::Transparent,
"Zebra can only mine to transparent using this test infrastructure currently, but tried to set to {mine_to_pool}"
);
self.miner_address = match mine_to_pool {
PoolType::ORCHARD => REG_O_ADDR_FROM_ABANDONART,
PoolType::Transparent => REG_T_ADDR_FROM_ABANDONART,
PoolType::SAPLING => {
panic!("zebrad does not support mining to a Sapling address; use ORCHARD or Transparent")
}
}
.to_string();
self.network_type = NetworkType::Regtest(activation_heights);
self.chain_cache = chain_cache;
}
Expand Down
Loading