zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'zsa-integration-generics' into zsa-integration-proptest

This commit is contained in:
Dmitry Demin 2024-10-30 10:22:34 +01:00
parent 0e14637367 c7cd215148
commit 5076910e3d
3 changed files with 174 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
Cargo.lock
View File

@ -240,7 +240,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -251,7 +251,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -430,7 +430,7 @@ dependencies = [
"regex", "regex",
"rustc-hash", "rustc-hash",
"shlex", "shlex",
"syn 2.0.79", "syn 2.0.85",
"which", "which",
] ]
@ -596,9 +596,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]] [[package]]
name = "bytes" name = "bytes"
version = "1.7.2" version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
[[package]] [[package]]
name = "bzip2-sys" name = "bzip2-sys"
@ -833,7 +833,7 @@ dependencies = [
"heck 0.5.0", "heck 0.5.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -1097,7 +1097,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -1145,7 +1145,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"strsim 0.11.1", "strsim 0.11.1",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -1167,7 +1167,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [ dependencies = [
"darling_core 0.20.10", "darling_core 0.20.10",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -1372,7 +1372,7 @@ dependencies = [
[[package]] [[package]]
name = "equihash" name = "equihash"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
@ -1407,7 +1407,7 @@ dependencies = [
[[package]] [[package]]
name = "f4jumble" name = "f4jumble"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
] ]
@ -1482,6 +1482,12 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foldhash"
version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
[[package]] [[package]]
name = "form_urlencoded" name = "form_urlencoded"
version = "1.2.1" version = "1.2.1"
@ -1522,9 +1528,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]] [[package]]
name = "futures" name = "futures"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -1537,9 +1543,9 @@ dependencies = [
[[package]] [[package]]
name = "futures-channel" name = "futures-channel"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-sink", "futures-sink",
@ -1547,15 +1553,15 @@ dependencies = [
[[package]] [[package]]
name = "futures-core" name = "futures-core"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
[[package]] [[package]]
name = "futures-executor" name = "futures-executor"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"futures-task", "futures-task",
@ -1564,38 +1570,38 @@ dependencies = [
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
[[package]] [[package]]
name = "futures-macro" name = "futures-macro"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
name = "futures-sink" name = "futures-sink"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
[[package]] [[package]]
name = "futures-task" name = "futures-task"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
[[package]] [[package]]
name = "futures-util" name = "futures-util"
version = "0.3.30" version = "0.3.31"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
@ -1744,7 +1750,7 @@ dependencies = [
[[package]] [[package]]
name = "halo2_gadgets" name = "halo2_gadgets"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/QED-it/halo2?branch=zsa1#1195c9af90205829ba20662bdfaf20dcc878807d" source = "git+https://github.com/QED-it/halo2?branch=zsa1#90bc56539022c7b47d3da6201958ae2d5a694207"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"bitvec", "bitvec",
@ -1800,6 +1806,9 @@ name = "hashbrown"
version = "0.15.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
dependencies = [
"foldhash",
]
[[package]] [[package]]
name = "hdrhistogram" name = "hdrhistogram"
@ -2028,9 +2037,9 @@ dependencies = [
[[package]] [[package]]
name = "hyper" name = "hyper"
version = "1.4.1" version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures-channel", "futures-channel",
@ -2067,7 +2076,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793" checksum = "3203a961e5c83b6f5498933e78b6b263e208c197b63e9c6c53cc82ffd3f63793"
dependencies = [ dependencies = [
"hyper 1.4.1", "hyper 1.5.0",
"hyper-util", "hyper-util",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
@ -2085,7 +2094,7 @@ dependencies = [
"futures-util", "futures-util",
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"hyper 1.4.1", "hyper 1.5.0",
"pin-project-lite", "pin-project-lite",
"socket2", "socket2",
"tokio", "tokio",
@ -2618,9 +2627,9 @@ dependencies = [
[[package]] [[package]]
name = "metrics" name = "metrics"
version = "0.23.0" version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261" checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10"
dependencies = [ dependencies = [
"ahash", "ahash",
"portable-atomic", "portable-atomic",
@ -2628,13 +2637,13 @@ dependencies = [
[[package]] [[package]]
name = "metrics-exporter-prometheus" name = "metrics-exporter-prometheus"
version = "0.15.3" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6" checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"http-body-util", "http-body-util",
"hyper 1.4.1", "hyper 1.5.0",
"hyper-util", "hyper-util",
"indexmap 2.6.0", "indexmap 2.6.0",
"ipnet", "ipnet",
@ -2648,15 +2657,14 @@ dependencies = [
[[package]] [[package]]
name = "metrics-util" name = "metrics-util"
version = "0.17.0" version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7"
dependencies = [ dependencies = [
"crossbeam-epoch", "crossbeam-epoch",
"crossbeam-utils", "crossbeam-utils",
"hashbrown 0.14.5", "hashbrown 0.15.0",
"metrics", "metrics",
"num_cpus",
"quanta", "quanta",
"sketches-ddsketch", "sketches-ddsketch",
] ]
@ -2845,9 +2853,9 @@ dependencies = [
[[package]] [[package]]
name = "once_cell" name = "once_cell"
version = "1.19.0" version = "1.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
[[package]] [[package]]
name = "oorandom" name = "oorandom"
@ -3094,7 +3102,7 @@ dependencies = [
"pest_meta", "pest_meta",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -3120,22 +3128,22 @@ dependencies = [
[[package]] [[package]]
name = "pin-project" name = "pin-project"
version = "1.1.5" version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
dependencies = [ dependencies = [
"pin-project-internal", "pin-project-internal",
] ]
[[package]] [[package]]
name = "pin-project-internal" name = "pin-project-internal"
version = "1.1.5" version = "1.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -3233,7 +3241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -3326,7 +3334,7 @@ checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -3366,7 +3374,7 @@ dependencies = [
"prost 0.12.6", "prost 0.12.6",
"prost-types 0.12.6", "prost-types 0.12.6",
"regex", "regex",
"syn 2.0.79", "syn 2.0.85",
"tempfile", "tempfile",
] ]
@ -3387,7 +3395,7 @@ dependencies = [
"prost 0.13.3", "prost 0.13.3",
"prost-types 0.13.1", "prost-types 0.13.1",
"regex", "regex",
"syn 2.0.79", "syn 2.0.85",
"tempfile", "tempfile",
] ]
@ -3401,7 +3409,7 @@ dependencies = [
"itertools 0.12.1", "itertools 0.12.1",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -3414,7 +3422,7 @@ dependencies = [
"itertools 0.13.0", "itertools 0.13.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4171,9 +4179,9 @@ dependencies = [
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.210" version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -4189,20 +4197,20 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.210" version = "1.0.214"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
name = "serde_json" name = "serde_json"
version = "1.0.128" version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
dependencies = [ dependencies = [
"indexmap 2.6.0", "indexmap 2.6.0",
"itoa", "itoa",
@ -4244,9 +4252,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.9.0" version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"chrono", "chrono",
@ -4256,7 +4264,7 @@ dependencies = [
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
"serde_with_macros 3.9.0", "serde_with_macros 3.11.0",
"time", "time",
] ]
@ -4274,14 +4282,14 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.9.0" version = "3.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
dependencies = [ dependencies = [
"darling 0.20.10", "darling 0.20.10",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4364,9 +4372,9 @@ checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
[[package]] [[package]]
name = "sketches-ddsketch" name = "sketches-ddsketch"
version = "0.2.2" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c" checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
[[package]] [[package]]
name = "slab" name = "slab"
@ -4513,9 +4521,9 @@ dependencies = [
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.79" version = "2.0.85"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" checksum = "5023162dfcd14ef8f32034d8bcd4cc5ddc61ef7a247c024a33e24e1f24d21b56"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -4621,7 +4629,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4708,9 +4716,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.40.0" version = "1.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -4733,7 +4741,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4867,7 +4875,7 @@ dependencies = [
"http 1.1.0", "http 1.1.0",
"http-body 1.0.1", "http-body 1.0.1",
"http-body-util", "http-body-util",
"hyper 1.4.1", "hyper 1.5.0",
"hyper-timeout", "hyper-timeout",
"hyper-util", "hyper-util",
"percent-encoding", "percent-encoding",
@ -4892,7 +4900,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"prost-build 0.12.6", "prost-build 0.12.6",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4906,7 +4914,7 @@ dependencies = [
"prost-build 0.13.1", "prost-build 0.13.1",
"prost-types 0.13.1", "prost-types 0.13.1",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -4945,7 +4953,7 @@ dependencies = [
[[package]] [[package]]
name = "tower-batch-control" name = "tower-batch-control"
version = "0.2.41-beta.16" version = "0.2.41-beta.17"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"ed25519-zebra", "ed25519-zebra",
@ -4968,7 +4976,7 @@ dependencies = [
[[package]] [[package]]
name = "tower-fallback" name = "tower-fallback"
version = "0.2.41-beta.16" version = "0.2.41-beta.17"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"pin-project", "pin-project",
@ -5036,7 +5044,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -5149,7 +5157,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568"
dependencies = [ dependencies = [
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -5478,7 +5486,7 @@ dependencies = [
"once_cell", "once_cell",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -5512,7 +5520,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
"wasm-bindgen-backend", "wasm-bindgen-backend",
"wasm-bindgen-shared", "wasm-bindgen-shared",
] ]
@ -5807,7 +5815,7 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546"
[[package]] [[package]]
name = "zcash_address" name = "zcash_address"
version = "0.3.2" version = "0.3.2"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"bech32", "bech32",
"bs58", "bs58",
@ -5819,7 +5827,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_client_backend" name = "zcash_client_backend"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"bech32", "bech32",
@ -5858,7 +5866,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_encoding" name = "zcash_encoding"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"nonempty", "nonempty",
@ -5867,7 +5875,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_history" name = "zcash_history"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
@ -5877,7 +5885,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_keys" name = "zcash_keys"
version = "0.2.0" version = "0.2.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"bech32", "bech32",
"blake2b_simd", "blake2b_simd",
@ -5914,14 +5922,14 @@ dependencies = [
[[package]] [[package]]
name = "zcash_primitives" name = "zcash_primitives"
version = "0.15.0" version = "0.15.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"aes", "aes",
"bip0039", "bip0039",
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
"document-features", "document-features",
"equihash 0.2.0 (git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend)", "equihash 0.2.0 (git+https://github.com/QED-it/librustzcash?branch=zsa1)",
"ff", "ff",
"fpe", "fpe",
"group", "group",
@ -5975,7 +5983,7 @@ dependencies = [
[[package]] [[package]]
name = "zcash_protocol" name = "zcash_protocol"
version = "0.1.1" version = "0.1.1"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"document-features", "document-features",
"memuse", "memuse",
@ -6002,7 +6010,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-chain" name = "zebra-chain"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"bitflags-serde-legacy", "bitflags-serde-legacy",
@ -6045,7 +6053,7 @@ dependencies = [
"serde", "serde",
"serde-big-array", "serde-big-array",
"serde_json", "serde_json",
"serde_with 3.9.0", "serde_with 3.11.0",
"sha2", "sha2",
"spandoc", "spandoc",
"static_assertions", "static_assertions",
@ -6068,7 +6076,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-consensus" name = "zebra-consensus"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"bellman", "bellman",
"blake2b_simd", "blake2b_simd",
@ -6114,7 +6122,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-grpc" name = "zebra-grpc"
version = "0.1.0-alpha.7" version = "0.1.0-alpha.8"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"futures-util", "futures-util",
@ -6136,7 +6144,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-network" name = "zebra-network"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"byteorder", "byteorder",
@ -6177,7 +6185,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-node-services" name = "zebra-node-services"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"jsonrpc-core", "jsonrpc-core",
@ -6190,9 +6198,11 @@ dependencies = [
[[package]] [[package]]
name = "zebra-rpc" name = "zebra-rpc"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"base64 0.22.1",
"chrono", "chrono",
"color-eyre",
"futures", "futures",
"hex", "hex",
"indexmap 2.6.0", "indexmap 2.6.0",
@ -6227,7 +6237,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-scan" name = "zebra-scan"
version = "0.1.0-alpha.9" version = "0.1.0-alpha.10"
dependencies = [ dependencies = [
"bls12_381", "bls12_381",
"chrono", "chrono",
@ -6273,7 +6283,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-script" name = "zebra-script"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"hex", "hex",
"lazy_static", "lazy_static",
@ -6285,7 +6295,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-state" name = "zebra-state"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"bincode", "bincode",
"chrono", "chrono",
@ -6330,7 +6340,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-test" name = "zebra-test"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"futures", "futures",
@ -6358,7 +6368,7 @@ dependencies = [
[[package]] [[package]]
name = "zebra-utils" name = "zebra-utils"
version = "1.0.0-beta.40" version = "1.0.0-beta.41"
dependencies = [ dependencies = [
"color-eyre", "color-eyre",
"hex", "hex",
@ -6373,7 +6383,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_yml", "serde_yml",
"structopt", "structopt",
"syn 2.0.79", "syn 2.0.85",
"thiserror", "thiserror",
"tinyvec", "tinyvec",
"tokio", "tokio",
@ -6389,7 +6399,7 @@ dependencies = [
[[package]] [[package]]
name = "zebrad" name = "zebrad"
version = "2.0.0-rc.0" version = "2.0.0"
dependencies = [ dependencies = [
"abscissa_core", "abscissa_core",
"atty", "atty",
@ -6405,7 +6415,7 @@ dependencies = [
"howudoin", "howudoin",
"http-body-util", "http-body-util",
"humantime-serde", "humantime-serde",
"hyper 1.4.1", "hyper 1.5.0",
"hyper-util", "hyper-util",
"indexmap 2.6.0", "indexmap 2.6.0",
"indicatif", "indicatif",
@ -6477,7 +6487,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -6497,7 +6507,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.79", "syn 2.0.85",
] ]
[[package]] [[package]]
@ -6514,7 +6524,7 @@ dependencies = [
[[package]] [[package]]
name = "zip321" name = "zip321"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/QED-it/librustzcash?branch=zebra-compat-enable-backend#7191c6aacad337ca2aad86b46d992688ab1593af" source = "git+https://github.com/QED-it/librustzcash?branch=zsa1#2684455ab69452669132eff8effd1229fb5c8de9"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",
"nom", "nom",

18
Cargo.toml
View File

@ -104,19 +104,15 @@ panic = "abort"
lto = "thin" lto = "thin"
[patch.crates-io] [patch.crates-io]
#halo2_proofs = { version = "0.3.0", git = "https://github.com/QED-it/halo2", rev = "1195c9af90205829ba20662bdfaf20dcc878807d" }
#halo2_gadgets = { version = "0.3.0", git = "https://github.com/QED-it/halo2", rev = "1195c9af90205829ba20662bdfaf20dcc878807d" }
halo2_proofs = { version = "0.3.0", git = "https://github.com/QED-it/halo2", branch = "zsa1" } halo2_proofs = { version = "0.3.0", git = "https://github.com/QED-it/halo2", branch = "zsa1" }
halo2_gadgets = { version = "0.3.0", git = "https://github.com/QED-it/halo2", branch = "zsa1" } halo2_gadgets = { version = "0.3.0", git = "https://github.com/QED-it/halo2", branch = "zsa1" }
zcash_note_encryption = { version = "0.4.0", git = "https://github.com/QED-it/zcash_note_encryption", branch = "zsa1" } zcash_note_encryption = { version = "0.4.0", git = "https://github.com/QED-it/zcash_note_encryption", branch = "zsa1" }
sapling-crypto = { version = "0.1.3", git = "https://github.com/QED-it/sapling-crypto", branch = "zsa1" } sapling-crypto = { version = "0.1.3", git = "https://github.com/QED-it/sapling-crypto", branch = "zsa1" }
orchard = { version = "0.8.0", git = "https://github.com/QED-it/orchard", branch = "zsa1" } orchard = { version = "0.8.0", git = "https://github.com/QED-it/orchard", branch = "zsa1" }
zcash_primitives = { version = "0.15.0", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_primitives = { version = "0.15.0", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_protocol = { version = "0.1.1", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_protocol = { version = "0.1.1", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_address = { version = "0.3.2", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_address = { version = "0.3.2", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_encoding = { version = "0.2.0", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_encoding = { version = "0.2.0", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_history = { version = "0.4.0", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_history = { version = "0.4.0", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_client_backend = { version = "0.12.1", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_client_backend = { version = "0.12.1", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
zcash_keys = { version = "0.2.0", git = "https://github.com/QED-it/librustzcash", branch = "zebra-compat-enable-backend" } zcash_keys = { version = "0.2.0", git = "https://github.com/QED-it/librustzcash", branch = "zsa1" }
#incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }
#shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "ffe4234788fd22662b937ba7c6ea01535fcc1293" }

59
zebra-state/src/service/non_finalized_state/chain.rs
View File

@ -1492,21 +1492,23 @@ impl Chain {
.zip(transaction_hashes.iter().cloned()) .zip(transaction_hashes.iter().cloned())
.enumerate() .enumerate()
{ {
let ( let transaction_data = match transaction.deref() {
inputs,
outputs,
joinsplit_data,
sapling_shielded_data_per_spend_anchor,
sapling_shielded_data_shared_anchor,
orchard_shielded_data,
) = match transaction.deref() {
V4 { V4 {
inputs, inputs,
outputs, outputs,
joinsplit_data, joinsplit_data,
sapling_shielded_data, sapling_shielded_data,
.. ..
} => (inputs, outputs, joinsplit_data, sapling_shielded_data, &None, &None), } => (
inputs,
outputs,
joinsplit_data,
sapling_shielded_data,
&None,
&None,
#[cfg(feature ="tx-v6")]
&None
),
V5 { V5 {
inputs, inputs,
outputs, outputs,
@ -1520,13 +1522,15 @@ impl Chain {
&None, &None,
sapling_shielded_data, sapling_shielded_data,
orchard_shielded_data, orchard_shielded_data,
#[cfg(feature ="tx-v6")]
&None,
), ),
#[cfg(feature ="tx-v6")] #[cfg(feature ="tx-v6")]
V6 { V6 {
inputs, inputs,
outputs, outputs,
sapling_shielded_data, sapling_shielded_data,
orchard_shielded_data: _, orchard_shielded_data,
.. ..
} => ( } => (
inputs, inputs,
@ -1534,14 +1538,35 @@ impl Chain {
&None, &None,
&None, &None,
sapling_shielded_data, sapling_shielded_data,
// FIXME: support V6 shielded data? &None,
&None, //orchard_shielded_data, orchard_shielded_data,
), ),
V1 { .. } | V2 { .. } | V3 { .. } => unreachable!( V1 { .. } | V2 { .. } | V3 { .. } => unreachable!(
"older transaction versions only exist in finalized blocks, because of the mandatory canopy checkpoint", "older transaction versions only exist in finalized blocks, because of the mandatory canopy checkpoint",
), ),
}; };
#[cfg(not(feature = "tx-v6"))]
let (
inputs,
outputs,
joinsplit_data,
sapling_shielded_data_per_spend_anchor,
sapling_shielded_data_shared_anchor,
orchard_shielded_data_vanilla,
) = transaction_data;
#[cfg(feature = "tx-v6")]
let (
inputs,
outputs,
joinsplit_data,
sapling_shielded_data_per_spend_anchor,
sapling_shielded_data_shared_anchor,
orchard_shielded_data_vanilla,
orchard_shielded_data_zsa,
) = transaction_data;
// add key `transaction.hash` and value `(height, tx_index)` to `tx_loc_by_hash` // add key `transaction.hash` and value `(height, tx_index)` to `tx_loc_by_hash`
let transaction_location = TransactionLocation::from_usize(height, transaction_index); let transaction_location = TransactionLocation::from_usize(height, transaction_index);
let prior_pair = self let prior_pair = self
@ -1561,7 +1586,9 @@ impl Chain {
self.update_chain_tip_with(joinsplit_data)?; self.update_chain_tip_with(joinsplit_data)?;
self.update_chain_tip_with(sapling_shielded_data_per_spend_anchor)?; self.update_chain_tip_with(sapling_shielded_data_per_spend_anchor)?;
self.update_chain_tip_with(sapling_shielded_data_shared_anchor)?; self.update_chain_tip_with(sapling_shielded_data_shared_anchor)?;
self.update_chain_tip_with(orchard_shielded_data)?; self.update_chain_tip_with(orchard_shielded_data_vanilla)?;
#[cfg(feature = "tx-v6")]
self.update_chain_tip_with(orchard_shielded_data_zsa)?;
} }
// update the chain value pool balances // update the chain value pool balances
@ -2049,11 +2076,11 @@ where
} }
} }
impl UpdateWith<Option<orchard::ShieldedData<orchard::OrchardVanilla>>> for Chain { impl<V: orchard::OrchardFlavorExt> UpdateWith<Option<orchard::ShieldedData<V>>> for Chain {
#[instrument(skip(self, orchard_shielded_data))] #[instrument(skip(self, orchard_shielded_data))]
fn update_chain_tip_with( fn update_chain_tip_with(
&mut self, &mut self,
orchard_shielded_data: &Option<orchard::ShieldedData<orchard::OrchardVanilla>>, orchard_shielded_data: &Option<orchard::ShieldedData<V>>,
) -> Result<(), ValidateContextError> { ) -> Result<(), ValidateContextError> {
if let Some(orchard_shielded_data) = orchard_shielded_data { if let Some(orchard_shielded_data) = orchard_shielded_data {
// We do note commitment tree updates in parallel rayon threads. // We do note commitment tree updates in parallel rayon threads.
@ -2074,7 +2101,7 @@ impl UpdateWith<Option<orchard::ShieldedData<orchard::OrchardVanilla>>> for Chai
#[instrument(skip(self, orchard_shielded_data))] #[instrument(skip(self, orchard_shielded_data))]
fn revert_chain_with( fn revert_chain_with(
&mut self, &mut self,
orchard_shielded_data: &Option<orchard::ShieldedData<orchard::OrchardVanilla>>, orchard_shielded_data: &Option<orchard::ShieldedData<V>>,
_position: RevertPosition, _position: RevertPosition,
) { ) {
if let Some(orchard_shielded_data) = orchard_shielded_data { if let Some(orchard_shielded_data) = orchard_shielded_data {