Merge branch 'main' into peerset-poll

Cargo.lock

@@ -12,7 +12,7 @@ dependencies = [
  "arc-swap",
  "backtrace",
  "canonical-path",
- "clap 4.4.7",
+ "clap 4.4.8",
  "color-eyre",
  "fs-err",
  "once_cell",
@@ -766,19 +766,19 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
  "clap_builder",
  "clap_derive",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
  "anstream",
  "anstyle",
@@ -953,7 +953,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.4.7",
+ "clap 4.4.8",
  "criterion-plot",
  "is-terminal",
  "itertools 0.10.5",
@@ -2071,9 +2071,9 @@ dependencies = [
 
 [[package]]
 name = "inferno"
-version = "0.11.17"
+version = "0.11.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3"
+checksum = "abfb2e51b23c338595ae0b6bdaaa7a4a8b860b8d788a4331cb07b50fe5dea71b"
 dependencies = [
  "ahash",
  "is-terminal",
@@ -3127,9 +3127,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
+checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -3139,7 +3139,7 @@ dependencies = [
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -3486,12 +3486,6 @@ version = "0.6.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
-[[package]]
-name = "regex-syntax"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-
 [[package]]
 name = "regex-syntax"
 version = "0.8.2"
@@ -3801,9 +3795,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "sentry"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
 dependencies = [
  "httpdate",
  "reqwest",
@@ -3819,9 +3813,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-backtrace"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
 dependencies = [
  "backtrace",
  "once_cell",
@@ -3831,9 +3825,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-contexts"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
 dependencies = [
  "hostname",
  "libc",
@@ -3845,9 +3839,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-core"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
 dependencies = [
  "once_cell",
  "rand 0.8.5",
@@ -3858,9 +3852,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-tracing"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
 dependencies = [
  "sentry-backtrace",
  "sentry-core",
@@ -3870,9 +3864,9 @@ dependencies = [
 
 [[package]]
 name = "sentry-types"
-version = "0.31.7"
+version = "0.31.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
 dependencies = [
  "debugid",
  "hex",
@@ -3887,9 +3881,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
@@ -3905,9 +3899,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4385,9 +4379,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4415,9 +4409,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4498,14 +4492,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc"
+checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.20.7",
+ "toml_edit 0.21.0",
 ]
 
 [[package]]
@@ -4530,9 +4524,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.20.7"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03"
 dependencies = [
  "indexmap 2.1.0",
  "serde",
@@ -5725,7 +5719,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util 0.7.10",
- "toml 0.8.6",
+ "toml 0.8.8",
  "tower",
  "tracing",
  "tracing-error",
@@ -5786,8 +5780,10 @@ dependencies = [
  "color-eyre",
  "ff",
  "group",
+ "indexmap 2.1.0",
  "jubjub",
  "rand 0.8.5",
+ "serde",
  "tokio",
  "zcash_client_backend",
  "zcash_note_encryption",
@@ -5910,7 +5906,7 @@ dependencies = [
  "abscissa_core",
  "atty",
  "chrono",
- "clap 4.4.7",
+ "clap 4.4.8",
  "color-eyre",
  "console-subscriber",
  "dirs",
@@ -5947,7 +5943,7 @@ dependencies = [
  "tinyvec",
  "tokio",
  "tokio-stream",
- "toml 0.8.6",
+ "toml 0.8.8",
  "tonic",
  "tonic-build",
  "tower",
@@ -5965,6 +5961,7 @@ dependencies = [
  "zebra-network",
  "zebra-node-services",
  "zebra-rpc",
+ "zebra-scan",
  "zebra-state",
  "zebra-test",
  "zebra-utils",

tower-batch-control/Cargo.toml

@@ -26,7 +26,7 @@ futures = "0.3.29"
 futures-core = "0.3.28"
 pin-project = "1.1.3"
 rayon = "1.7.0"
-tokio = { version = "1.33.0", features = ["time", "sync", "tracing", "macros"] }
+tokio = { version = "1.34.0", features = ["time", "sync", "tracing", "macros"] }
 tokio-util = "0.7.10"
 tower = { version = "0.4.13", features = ["util", "buffer"] }
 tracing = "0.1.39"
@@ -41,7 +41,7 @@ tinyvec = { version = "1.6.0", features = ["rustc_1_55"] }
 ed25519-zebra = "4.0.3"
 rand = "0.8.5"
 
-tokio = { version = "1.33.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
 tokio-test = "0.4.3"
 tower-fallback = { path = "../tower-fallback/" }
 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.33.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }

zebra-chain/Cargo.toml

@@ -96,7 +96,7 @@ tracing = "0.1.39"
 
 # Serialization
 hex = { version = "0.4.3", features = ["serde"] }
-serde = { version = "1.0.190", features = ["serde_derive", "rc"] }
+serde = { version = "1.0.192", features = ["serde_derive", "rc"] }
 serde_with = "3.4.0"
 serde-big-array = "0.5.1"
 
@@ -114,13 +114,13 @@ reddsa = "0.5.1"
 serde_json = { version = "1.0.108", optional = true }
 
 # Production feature async-error and testing feature proptest-impl
-tokio = { version = "1.33.0", optional = true }
+tokio = { version = "1.34.0", optional = true }
 
 # Experimental feature getblocktemplate-rpcs
 zcash_address = { version = "0.3.0", optional = true }
 
 # Optional testing dependencies
-proptest = { version = "1.3.1", optional = true }
+proptest = { version = "1.4.0", optional = true }
 proptest-derive = { version = "0.4.0", optional = true }
 
 rand = { version = "0.8.5", optional = true }
@@ -141,13 +141,13 @@ spandoc = "0.2.2"
 tracing = "0.1.39"
 
 # Make the optional testing dependencies required
-proptest = "1.3.1"
+proptest = "1.4.0"
 proptest-derive = "0.4.0"
 
 rand = "0.8.5"
 rand_chacha = "0.3.1"
 
-tokio = { version = "1.33.0", features = ["full", "tracing", "test-util"] }
+tokio = { version = "1.34.0", features = ["full", "tracing", "test-util"] }
 
 zebra-test = { path = "../zebra-test/" }
 

zebra-chain/src/orchard/keys.rs

@@ -87,17 +87,12 @@ impl PartialEq<[u8; 11]> for Diversifier {
     }
 }
 
-impl TryFrom<Diversifier> for pallas::Affine {
-    type Error = &'static str;
-
+impl From<Diversifier> for pallas::Affine {
     /// Get a diversified base point from a diversifier value in affine
     /// representation.
-    fn try_from(d: Diversifier) -> Result<Self, Self::Error> {
-        if let Ok(projective_point) = pallas::Point::try_from(d) {
-            Ok(projective_point.into())
-        } else {
-            Err("Invalid Diversifier -> pallas::Affine")
-        }
+    fn from(d: Diversifier) -> Self {
+        let projective_point = pallas::Point::from(d);
+        projective_point.into()
     }
 }
 

zebra-chain/src/sapling/arbitrary.rs

@@ -84,9 +84,7 @@ impl Arbitrary for Output {
             .prop_map(|(enc_ciphertext, out_ciphertext, zkproof)| Self {
                 cv: ExtendedPoint::generator().try_into().unwrap(),
                 cm_u: NoteCommitment(AffinePoint::identity()).extract_u(),
-                ephemeral_key: keys::EphemeralPublicKey(
-                    ExtendedPoint::generator().try_into().unwrap(),
-                ),
+                ephemeral_key: keys::EphemeralPublicKey(ExtendedPoint::generator().into()),
                 enc_ciphertext,
                 out_ciphertext,
                 zkproof,