Merge branch 'main' into config-testnet-funding-streams

supply-chain/audits.toml

@@ -101,6 +101,11 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "0.16.3 -> 0.17.0"
 
+[[audits.mio]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.8.11 -> 1.0.1"
+
 [[audits.proptest-derive]]
 who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"
@@ -161,6 +166,26 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "1.38.0 -> 1.38.1"
 
+[[audits.tokio]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "1.38.1 -> 1.39.0"
+
+[[audits.tokio-macros]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "2.3.0 -> 2.4.0"
+
+[[audits.toml]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.8.14 -> 0.8.15"
+
+[[audits.toml_edit]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.22.14 -> 0.22.16"
+
 [[audits.tonic]]
 who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"
@@ -171,6 +196,11 @@ who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"
 delta = "0.11.0 -> 0.12.0"
 
+[[audits.tonic-reflection]]
+who = "Alfredo Garcia <oxarbitrage@gmail.com>"
+criteria = "safe-to-deploy"
+delta = "0.12.0 -> 0.12.1"
+
 [[audits.vergen]]
 who = "Alfredo Garcia <oxarbitrage@gmail.com>"
 criteria = "safe-to-deploy"

supply-chain/imports.lock

@@ -9,15 +9,15 @@ user-login = "emilio"
 user-name = "Emilio Cobos Álvarez"
 
 [[publisher.clap]]
-version = "4.5.9"
-when = "2024-07-09"
+version = "4.5.10"
+when = "2024-07-23"
 user-id = 6743
 user-login = "epage"
 user-name = "Ed Page"
 
 [[publisher.clap_builder]]
-version = "4.5.9"
-when = "2024-07-09"
+version = "4.5.10"
+when = "2024-07-23"
 user-id = 6743
 user-login = "epage"
 user-name = "Ed Page"
@@ -58,8 +58,8 @@ user-login = "dtolnay"
 user-name = "David Tolnay"
 
 [[publisher.syn]]
-version = "2.0.71"
-when = "2024-07-12"
+version = "2.0.72"
+when = "2024-07-21"
 user-id = 3618
 user-login = "dtolnay"
 user-name = "David Tolnay"
@@ -1205,6 +1205,12 @@ criteria = "safe-to-deploy"
 delta = "0.1.2 -> 1.0.1"
 aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
 
+[[audits.zcash.audits.thiserror]]
+who = "Jack Grigg <jack@electriccoin.co>"
+criteria = "safe-to-deploy"
+delta = "1.0.61 -> 1.0.63"
+aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
+
 [[audits.zcash.audits.thiserror-impl]]
 who = "Jack Grigg <jack@electriccoin.co>"
 criteria = "safe-to-deploy"
@@ -1230,6 +1236,13 @@ criteria = "safe-to-deploy"
 delta = "0.10.2 -> 0.11.0"
 aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
 
+[[audits.zcash.audits.tonic]]
+who = "Jack Grigg <jack@electriccoin.co>"
+criteria = "safe-to-deploy"
+delta = "0.12.0 -> 0.12.1"
+notes = "Changes to generics bounds look fine"
+aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
+
 [[audits.zcash.audits.tonic-build]]
 who = "Daira-Emma Hopwood <daira@jacaranda.org>"
 criteria = "safe-to-deploy"
@@ -1242,6 +1255,12 @@ criteria = "safe-to-deploy"
 delta = "0.11.0 -> 0.12.0"
 aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
 
+[[audits.zcash.audits.tonic-build]]
+who = "Jack Grigg <jack@electriccoin.co>"
+criteria = "safe-to-deploy"
+delta = "0.12.0 -> 0.12.1"
+aggregated-from = "https://raw.githubusercontent.com/zcash/librustzcash/main/supply-chain/audits.toml"
+
 [[audits.zcash.audits.wagyu-zcash-parameters]]
 who = "Sean Bowe <ewillbefull@gmail.com>"
 criteria = "safe-to-deploy"

tower-batch-control/Cargo.toml

@@ -26,7 +26,7 @@ futures = "0.3.30"
 futures-core = "0.3.28"
 pin-project = "1.1.5"
 rayon = "1.10.0"
-tokio = { version = "1.38.1", features = ["time", "sync", "tracing", "macros"] }
+tokio = { version = "1.39.0", features = ["time", "sync", "tracing", "macros"] }
 tokio-util = "0.7.11"
 tower = { version = "0.4.13", features = ["util", "buffer"] }
 tracing = "0.1.39"
@@ -41,7 +41,7 @@ tinyvec = { version = "1.8.0", features = ["rustc_1_55"] }
 ed25519-zebra = "4.0.3"
 rand = "0.8.5"
 
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
 tokio-test = "0.4.4"
 tower-fallback = { path = "../tower-fallback/", version = "0.2.41-beta.14" }
 tower-test = "0.4.0"

tower-fallback/Cargo.toml

@@ -22,6 +22,6 @@ futures-core = "0.3.28"
 tracing = "0.1.39"
 
 [dev-dependencies]
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38" }

zebra-chain/Cargo.toml

@@ -108,7 +108,7 @@ humantime = "2.1.0"
 
 # Error Handling & Formatting
 static_assertions = "1.1.0"
-thiserror = "1.0.62"
+thiserror = "1.0.63"
 tracing = "0.1.39"
 
 # Serialization
@@ -131,7 +131,7 @@ reddsa = "0.5.1"
 serde_json = { version = "1.0.120", optional = true }
 
 # Production feature async-error and testing feature proptest-impl
-tokio = { version = "1.38.1", optional = true }
+tokio = { version = "1.39.0", optional = true }
 
 # Experimental feature shielded-scan
 zcash_client_backend = { version = "0.12.1", optional = true }
@@ -164,7 +164,7 @@ proptest-derive = "0.5.0"
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/", version = "1.0.0-beta.38" }
 

zebra-consensus/Cargo.toml

@@ -51,8 +51,8 @@ serde = { version = "1.0.204", features = ["serde_derive"] }
 futures = "0.3.30"
 futures-util = "0.3.28"
 metrics = "0.23.0"
-thiserror = "1.0.62"
-tokio = { version = "1.38.1", features = ["time", "sync", "tracing", "rt-multi-thread"] }
+thiserror = "1.0.63"
+tokio = { version = "1.39.0", features = ["time", "sync", "tracing", "rt-multi-thread"] }
 tower = { version = "0.4.13", features = ["timeout", "util", "buffer"] }
 tracing = "0.1.39"
 tracing-futures = "0.2.5"
@@ -90,7 +90,7 @@ proptest = "1.4.0"
 proptest-derive = "0.5.0"
 spandoc = "0.2.2"
 
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
 tracing-error = "0.2.0"
 tracing-subscriber = "0.3.18"
 

zebra-grpc/Cargo.toml

@@ -17,11 +17,11 @@ categories = ["cryptography::cryptocurrencies"]
 [dependencies]
 
 futures-util = "0.3.28"
-tonic = "0.12.0"
-tonic-reflection = "0.12.0"
+tonic = "0.12.1"
+tonic-reflection = "0.12.1"
 prost = "0.13.1"
 serde = { version = "1.0.204", features = ["serde_derive"] }
-tokio = { version = "1.38.1", features = ["macros", "rt-multi-thread"] }
+tokio = { version = "1.39.0", features = ["macros", "rt-multi-thread"] }
 tokio-stream = "0.1.15"
 tower = { version = "0.4.13", features = ["util", "buffer", "timeout"] }
 color-eyre = "0.6.3"
@@ -32,7 +32,7 @@ zebra-node-services = { path = "../zebra-node-services", version = "1.0.0-beta.3
 zebra-chain = { path = "../zebra-chain" , version = "1.0.0-beta.38" }
 
 [build-dependencies]
-tonic-build = "0.12.0"
+tonic-build = "0.12.1"
 
 [dev-dependencies]
 insta = { version = "1.39.0", features = ["redactions", "json", "ron"] }

zebra-grpc/src/tests/vectors.rs

@@ -232,7 +232,9 @@ async fn start_server_and_get_client() -> (
     MockService<ScanRequest, ScanResponse, PanicAssertion>,
 ) {
     // get a mocked scan service
-    let mock_scan_service = MockService::build().for_unit_tests();
+    let mock_scan_service = MockService::build()
+        .with_max_request_delay(Duration::from_secs(2))
+        .for_unit_tests();
 
     // start the gRPC server
     let listen_addr: std::net::SocketAddr = "127.0.0.1:0"
@@ -246,8 +248,12 @@ async fn start_server_and_get_client() -> (
     // wait for the server to start
     sleep(Duration::from_secs(1));
 
+    let endpoint = tonic::transport::channel::Endpoint::new(format!("http://{listen_addr}"))
+        .unwrap()
+        .timeout(Duration::from_secs(2));
+
     // connect to the gRPC server
-    let client = ScannerClient::connect(format!("http://{listen_addr}"))
+    let client = ScannerClient::connect(endpoint)
         .await
         .expect("server should receive connection");
 

zebra-network/Cargo.toml

@@ -58,10 +58,10 @@ rayon = "1.10.0"
 regex = "1.10.4"
 serde = { version = "1.0.204", features = ["serde_derive"] }
 tempfile = "3.10.1"
-thiserror = "1.0.62"
+thiserror = "1.0.63"
 
 futures = "0.3.30"
-tokio = { version = "1.38.1", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
+tokio = { version = "1.39.0", features = ["fs", "io-util", "net", "time", "tracing", "macros", "rt-multi-thread"] }
 tokio-stream = { version = "0.1.15", features = ["sync", "time"] }
 tokio-util = { version = "0.7.11", features = ["codec"] }
 tower = { version = "0.4.13", features = ["retry", "discover", "load", "load-shed", "timeout", "util", "buffer"] }
@@ -90,8 +90,8 @@ proptest = "1.4.0"
 proptest-derive = "0.5.0"
 
 static_assertions = "1.1.0"
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
-toml = "0.8.13"
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
+toml = "0.8.15"
 
 zebra-chain = { path = "../zebra-chain", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test/" }

zebra-node-services/Cargo.toml

@@ -48,7 +48,7 @@ jsonrpc-core = { version = "18.0.0", optional = true }
 reqwest = { version = "0.11.26", default-features = false, features = ["rustls-tls"], optional = true }
 serde = { version = "1.0.204", optional = true }
 serde_json = { version = "1.0.120", optional = true }
-tokio = { version = "1.38.1", features = ["time"], optional = true }
+tokio = { version = "1.39.0", features = ["time"], optional = true }
 
 [dev-dependencies]
 

zebra-rpc/Cargo.toml

@@ -68,7 +68,7 @@ jsonrpc-http-server = "18.0.0"
 serde_json = { version = "1.0.120", features = ["preserve_order"] }
 indexmap = { version = "2.2.6", features = ["serde"] }
 
-tokio = { version = "1.38.1", features = [
+tokio = { version = "1.39.0", features = [
     "time",
     "rt-multi-thread",
     "macros",
@@ -77,8 +77,8 @@ tokio = { version = "1.38.1", features = [
 tower = "0.4.13"
 
 # indexer-rpcs dependencies
-tonic = { version = "0.12.0", optional = true }
-tonic-reflection = { version = "0.12.0", optional = true }
+tonic = { version = "0.12.1", optional = true }
+tonic-reflection = { version = "0.12.1", optional = true }
 prost = { version = "0.13.1", optional = true }
 tokio-stream = { version = "0.1.15", optional = true }
 
@@ -110,15 +110,15 @@ zebra-script = { path = "../zebra-script", version = "1.0.0-beta.38" }
 zebra-state = { path = "../zebra-state", version = "1.0.0-beta.38" }
 
 [build-dependencies]
-tonic-build = { version = "0.12.0", optional = true }
+tonic-build = { version = "0.12.1", optional = true }
 
 [dev-dependencies]
 insta = { version = "1.39.0", features = ["redactions", "json", "ron"] }
 
 proptest = "1.4.0"
 
-thiserror = "1.0.62"
-tokio = { version = "1.38.1", features = ["full", "tracing", "test-util"] }
+thiserror = "1.0.63"
+tokio = { version = "1.39.0", features = ["full", "tracing", "test-util"] }
 
 zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38", features = [
     "proptest-impl",

zebra-rpc/src/indexer/tests/vectors.rs

@@ -56,7 +56,10 @@ async fn start_server_and_get_client() -> Result<(
         .parse()
         .expect("hard-coded IP and u16 port should parse successfully");
 
-    let mock_read_service = MockService::build().for_unit_tests();
+    let mock_read_service = MockService::build()
+        .with_max_request_delay(Duration::from_secs(2))
+        .for_unit_tests();
+
     let (mock_chain_tip_change, mock_chain_tip_change_sender) = MockChainTip::new();
 
     let (server_task, listen_addr) =
@@ -67,8 +70,12 @@ async fn start_server_and_get_client() -> Result<(
     // wait for the server to start
     tokio::time::sleep(Duration::from_secs(1)).await;
 
+    let endpoint = tonic::transport::channel::Endpoint::new(format!("http://{listen_addr}"))
+        .unwrap()
+        .timeout(Duration::from_secs(2));
+
     // connect to the gRPC server
-    let client = IndexerClient::connect(format!("http://{listen_addr}"))
+    let client = IndexerClient::connect(endpoint)
         .await
         .expect("server should receive connection");
 

zebra-scan/Cargo.toml

@@ -65,7 +65,7 @@ indexmap = { version = "2.2.6", features = ["serde"] }
 itertools = "0.13.0"
 semver = "1.0.23"
 serde = { version = "1.0.204", features = ["serde_derive"] }
-tokio = { version = "1.38.1", features = ["time"] }
+tokio = { version = "1.39.0", features = ["time"] }
 tower = "0.4.13"
 tracing = "0.1.39"
 futures = "0.3.30"
@@ -110,7 +110,7 @@ zebrad = { path = "../zebrad", version = "1.8.0" }
 
 [dev-dependencies]
 insta = { version = "1.39.0", features = ["ron", "redactions"] }
-tokio = { version = "1.38.1", features = ["test-util"] }
+tokio = { version = "1.39.0", features = ["test-util"] }
 
 proptest = "1.4.0"
 proptest-derive = "0.5.0"
@@ -121,8 +121,8 @@ jubjub = "0.10.0"
 rand = "0.8.5"
 tempfile = "3.10.1"
 zcash_note_encryption = "0.4.0"
-toml = "0.8.13"
-tonic = "0.12.0"
+toml = "0.8.15"
+tonic = "0.12.1"
 
 zebra-state = { path = "../zebra-state", version = "1.0.0-beta.38", features = ["proptest-impl"] }
 zebra-test = { path = "../zebra-test", version = "1.0.0-beta.38" }

zebra-script/Cargo.toml

@@ -18,7 +18,7 @@ categories = ["api-bindings", "cryptography::cryptocurrencies"]
 zcash_script = "0.2.0"
 zebra-chain = { path = "../zebra-chain", version = "1.0.0-beta.38" }
 
-thiserror = "1.0.62"
+thiserror = "1.0.63"
 
 [dev-dependencies]
 hex = "0.4.3"