Remove zebra from public api

regtest-launcher/Cargo.toml

@@ -20,6 +20,7 @@ zcash_transparent = "0.6.3"
 zebra-node-services = { workspace = true, features = ["rpc-client"] }
 zebra-rpc.workspace = true
 zip32 = "0.2.1"
+zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", branch = "dev" }
 
 [dev-dependencies]
 anyhow = "1.0.100"

regtest-launcher/src/main.rs

@@ -38,13 +38,24 @@ use zebra_rpc::{
     },
     proposal_block_from_template,
 };
+use zingo_common_components::protocol::ActivationHeights;
 
 use crate::{cli::Cli, keygen::generate_regtest_transparent_keypair};
 
 #[tokio::main]
 async fn main() {
     let cli = Cli::parse();
-    let heights = cli.activation_heights;
+    let heights = ActivationHeights::builder()
+        .set_overwinter(cli.activation_heights.overwinter)
+        .set_sapling(cli.activation_heights.sapling)
+        .set_blossom(cli.activation_heights.blossom)
+        .set_heartwood(cli.activation_heights.heartwood)
+        .set_canopy(cli.activation_heights.canopy)
+        .set_nu5(cli.activation_heights.nu5)
+        .set_nu6(cli.activation_heights.nu6)
+        .set_nu6_1(cli.activation_heights.nu6_1)
+        .set_nu7(cli.activation_heights.nu7)
+        .build();
 
     let (mnemonic_opt, sk_opt, taddr_str) = match cli.miner_address.as_deref() {
         Some(addr) => (None, None, addr.to_string()),
@@ -94,7 +105,7 @@ async fn main() {
 
     let regtest_network = Network::Testnet(Arc::new(
         Parameters::new_regtest(RegtestParameters {
-            activation_heights: heights,
+            activation_heights: cli.activation_heights,
             funding_streams: None,
             lockbox_disbursements: None,
             checkpoints: None,

zcash_local_net/CHANGELOG.md

@@ -0,0 +1,34 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Deprecated
+
+### Added
+- support for Zebra 4.1.0
+- support for Zebra 4
+
+### Changed
+- `validator::Validator` trait:
+  - `network`: now takes `ActivationHeights` instead of `ConfiguredActivationHeights`.
+  - `load_chain`: now takes `NetworkType` instead of `NetworkKind`.
+- `validator::zcashd::ZcashdConfig`: changed `configured_activation_heights: ConfiguredActivationHeights` field to
+`activation_heights: ActivationHeights`. Removing the zebra-chain type from the public API and replacing with new
+zingo_common_components type.
+- `validator::zebrad::ZebradConfig`:
+  - changed `network: NetworkKind` to `network_type: NetworkType`. Removing the
+zebra-chain type from the public API and replacing with new zingo_common_components type.
+  - `with_regtest_enabled` method: now takes `ActivationHeights` instead of `ConfiguredActivationHeights`.
+  - `set_test_parameters` method: now takes `ActivationHeights` instead of `ConfiguredActivationHeights`.
+
+### Removed
+- `validator::zebrad::ZebradConfig`: removed `configured_activation_heights: ConfiguredActivationHeights` field removing the
+zebra-chain type from the public API. Replaced by new `network_type` field which includes activation heights.
+
+## [0.1.0]
+

zcash_local_net/Cargo.toml

@@ -10,9 +10,7 @@ github = { repository = "zingolabs/infrastructure/services" }
 [dependencies]
 
 # zingo
-zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", branch = "dev", features = [
-    "for_test",
-] }
+zingo_common_components = { git = "https://github.com/zingolabs/zingo-common.git", branch = "dev" }
 zingo_test_vectors = { workspace = true }
 
 # zcash