From 031c603ccb329768893976386daa1710716e8e9e Mon Sep 17 00:00:00 2001 From: Hazel OHearn Date: Fri, 21 Feb 2025 17:17:28 -0400 Subject: [PATCH] finish updating --- Cargo.lock | 553 +++++++++++++++++++++------------------ zaino-state/src/fetch.rs | 9 +- zaino-state/src/state.rs | 13 + 3 files changed, 321 insertions(+), 254 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2e91217..6378b93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -192,18 +192,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "async-trait" -version = "0.1.85" +version = "0.1.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" +checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -220,9 +220,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.12.2" +version = "1.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b7ddaa2c56a367ad27a094ad8ef4faacf8a617c2575acb2ba88949df999ca" +checksum = "4cd755adf9707cf671e31d944a189be3deaaeee11c8bc1d669bb8022ac90fbd0" dependencies = [ "aws-lc-sys", "paste", @@ -231,9 +231,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b2ddd3ada61a305e1d8bb6c005d1eaa7d14d903681edfc400406d523a9b491" +checksum = "0f9dd2e03ee80ca2822dd6ea431163d2ef259f2066a4d6ccaca6d9dcb386aa43" dependencies = [ "bindgen 0.69.5", "cc", @@ -390,7 +390,7 @@ dependencies = [ "regex", "rustc-hash 1.1.0", "shlex", - "syn 2.0.96", + "syn 2.0.98", "which", ] @@ -409,9 +409,9 @@ dependencies = [ "proc-macro2", "quote", "regex", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "shlex", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -495,9 +495,9 @@ dependencies = [ [[package]] name = "blake2b_simd" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" +checksum = "06e903a20b159e944f91ec8499fe1e55651480c541ea0a584f5d967c49ad9d99" dependencies = [ "arrayref", "arrayvec", @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "blake2s_simd" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" +checksum = "e90f7deecfac93095eb874a40febd69427776e24e1bd7f87f33ac62d6f0174df" dependencies = [ "arrayref", "arrayvec", @@ -581,15 +581,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" +checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9" [[package]] name = "bzip2-sys" -version = "0.1.11+1.0.8" +version = "0.1.12+1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "72ebc2f1a417f01e1da30ef264ee86ae31d2dcd2d603ea283d3c244a883ca2a9" dependencies = [ "cc", "libc", @@ -607,9 +607,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.10" +version = "1.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" +checksum = "c736e259eea577f443d5c86c304f9f4ae0295c43f3ba05c21f1d66b5f06001af" dependencies = [ "jobserver", "libc", @@ -729,7 +729,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -740,9 +740,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cmake" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24a03c8b52922d68a1589ad61032f2c1aa5a8158d2aa0d93c6e9534944bbad6" +checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" dependencies = [ "cc", ] @@ -786,6 +786,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const_format" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "constant_time_eq" version = "0.3.1" @@ -811,7 +831,7 @@ checksum = "2eac901828f88a5241ee0600950ab981148a18f2f756900ffba1b125ca6a3ef9" dependencies = [ "cookie", "document-features", - "idna 1.0.3", + "idna", "log", "publicsuffix", "serde", @@ -950,7 +970,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -974,7 +994,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -985,7 +1005,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1056,7 +1076,16 @@ version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", +] + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys 0.5.0", ] [[package]] @@ -1067,10 +1096,22 @@ checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", "option-ext", - "redox_users", + "redox_users 0.4.6", "windows-sys 0.48.0", ] +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users 0.5.0", + "windows-sys 0.59.0", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -1079,14 +1120,14 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "document-features" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6969eaabd2421f8a2775cfd2471a2b634372b4a25d41e3bd647b79912850a0" +checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d" dependencies = [ "litrs", ] @@ -1148,7 +1189,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1164,8 +1205,7 @@ dependencies = [ [[package]] name = "equihash" version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab579d7cf78477773b03e80bc2f89702ef02d7112c711d54ca93dcdce68533d5" +source = "git+https://github.com/zingolabs/librustzcash.git?tag=zcash_client_sqlite-0.12.1_plus_zingolabs_changes-test_2#db6efd6a2fdac955c7eb6929a043d19d9e451429" dependencies = [ "blake2b_simd", "byteorder", @@ -1173,18 +1213,19 @@ dependencies = [ [[package]] name = "equihash" -version = "0.2.0" -source = "git+https://github.com/zingolabs/librustzcash.git?tag=zcash_client_sqlite-0.12.1_plus_zingolabs_changes-test_2#db6efd6a2fdac955c7eb6929a043d19d9e451429" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "756c3654e279e572484a6061a4f90a67849baeab43be89a622b9950105254674" dependencies = [ "blake2b_simd", - "byteorder", + "core2", ] [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" @@ -1382,7 +1423,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1470,7 +1511,7 @@ dependencies = [ "proc-macro-error2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1499,9 +1540,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +checksum = "5017294ff4bb30944501348f6f8e42e6ad28f42c8bbef7a74029aff064a4e3c2" dependencies = [ "atomic-waker", "bytes", @@ -1743,7 +1784,7 @@ dependencies = [ "tokio", "tokio-rustls", "tower-service", - "webpki-roots 0.26.7", + "webpki-roots 0.26.8", ] [[package]] @@ -1932,7 +1973,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1941,16 +1982,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "1.0.3" @@ -1989,7 +2020,7 @@ checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2040,9 +2071,9 @@ checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "generic-array", ] @@ -2090,6 +2121,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -2163,7 +2203,7 @@ dependencies = [ "jsonrpsee-types", "parking_lot", "rand 0.8.5", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "serde", "serde_json", "thiserror 1.0.69", @@ -2181,7 +2221,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2266,7 +2306,7 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2394,9 +2434,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.25" +version = "0.4.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" +checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" dependencies = [ "serde", ] @@ -2538,9 +2578,9 @@ checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03" [[package]] name = "native-tls" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -2646,9 +2686,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.2" +version = "1.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" +checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "opaque-debug" @@ -2658,9 +2698,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.70" +version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61cfb4e166a8bb8c9b55c500bc2308550148ece889be90f609377e58140f42c6" +checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags 2.8.0", "cfg-if", @@ -2679,7 +2719,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2690,9 +2730,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.105" +version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b22d5b84be05a8d6947c7cb71f7c849aa0f112acd4bf51c2a7c1c988ac0a9dc" +checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" dependencies = [ "cc", "libc", @@ -2783,28 +2823,30 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "3.6.12" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" +checksum = "c9fde3d0718baf5bc92f577d652001da0f8d54cd03a7974e118d04fc888dc23d" dependencies = [ "arrayvec", "bitvec", "byte-slice-cast", + "const_format", "impl-trait-for-tuples", "parity-scale-codec-derive", + "rustversion", "serde", ] [[package]] name = "parity-scale-codec-derive" -version = "3.6.12" +version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" +checksum = "581c837bb6b9541ce7faa9377c20616e4fb7650f6b0f68bc93c827ee504fb7b3" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.98", ] [[package]] @@ -2890,22 +2932,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" +checksum = "dfe2e71e1471fe07709406bf725f710b02927c9c54b2b5b2ec0e8087d97c327d" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" +checksum = "f6e859e6e5bd50440ab63c47e3ebabc90f26251f7c73c3d3e837b74a1cc3fa67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2984,7 +3026,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6924ced06e1f7dfe3fa48d57b9f74f55d8915f5036121bef647ef4b204895fac" dependencies = [ "proc-macro2", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3026,7 +3068,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3084,7 +3126,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.96", + "syn 2.0.98", "tempfile", ] @@ -3098,7 +3140,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -3118,11 +3160,11 @@ checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" [[package]] name = "publicsuffix" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457" +checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf" dependencies = [ - "idna 0.3.0", + "idna", "psl-types", ] @@ -3165,7 +3207,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "socket2", "thiserror 2.0.11", @@ -3183,7 +3225,7 @@ dependencies = [ "getrandom 0.2.15", "rand 0.8.5", "ring", - "rustc-hash 2.1.0", + "rustc-hash 2.1.1", "rustls", "rustls-pki-types", "slab", @@ -3195,9 +3237,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.9" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c40286217b4ba3a71d644d752e6a0b71f13f1b6a2c5311acfcbe0c2418ed904" +checksum = "e46f3055866785f6b92bc6164b76be02ca8f2eb4b002c0354b28cf4c119e5944" dependencies = [ "cfg_aliases", "libc", @@ -3392,9 +3434,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" +checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f" dependencies = [ "bitflags 2.8.0", ] @@ -3410,6 +3452,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "redox_users" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" +dependencies = [ + "getrandom 0.2.15", + "libredox", + "thiserror 2.0.11", +] + [[package]] name = "regex" version = "1.11.1" @@ -3512,21 +3565,20 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.26.7", + "webpki-roots 0.26.8", "windows-registry", ] [[package]] name = "ring" -version = "0.17.8" +version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "d34b5020fcdea098ef7d95e9f89ec15952123a4a039badd09fabebe9e963e839" dependencies = [ "cc", "cfg-if", "getrandom 0.2.15", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] @@ -3585,7 +3637,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.96", + "syn 2.0.98", "walkdir", ] @@ -3613,9 +3665,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hash" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustc-hex" @@ -3647,9 +3699,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.21" +version = "0.23.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f287924602bf649d949c63dc8ac8b235fa5387d394020705b80c4eb597ce5b8" +checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395" dependencies = [ "aws-lc-rs", "log", @@ -3855,9 +3907,9 @@ checksum = "f79dfe2d285b0488816f30e700a7438c5a73d816b5b7d3ac72fbc48b0d185e03" [[package]] name = "serde" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" +checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" dependencies = [ "serde_derive", ] @@ -3883,20 +3935,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.217" +version = "1.0.218" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" +checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] name = "serde_json" -version = "1.0.138" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" +checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" dependencies = [ "indexmap 2.7.1", "itoa", @@ -3944,7 +3996,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4049,9 +4101,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.2" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" [[package]] name = "socket2" @@ -4132,9 +4184,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" +checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" dependencies = [ "proc-macro2", "quote", @@ -4158,7 +4210,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4200,9 +4252,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.16.0" +version = "3.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c246215d7d24f48ae091a2902398798e05d978b24315d6efbc00ede9a8bb91" +checksum = "22e5a0acb1f3f55f65cc4a866c361b2fb2a0ff6366785ae6fbb5f85df07ba230" dependencies = [ "cfg-if", "fastrand", @@ -4230,7 +4282,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4241,7 +4293,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "test-case-core", ] @@ -4271,7 +4323,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4282,7 +4334,7 @@ checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4388,7 +4440,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4454,9 +4506,9 @@ checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474" dependencies = [ "indexmap 2.7.1", "toml_datetime", @@ -4494,7 +4546,7 @@ dependencies = [ "tower-layer", "tower-service", "tracing", - "webpki-roots 0.26.7", + "webpki-roots 0.26.8", ] [[package]] @@ -4508,7 +4560,7 @@ dependencies = [ "prost-build", "prost-types", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4549,7 +4601,7 @@ dependencies = [ [[package]] name = "tower-batch-control" version = "0.2.41-beta.20" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "futures", "futures-core", @@ -4564,8 +4616,8 @@ dependencies = [ [[package]] name = "tower-batch-control" -version = "0.2.41-beta.20" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "0.2.41-beta.21" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "futures", "futures-core", @@ -4581,7 +4633,7 @@ dependencies = [ [[package]] name = "tower-fallback" version = "0.2.41-beta.20" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "futures-core", "pin-project", @@ -4591,8 +4643,8 @@ dependencies = [ [[package]] name = "tower-fallback" -version = "0.2.41-beta.20" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "0.2.41-beta.21" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "futures-core", "pin-project", @@ -4632,7 +4684,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4712,9 +4764,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.17.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" [[package]] name = "uint" @@ -4746,17 +4798,11 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" -[[package]] -name = "unicode-bidi" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" - [[package]] name = "unicode-ident" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" +checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" [[package]] name = "unicode-normalization" @@ -4767,6 +4813,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" @@ -4805,7 +4857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", - "idna 1.0.3", + "idna", "percent-encoding", ] @@ -4853,7 +4905,7 @@ checksum = "d674d135b4a8c1d7e813e2f8d1c9a58308aee4a680323066025e53132218bd91" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -4908,9 +4960,9 @@ checksum = "a7b6d5a78adc3e8f198e9cd730f219a695431467f7ec29dcfc63ade885feebe1" [[package]] name = "wait-timeout" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" dependencies = [ "libc", ] @@ -4983,7 +5035,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-shared", ] @@ -5018,7 +5070,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5060,9 +5112,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.7" +version = "0.26.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" +checksum = "2210b291f7ea53617fbafcc4939f10914214ec15aace5ba62293a668f322c5c9" dependencies = [ "rustls-pki-types", ] @@ -5310,9 +5362,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.25" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad699df48212c6cc6eb4435f35500ac6fd3b9913324f938aea302022ce19d310" +checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" dependencies = [ "memchr", ] @@ -5385,7 +5437,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -5411,9 +5463,9 @@ dependencies = [ "url", "zaino-proto", "zcash_protocol 0.4.0", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-rpc 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.45", + "zebra-rpc 1.0.0-beta.45", + "zebra-state 1.0.0-beta.45", ] [[package]] @@ -5445,9 +5497,9 @@ dependencies = [ "zaino-fetch", "zaino-proto", "zaino-state", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-rpc 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.45", + "zebra-rpc 1.0.0-beta.45", + "zebra-state 1.0.0-beta.45", ] [[package]] @@ -5478,9 +5530,9 @@ dependencies = [ "zaino-fetch", "zaino-proto", "zaino-testutils", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-rpc 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.45", + "zebra-rpc 1.0.0-beta.45", + "zebra-state 1.0.0-beta.45", "zingo-infra-services", "zingolib", ] @@ -5504,7 +5556,7 @@ dependencies = [ "zainod", "zcash_client_backend", "zcash_protocol 0.4.0", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.45", "zingo-infra-testutils", "zingolib", ] @@ -5526,7 +5578,7 @@ dependencies = [ "zaino-fetch", "zaino-serve", "zaino-state", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.45", ] [[package]] @@ -5683,7 +5735,7 @@ dependencies = [ "bs58", "byteorder", "document-features", - "equihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "equihash 0.2.1", "ff", "fpe", "group", @@ -5721,7 +5773,7 @@ dependencies = [ "bs58", "byteorder", "document-features", - "equihash 0.2.0 (git+https://github.com/zingolabs/librustzcash.git?tag=zcash_client_sqlite-0.12.1_plus_zingolabs_changes-test_2)", + "equihash 0.2.0", "ff", "fpe", "group", @@ -5836,7 +5888,7 @@ dependencies = [ [[package]] name = "zebra-chain" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "bitflags 2.8.0", "bitflags-serde-legacy", @@ -5847,9 +5899,9 @@ dependencies = [ "bs58", "byteorder", "chrono", - "dirs", + "dirs 5.0.1", "ed25519-zebra", - "equihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "equihash 0.2.1", "futures", "group", "halo2_proofs", @@ -5891,8 +5943,8 @@ dependencies = [ [[package]] name = "zebra-chain" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "bitflags 2.8.0", "bitflags-serde-legacy", @@ -5903,16 +5955,16 @@ dependencies = [ "bs58", "byteorder", "chrono", - "dirs", + "dirs 6.0.0", "ed25519-zebra", - "equihash 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "equihash 0.2.1", "futures", "group", "halo2_proofs", "hex", "humantime", "incrementalmerkletree", - "itertools 0.13.0", + "itertools 0.14.0", "jubjub", "lazy_static", "num-integer", @@ -5948,7 +6000,7 @@ dependencies = [ [[package]] name = "zebra-consensus" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "bellman", "blake2b_simd", @@ -5969,22 +6021,22 @@ dependencies = [ "thiserror 2.0.11", "tokio", "tower 0.4.13", - "tower-batch-control 0.2.41-beta.20 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "tower-fallback 0.2.41-beta.20 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "tower-batch-control 0.2.41-beta.20", + "tower-fallback 0.2.41-beta.20", "tracing", "tracing-futures", "wagyu-zcash-parameters", "zcash_proofs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-node-services 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-script 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", + "zebra-node-services 1.0.0-beta.44", + "zebra-script 1.0.0-beta.44", + "zebra-state 1.0.0-beta.44", ] [[package]] name = "zebra-consensus" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "bellman", "blake2b_simd", @@ -6005,28 +6057,28 @@ dependencies = [ "thiserror 2.0.11", "tokio", "tower 0.4.13", - "tower-batch-control 0.2.41-beta.20 (git+https://github.com/ZcashFoundation/zebra.git)", - "tower-fallback 0.2.41-beta.20 (git+https://github.com/ZcashFoundation/zebra.git)", + "tower-batch-control 0.2.41-beta.21", + "tower-fallback 0.2.41-beta.21", "tracing", "tracing-futures", "wagyu-zcash-parameters", "zcash_proofs 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-node-services 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-script 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", + "zebra-node-services 1.0.0-beta.45", + "zebra-script 1.0.0-beta.45", + "zebra-state 1.0.0-beta.45", ] [[package]] name = "zebra-network" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "bitflags 2.8.0", "byteorder", "bytes", "chrono", - "dirs", + "dirs 5.0.1", "futures", "hex", "humantime-serde", @@ -6050,24 +6102,24 @@ dependencies = [ "tracing", "tracing-error", "tracing-futures", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", ] [[package]] name = "zebra-network" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "bitflags 2.8.0", "byteorder", "bytes", "chrono", - "dirs", + "dirs 6.0.0", "futures", "hex", "humantime-serde", "indexmap 2.7.1", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "metrics", "num-integer", @@ -6086,13 +6138,13 @@ dependencies = [ "tracing", "tracing-error", "tracing-futures", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", ] [[package]] name = "zebra-node-services" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "color-eyre", "jsonrpsee-types", @@ -6100,13 +6152,13 @@ dependencies = [ "serde", "serde_json", "tokio", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", ] [[package]] name = "zebra-node-services" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "color-eyre", "jsonrpsee-types", @@ -6114,13 +6166,13 @@ dependencies = [ "serde", "serde_json", "tokio", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", ] [[package]] name = "zebra-rpc" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "base64 0.22.1", "chrono", @@ -6140,19 +6192,20 @@ dependencies = [ "tokio", "tower 0.4.13", "tracing", + "zcash_address 0.6.2", "zcash_primitives 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-consensus 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-network 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-node-services 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-script 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", + "zebra-consensus 1.0.0-beta.44", + "zebra-network 1.0.0-beta.44", + "zebra-node-services 1.0.0-beta.44", + "zebra-script 1.0.0-beta.44", + "zebra-state 1.0.0-beta.44", ] [[package]] name = "zebra-rpc" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "base64 0.22.1", "chrono", @@ -6167,50 +6220,50 @@ dependencies = [ "jsonrpsee-types", "nix", "rand 0.8.5", + "semver", "serde", "serde_json", "tokio", "tower 0.4.13", "tracing", - "zcash_address 0.6.2", "zcash_primitives 0.19.0 (registry+https://github.com/rust-lang/crates.io-index)", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-consensus 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-network 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-node-services 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-script 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-state 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", + "zebra-consensus 1.0.0-beta.45", + "zebra-network 1.0.0-beta.45", + "zebra-node-services 1.0.0-beta.45", + "zebra-script 1.0.0-beta.45", + "zebra-state 1.0.0-beta.45", ] [[package]] name = "zebra-script" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "thiserror 2.0.11", "zcash_script", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", ] [[package]] name = "zebra-script" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "thiserror 2.0.11", "zcash_script", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", ] [[package]] name = "zebra-state" version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" dependencies = [ "bincode", "chrono", "crossbeam-channel", - "dirs", + "dirs 5.0.1", "futures", "hex", "hex-literal", @@ -6232,25 +6285,25 @@ dependencies = [ "tokio", "tower 0.4.13", "tracing", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git?branch=main)", + "zebra-chain 1.0.0-beta.44", ] [[package]] name = "zebra-state" -version = "1.0.0-beta.44" -source = "git+https://github.com/ZcashFoundation/zebra.git#0dcc4205ee1758daf2475ffc5609a94e4f5acc05" +version = "1.0.0-beta.45" +source = "git+https://github.com/ZcashFoundation/zebra.git?branch=main#361fa65039cfea344136e3d7152d1d918e37f4e1" dependencies = [ "bincode", "chrono", "crossbeam-channel", - "dirs", + "dirs 6.0.0", "futures", "hex", "hex-literal", "human_bytes", "humantime-serde", "indexmap 2.7.1", - "itertools 0.13.0", + "itertools 0.14.0", "lazy_static", "metrics", "mset", @@ -6265,7 +6318,7 @@ dependencies = [ "tokio", "tower 0.4.13", "tracing", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.45", ] [[package]] @@ -6286,7 +6339,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -6306,7 +6359,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure", ] @@ -6327,7 +6380,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -6349,7 +6402,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -6371,9 +6424,9 @@ dependencies = [ "tracing", "zcash_primitives 0.19.0 (git+https://github.com/zingolabs/librustzcash.git?tag=zcash_client_sqlite-0.12.1_plus_zingolabs_changes-test_2)", "zcash_protocol 0.4.0", - "zebra-chain 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-node-services 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", - "zebra-rpc 1.0.0-beta.44 (git+https://github.com/ZcashFoundation/zebra.git)", + "zebra-chain 1.0.0-beta.44", + "zebra-node-services 1.0.0-beta.44", + "zebra-rpc 1.0.0-beta.44", ] [[package]] @@ -6484,7 +6537,7 @@ dependencies = [ "byteorder", "bytes", "chrono", - "dirs", + "dirs 5.0.1", "enum_dispatch", "ff", "futures", @@ -6563,27 +6616,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.14+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5" dependencies = [ "cc", "pkg-config", diff --git a/zaino-state/src/fetch.rs b/zaino-state/src/fetch.rs index c3d50c1..fbcbed0 100644 --- a/zaino-state/src/fetch.rs +++ b/zaino-state/src/fetch.rs @@ -180,6 +180,10 @@ impl ZcashIndexer for FetchServiceSubscriber { /// /// # Notes /// + /// TODO: Eleven fields have been added to this type, since this comment + /// was written. Investigate whether there is field-parity between us and + /// zcashd, or if fields are still missing from some implementations + /// /// [The zcashd reference](https://zcash.github.io/rpc/getinfo.html) might not show some fields /// in Zebra's [`GetInfo`]. Zebra uses the field names and formats from the /// [zcashd code](https://github.com/zcash/zcash/blob/v4.6.0-1/src/rpc/misc.cpp#L86-L87). @@ -187,10 +191,7 @@ impl ZcashIndexer for FetchServiceSubscriber { /// Some fields from the zcashd reference are missing from Zebra's [`GetInfo`]. It only contains the fields /// [required for lightwalletd support.](https://github.com/zcash/lightwalletd/blob/v0.4.9/common/common.go#L91-L95) async fn get_info(&self) -> Result { - Ok(GetInfo::from_parts( - self.data.zebra_build(), - self.data.zebra_subversion(), - )) + Ok(self.fetcher.get_info().await?.into()) } /// Returns blockchain state information, as a [`GetBlockChainInfo`] JSON struct. diff --git a/zaino-state/src/state.rs b/zaino-state/src/state.rs index 1bcb41c..a3a6970 100644 --- a/zaino-state/src/state.rs +++ b/zaino-state/src/state.rs @@ -240,6 +240,8 @@ impl ZcashIndexer for StateService { unreachable!("Unexpected response from state service: {unexpected:?}") } }; + let usage_response = self.checked_call(ReadRequest::UsageInfo).await?; + let size_on_disk = expected_read_response!(usage_response, UsageInfo); let request = zebra_state::ReadRequest::BlockHeader(hash.into()); let response = self.checked_call(request).await?; let header = match response { @@ -309,6 +311,8 @@ impl ZcashIndexer for StateService { .await .unwrap(); + let verification_progress = f64::from(height.0) / f64::from(zebra_estimated_height.0); + Ok(GetBlockChainInfo::new( self.config.network.bip70_network_name(), height, @@ -320,6 +324,15 @@ impl ZcashIndexer for StateService { consensus, height, difficulty, + verification_progress, + // TODO: store work in the finalized state for each height + // see https://github.com/ZcashFoundation/zebra/issues/7109 + 0, + false, + size_on_disk, + // TODO (copied from zebra): Investigate whether this needs to + // be implemented (it's sprout-only in zcashd) + 0, )) }