From 27dbcf2f2ff8bb4f1573f7b12a78ae7cfa405564 Mon Sep 17 00:00:00 2001 From: idky137 Date: Wed, 3 Jun 2026 17:46:49 +0100 Subject: [PATCH 1/2] unlock shielded coinbase for zebrad --- zcash_local_net/src/validator/zebrad.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/zcash_local_net/src/validator/zebrad.rs b/zcash_local_net/src/validator/zebrad.rs index 5106a43..b866d2c 100644 --- a/zcash_local_net/src/validator/zebrad.rs +++ b/zcash_local_net/src/validator/zebrad.rs @@ -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}, @@ -138,11 +140,13 @@ impl ValidatorConfig for ZebradConfig { activation_heights: ActivationHeights, chain_cache: Option, ) { - 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.to_string(), + PoolType::SAPLING => { + panic!("Sapling mining pool is not supported for ZebradConfig test parameters"); + } + PoolType::Transparent => ZEBRAD_DEFAULT_MINER.to_string(), + }; self.network_type = NetworkType::Regtest(activation_heights); self.chain_cache = chain_cache; } From 7c067cd8acdc21b2cb1af75537b42ef0fdb6628a Mon Sep 17 00:00:00 2001 From: idky137 Date: Wed, 3 Jun 2026 17:50:47 +0100 Subject: [PATCH 2/2] remove unused const import --- zcash_local_net/src/validator/zebrad.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/zcash_local_net/src/validator/zebrad.rs b/zcash_local_net/src/validator/zebrad.rs index b866d2c..69e5719 100644 --- a/zcash_local_net/src/validator/zebrad.rs +++ b/zcash_local_net/src/validator/zebrad.rs @@ -15,9 +15,7 @@ use crate::{ }; use zcash_protocol::PoolType; use zingo_common_components::protocol::{ActivationHeights, NetworkType}; -use zingo_test_vectors::{ - REG_O_ADDR_FROM_ABANDONART, REG_T_ADDR_FROM_ABANDONART, ZEBRAD_DEFAULT_MINER, -}; +use zingo_test_vectors::{REG_O_ADDR_FROM_ABANDONART, ZEBRAD_DEFAULT_MINER}; use std::{ net::{IpAddr, Ipv4Addr, SocketAddr},