Add NU 6.1 support

Cargo.toml

@@ -13,38 +13,38 @@ members = [
     "pepper-sync",
     "zingo-testvectors",
     "zingo-price",
-    "tower_service",
 ]
 resolver = "2"
 
 [workspace.dependencies]
-bip0039 = { version = "0.12", features = [ "rand" ] }
+bip0039 = { version = "0.12", features = ["rand"] }
 bip32 = { version = "0.6.0-pre.1", default-features = false }
 
 zip32 = "0.2.0"
 orchard = "0.11.0"
 sapling-crypto = "0.5.0"
 incrementalmerkletree = "0.8.2"
 shardtree = "0.6.1"
-zcash_address = "0.7.0"
-zcash_client_backend = { version = "0.18.1", features = [
+zcash_address = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b" }
+zcash_client_backend = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b", features = [
     "lightwalletd-tonic",
     "orchard",
     "transparent-inputs",
     "tor",
 ] }
-lightwallet-protocol = { git = "https://github.com/zingolabs/lightwallet-protocol-rust.git", branch = "main" }
-zcash_encoding = "0.3.0"
-zcash_keys = { version = "0.8.0", features = [
+zcash_encoding = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b" }
+zcash_keys = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b", features = [
     "transparent-inputs",
     "sapling",
     "orchard",
 ] }
 zcash_note_encryption = "0.4.1"
-zcash_primitives = "0.22.1"
-zcash_proofs = "0.22.0"
-zcash_protocol = "=0.5.1"
-zcash_transparent = "0.2.3"
+zcash_primitives = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b" }
+zcash_proofs = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b" }
+zcash_protocol = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b", features = [
+    "local-consensus",
+] }
+zcash_transparent = { git = "https://github.com/zcash/librustzcash", rev = "d387aed7e04e881dbe30c6ff8b26a96c834c094b" }
 
 append-only-vec = "0.1.7"
 bech32 = "0.11.0"
@@ -73,7 +73,7 @@ log4rs = "1"
 memuse = "0.2"
 nonempty = "0.11.0"
 portpicker = "0.1"
-proptest = "1"
+proptest = "1.6.0"
 prost = "0.13"
 rand = "0.8"
 reqwest = { version = "0.12.15", default-features = false }
@@ -94,12 +94,8 @@ tempfile = "3"
 thiserror = "2"
 tokio = "1"
 tokio-rustls = "0.26"
-tonic = { version = "0.12", features = [
-    "tls",
-    "tls-roots",
-    "tls-webpki-roots",
-] }
-tonic-build = "0.12"
+tonic = { version = "0.13", features = ["tls-webpki-roots"] }
+tonic-build = "0.13"
 tower = { version = "0.5" }
 tracing = "0.1"
 tracing-subscriber = "0.3"
@@ -109,7 +105,7 @@ crossbeam-channel = "0.5"
 rayon = "1"
 
 # Zingolabs
-zingo-infra-services = { git = "https://github.com/zingolabs/infrastructure.git", branch = "dev" }
+zingo-infra-services = { git = "https://github.com/zingolabs/infrastructure.git", rev = "91a1125a328edbbe459c16acb18b2f7e22008b28" }
 
 # Workspace
 testvectors = { package = "zingo-testvectors", path = "zingo-testvectors" }
@@ -119,7 +115,6 @@ zingo-price = { path = "zingo-price" }
 zingo-status = { path = "zingo-status" }
 pepper-sync = { path = "pepper-sync" }
 zingolib = { path = "zingolib" }
-tower_service = { path = "tower_service" }
 webpki-roots = "0.25"
 
 [profile.test]

darkside-tests/src/chain_generics.rs

@@ -73,7 +73,7 @@ pub(crate) mod conduct_chain {
                 .await;
             let config = self
                 .client_builder
-                .make_unique_data_dir_and_load_config(self.activation_heights);
+                .make_unique_data_dir_and_load_config(self.activation_heights.into());
             let mut lightclient = LightClient::create_from_wallet(
                 LightWallet::new(
                     config.chain,
@@ -100,7 +100,7 @@ pub(crate) mod conduct_chain {
 
         fn zingo_config(&mut self) -> zingolib::config::ZingoConfig {
             self.client_builder
-                .make_unique_data_dir_and_load_config(self.activation_heights)
+                .make_unique_data_dir_and_load_config(self.activation_heights.into())
         }
 
         async fn bump_chain(&mut self) {

darkside-tests/src/darkside_connector.rs

@@ -43,7 +43,7 @@ impl DarksideConnector {
             let uri = uri.clone();
             let svc = tower::ServiceBuilder::new()
                 //Here, we take all the pieces of our uri, and add in the path from the Requests's uri
-                .map_request(move |mut req: http::Request<tonic::body::BoxBody>| {
+                .map_request(move |mut req: http::Request<tonic::body::Body>| {
                     let uri = Uri::builder()
                         .scheme(uri.scheme().unwrap().clone())
                         .authority(uri.authority().unwrap().clone())

darkside-tests/src/utils.rs

@@ -15,6 +15,7 @@ use zcash_primitives::{merkle_tree::read_commitment_tree, transaction::Transacti
 use zingo_infra_services::{
     indexer::{Indexer, Lightwalletd, LightwalletdConfig},
     network::localhost_uri,
+    utils::ExecutableLocation,
 };
 
 use super::{
@@ -28,7 +29,7 @@ use crate::{
 };
 use zingolib::testutils::paths::get_cargo_manifest_dir;
 
-const LIGHTWALLETD_BIN: Option<PathBuf> = None;
+const LIGHTWALLETD_BIN: Option<ExecutableLocation> = None;
 
 pub async fn prepare_darksidewalletd(
     uri: http::Uri,
@@ -213,7 +214,7 @@ pub async fn init_darksidewalletd(
     set_port: Option<portpicker::Port>,
 ) -> Result<(Lightwalletd, DarksideConnector), String> {
     let lightwalletd = Lightwalletd::launch(LightwalletdConfig {
-        lightwalletd_bin: LIGHTWALLETD_BIN,
+        lightwalletd_bin: LIGHTWALLETD_BIN.unwrap(), // TODO: What should we do if there's no binary?
         listen_port: set_port,
         zcashd_conf: PathBuf::new(),
         darkside: true,
@@ -381,7 +382,7 @@ pub mod scenarios {
                 testvectors::seeds::DARKSIDE_SEED.to_string(),
                 0,
                 true,
-                self.activation_heights,
+                self.activation_heights.into(),
             ));
 
             let faucet_funding_transaction = match funded_pool {
@@ -406,9 +407,12 @@ pub mod scenarios {
             seed: String,
             birthday: u64,
         ) -> &mut DarksideEnvironment {
-            let lightclient =
-                self.client_builder
-                    .build_client(seed, birthday, true, self.activation_heights);
+            let lightclient = self.client_builder.build_client(
+                seed,
+                birthday,
+                true,
+                self.activation_heights.into(),
+            );
             self.lightclients.push(lightclient);
             self
         }

darkside-tests/tests/advanced_reorg_tests.rs

@@ -18,9 +18,9 @@ use tokio::time::sleep;
 use zcash_primitives::consensus::BlockHeight;
 use zingo_infra_services::{
     indexer::{Indexer, Lightwalletd, LightwalletdConfig},
-    network::{ActivationHeights, localhost_uri},
+    network::localhost_uri,
 };
-use zingolib::wallet::summary::data::ValueTransferKind;
+use zingolib::wallet::{network::ZingolibLocalNetwork, summary::data::ValueTransferKind};
 use zingolib::{testutils::scenarios::LIGHTWALLETD_BIN, wallet::summary::data::SentValueTransfer};
 use zingolib::{
     testutils::{
@@ -51,7 +51,7 @@ async fn reorg_changes_incoming_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -215,7 +215,7 @@ async fn reorg_changes_incoming_tx_index() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -379,7 +379,7 @@ async fn reorg_expires_incoming_tx() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -565,7 +565,7 @@ async fn reorg_changes_outgoing_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     light_client.sync_and_await().await.unwrap();
@@ -826,7 +826,7 @@ async fn reorg_expires_outgoing_tx_height() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     let expected_initial_balance = AccountBalance {
@@ -1032,7 +1032,7 @@ async fn reorg_changes_outgoing_tx_index() {
         ADVANCED_REORG_TESTS_USER_WALLET.to_string(),
         202,
         true,
-        ActivationHeights::default(),
+        ZingolibLocalNetwork::default(),
     );
 
     light_client.sync_and_await().await.unwrap();

darkside-tests/tests/tests.rs

@@ -9,7 +9,6 @@ use testvectors::seeds::DARKSIDE_SEED;
 use zingo_infra_services::indexer::Indexer;
 use zingo_infra_services::indexer::Lightwalletd;
 use zingo_infra_services::indexer::LightwalletdConfig;
-use zingo_infra_services::network::ActivationHeights;
 use zingo_infra_services::network::localhost_uri;
 // use zcash_client_backend::PoolType::Shielded;
 // use zcash_client_backend::ShieldedProtocol::Orchard;
@@ -21,6 +20,7 @@ use zingolib::testutils::lightclient::from_inputs;
 use zingolib::testutils::scenarios::ClientBuilder;
 use zingolib::testutils::scenarios::LIGHTWALLETD_BIN;
 use zingolib::wallet::balance::AccountBalance;
+use zingolib::wallet::network::ZingolibLocalNetwork;
 
 #[ignore = "darkside bug, invalid block hash length in tree states"]
 #[tokio::test]
@@ -37,7 +37,7 @@ async fn simple_sync() {
     prepare_darksidewalletd(server_id.clone(), true)
         .await
         .unwrap();
-    let activation_heights = ActivationHeights::default();
+    let activation_heights = ZingolibLocalNetwork::default();
     let wallet_dir = TempDir::new().unwrap();
     let mut light_client = ClientBuilder::new(server_id, wallet_dir).build_client(
         DARKSIDE_SEED.to_string(),
@@ -87,7 +87,7 @@ async fn reorg_receipt_sync_generic() {
         .await
         .unwrap();
 
-    let activation_heights = ActivationHeights::default();
+    let activation_heights = ZingolibLocalNetwork::default();
     let wallet_dir = TempDir::new().unwrap();
     let mut light_client = ClientBuilder::new(server_id.clone(), wallet_dir).build_client(
         DARKSIDE_SEED.to_string(),
@@ -155,7 +155,7 @@ async fn sent_transaction_reorged_into_mempool() {
 
     let wallet_dir = TempDir::new().unwrap();
     let mut client_manager = ClientBuilder::new(server_id.clone(), wallet_dir);
-    let activation_heights = ActivationHeights::default();
+    let activation_heights = ZingolibLocalNetwork::default();
     let mut light_client =
         client_manager.build_client(DARKSIDE_SEED.to_string(), 0, true, activation_heights);
     let mut recipient = client_manager.build_client(

docker-ci/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim AS builder
+FROM debian:trixie-slim AS builder
 
 WORKDIR /usr/src
 
@@ -21,7 +21,6 @@ RUN apt update \
     curl \
     bsdmainutils \
     automake \
-    libtinfo5 \
     golang \
     ca-certificates \
     && update-ca-certificates