Enable multicore on zcash deps

Author: ec2

Cargo.lock

@@ -6,6 +6,8 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/ChainSafe/WebZjs"
 description = "A browser client-side library for implementing Zcash wallets"
 edition = "2021"
+resolver = "2"
+
 
 [lib]
 crate-type = ["cdylib", "rlib"]
@@ -20,17 +22,17 @@ codegen-units = 1
 wasm-opt = ["-O4", "-O4"]
 
 [features]
-default = ["native"]
+default = ["native", "multicore"]
 
 native = ["tonic/channel", "tonic/gzip", "tonic/tls-webpki-roots"]
-wasm-parallel = ["wasm", "wasm-bindgen-rayon"]
-wasm = ["console_error_panic_hook", "dep:tracing-web"]
+multicore = ["zcash_proofs/multicore", "zcash_primitives/multicore", "zcash_client_memory/multicore"]
 
+# WASM specific features
+wasm = ["console_error_panic_hook", "dep:tracing-web", "zcash_client_backend/wasm-bindgen"]
+wasm-parallel = ["wasm", "wasm-bindgen-rayon", "multicore"]
 console_error_panic_hook = ["dep:console_error_panic_hook"]
-
 no-bundler = ["wasm-bindgen-rayon?/no-bundler"]
 
-
 [dependencies]
 ## Web dependencies
 wasm-bindgen = "0.2.84"
@@ -46,20 +48,19 @@ tonic-web-wasm-client = "0.6.0"
 
 ## Zcash dependencies
 zcash_keys = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96", features = ["transparent-inputs", "orchard", "sapling", "unstable"] }
-zcash_client_backend = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96", default-features = false, features = ["lightwalletd-tonic", "wasm-bindgen"] }
+zcash_client_backend = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96", default-features = false, features = ["lightwalletd-tonic"] }
 zcash_client_memory = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96", features = ["orchard"] }
 zcash_primitives = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96" }
 zcash_address = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96" }
 zcash_proofs = { git = "https://github.com/ChainSafe/librustzcash", rev = "a77e8a0204dab421fdbf5822e585716339567b96", default-features = false, features = ["bundled-prover"] }
 
+
 ## gRPC Web dependencies
 prost = { version = "0.12", default-features = false }
 tonic = { version = "0.12", default-features = false, features = [
     "prost",
 ] }
 
-
-
 getrandom = { version = "0.2", features = ["js"] }
 thiserror = "1.0.63"
 indexed_db_futures = "0.5.0"
@@ -72,7 +73,7 @@ nonempty = "0.7"
 hex = "0.4.3"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 tracing = "0.1.40"
-
+rayon = "1.8"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.42"

Cargo.toml

@@ -1,4 +1,3 @@
-use wasm_bindgen_futures::JsFuture;
 use wasm_bindgen_test::*;
 
 use webz_core::{bindgen::wallet::WebWallet, Wallet};
@@ -11,6 +10,8 @@ const SEED: &str = "visit armed kite pen cradle toward reward clay marble oil wr
 const HD_INDEX: u32 = 0;
 const BIRTHDAY: Option<u32> = Some(2577329);
 
+const THREADS: usize = 5;
+
 // Required to initialize the logger and panic hooks only once
 use std::{num::NonZeroU32, sync::Once};
 static INIT: Once = Once::new();
@@ -19,12 +20,21 @@ pub fn initialize() {
         webz_core::init::start();
     });
 }
+#[cfg(all(feature = "wasm-parallel"))]
+async fn init_threadpool(threads: usize) -> wasm_bindgen_futures::JsFuture {
+    tracing::info!("Initializing thread pool with {} threads", threads);
+    wasm_bindgen_futures::JsFuture::from(wasm_bindgen_rayon::init_thread_pool(threads))
+}
 
 #[wasm_bindgen_test]
 async fn test_get_and_scan_range() {
     initialize();
+
     #[cfg(all(feature = "wasm-parallel"))]
-    let _ = JsFuture::from(wasm_bindgen_rayon::init_thread_pool(5)).await;
+    let _ = init_threadpool(THREADS).await;
+
+    let num_parallel = rayon::current_num_threads();
+    tracing::info!("WASM rayon has {} threads", num_parallel);
 
     let mut w = WebWallet::new("test", "https://zcash-testnet.chainsafe.dev", 1).unwrap();
 
@@ -55,6 +65,8 @@ async fn test_get_and_scan_range() {
 #[tokio::test]
 async fn test_get_and_scan_range_native() {
     initialize();
+    let num_parallel = rayon::current_num_threads();
+    tracing::info!("Native rayon has {} threads", num_parallel);
     let url = "https://testnet.zec.rocks:443";
     let c = tonic::transport::Channel::from_shared(url).unwrap();